Ján Jamrich
committed
on 22 Jan 12
RF-10197: Merge contextMenu tests into trunk

Conflicts:
application/src/main/java/org/richfaces/demo/push/TopicsContextMessageProducer.jav… Show more
RF-10197: Merge contextMenu tests into trunk

Conflicts:

        application/src/main/java/org/richfaces/demo/push/TopicsContextMessageProducer.java

        application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java

        application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JPushBean.java

        application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichHotKeyBean.java

        application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessageBean.java

        application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessagesBean.java

        application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTooltipBean.java

        application/src/main/webapp/components/a4jPush/simple.xhtml

        application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml

        application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml

        application/src/main/webapp/components/richDataGrid/keepSaved.xhtml

        application/src/main/webapp/components/richDataTable/keepSaved.xhtml

        application/src/main/webapp/components/richDragIndicator/simple.xhtml

        application/src/main/webapp/components/richDragSource/cc.xhtml

        application/src/main/webapp/components/richDragSource/simple.xhtml

        application/src/main/webapp/components/richDropTarget/simple.xhtml

        application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml

        application/src/main/webapp/components/richExtendedDataTable/list.xhtml

        application/src/main/webapp/components/richFileUpload/list.xhtml

        application/src/main/webapp/components/richHotKey/editor.xhtml

        application/src/main/webapp/components/richHotKey/orderingList.xhtml

        application/src/main/webapp/components/richHotKey/pickList.xhtml

        application/src/main/webapp/components/richHotKey/simple.xhtml

        application/src/main/webapp/components/richList/keepSaved.xhtml

        application/src/main/webapp/components/richTabPanel/list.xhtml

        application/src/main/webapp/components/richTooltip/list.xhtml

        application/src/main/webapp/components/richTree/rf-10994.xhtml

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesCSV.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSFValidator.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSR303.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/AbstractTestTree.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreePhases.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSelection.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java

        ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java

        ftest/src/test/resources/testng-misc.xml

        pom.xml Show less