JBoss Rich Faces SVN: r13884 - in trunk/test-applications/seleniumTest/richfaces: src/test/java/org/richfaces and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-27 06:46:56 -0400 (Mon, 27 Apr 2009)
New Revision: 13884
Added:
trunk/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-failures.xml
Modified:
trunk/test-applications/seleniumTest/richfaces/pom.xml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxIncludeTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxRegionTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxStatusTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComboBoxTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComponentControlTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataFilterSliderTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GmapTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/VirtualEarthTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng.xml
Log:
https://jira.jboss.org/jira/browse/RF-6863
Modified: trunk/test-applications/seleniumTest/richfaces/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/pom.xml 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/pom.xml 2009-04-27 10:46:56 UTC (rev 13884)
@@ -109,7 +109,10 @@
<!-- Skip the normal tests, we'll run them in the integration-test phase -->
<skip>true</skip>
<suiteXmlFiles>
- <suiteXmlFile>
+ <suiteXmlFile>
+ src/test/testng/hudson/testng-failures.xml
+ </suiteXmlFile>
+ <suiteXmlFile>
src/test/testng/hudson/testng.xml
</suiteXmlFile>
</suiteXmlFiles>
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -66,6 +66,8 @@
private static final String DEFAULT_PAGE_URL = "/template/default.xhtml";
+ protected static final String FAILURES_GROUP = "failures";
+
/** Parent component id */
private String parentId;
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -99,7 +99,7 @@
/**
* level selects message of respective level
*/
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testLevel(Template template) {
//TODO
Assert.fail("This test should be completed after resolving bug RF-5107.");
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxIncludeTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxIncludeTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxIncludeTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -101,7 +101,8 @@
/**
* transient components are kept when keepTransient = true
*/
- @Test
+ //https://jira.jboss.org/jira/browse/RF-6475
+ @Test(groups=FAILURES_GROUP)
public void testKeepTransient(Template template) {
init(template);
Assert.assertEquals(selenium.getText(transientState), "false");
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxRegionTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxRegionTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxRegionTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -82,7 +82,7 @@
}
// FIXME https://jira.jboss.org/jira/browse/RF-4883
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testAjaxListenerInvokedOnEachAJAXRequest(Template template) {
renderPage(template);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxStatusTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxStatusTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxStatusTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -160,7 +160,7 @@
}
//FIXME https://jira.jboss.org/jira/browse/RF-4597
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testStyleAndClassesStandardHTMLAttributesAreOutputToClient(Template template) {
renderPage(template);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -584,7 +584,8 @@
}*/
- @Test
+ //https://jira.jboss.org/jira/browse/RF-5379
+ @Test(groups=FAILURES_GROUP)
public void testJSAPI(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComboBoxTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComboBoxTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComboBoxTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -137,7 +137,8 @@
* Check that comboBox component present on the page.
* Styles & events attributes work as should.
*/
- @Test
+ //https://jira.jboss.org/jira/browse/RF-6141
+ @Test(groups=FAILURES_GROUP)
public void testStandardAttributes(Template template) {
AutoTester autoTester = getAutoTester(this);
autoTester.renderPage(template, null);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComponentControlTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComponentControlTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComponentControlTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -129,7 +129,7 @@
}
}
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testDisableDefaultAttribute(Template template) {
//Not working: https://jira.jboss.org/jira/browse/RF-5607 - waiting for fix
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataFilterSliderTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataFilterSliderTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataFilterSliderTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -211,7 +211,8 @@
checkDataFilterSliderEventFired(2, 5);
}
- @Test
+ //https://jira.jboss.org/jira/browse/RF-6273
+ @Test(groups=FAILURES_GROUP)
public void testClientErrorMessageAttribute(Template template) {
renderPage(template, null);
@@ -252,7 +253,8 @@
autoTester.testAjaxSingle();
}
- @Test
+ //https://jira.jboss.org/jira/browse/RF-6144
+ @Test(groups=FAILURES_GROUP)
public void testAjaxSingleWithExternalAndProcessedComponentsValidationFailures(Template template) {
AutoTester autoTester = getAutoTester(this);
autoTester.renderPage(template, RESET_METHOD);
@@ -276,7 +278,8 @@
tester.testOncomplete();
}
- @Test
+ //https://jira.jboss.org/jira/browse/RF-6144
+ @Test(groups=FAILURES_GROUP)
public void testLimitToListAttribute(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(template, RESET_METHOD);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GmapTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GmapTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GmapTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -14,7 +14,7 @@
/**
* component is present on the page together with map images and there are no JS errors
*/
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testImages(Template template) {
AutoTester autoTester = getAutoTester(this);
autoTester.renderPage(template, null);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -40,7 +40,8 @@
private final static String LOOK_AND_FEEL_TEST_URL = "pages/inputNumberSlider/styleAndClasseStandardHTMLAttributesTest.xhtml";
- @Test
+ //https://jira.jboss.org/jira/browse/RF-3600
+ @Test(groups=FAILURES_GROUP)
public void testInputNumberSlider(Template template) {
renderPage(template, RESET_METHOD);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -36,7 +36,7 @@
/**
* ajaxRendered message output first message for attached component by ajax request
*/
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testAjaxRendered(Template template) {
init(template);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -85,7 +85,8 @@
tester.checkActionListener(false);
}
- @Test
+ //https://jira.jboss.org/jira/browse/RF-6119
+ @Test(groups=FAILURES_GROUP)
public void testNestedComponentsAreNotProcessedForServerAwareClosedGroups(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(CORE_TEST_URL, template, RESET_METHOD);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -70,7 +70,8 @@
tester.testLimitToList();
}
- @Test
+ //https://jira.jboss.org/jira/browse/RF-6606
+ @Test(groups=FAILURES_GROUP)
public void testBypassUpdatesAttribute(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(template, RESET_METHOD);
@@ -78,7 +79,8 @@
tester.testBypassUpdate(false);
}
- @Test
+ //https://jira.jboss.org/jira/browse/RF-6605
+ @Test(groups=FAILURES_GROUP)
public void testImmediate(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(template, RESET_METHOD);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -153,7 +153,7 @@
tester.testBypassUpdate();
}
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testValidatorAndValidatorMessageAttributes(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(template, INIT_AJAX_CORE_TEST);
@@ -245,7 +245,7 @@
AssertNotPresent(tabId4);
}
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testAjaxSingleTab(Template template) {
renderPage(INIT_AJAX_SINGLE_TEST_URL, template, INIT_AJAX_SINGLE_TEST);
String parentId = getParentId();
@@ -265,7 +265,7 @@
AssertPresent(tabId2);
}
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testAjaxSingleTabWithEXternalValidationFailure(Template template) {
renderPage(INIT_AJAX_SINGLE_TEST_URL, template, INIT_AJAX_SINGLE_TEST);
String parentId = getParentId();
@@ -283,7 +283,7 @@
AssertPresent(tabId2);
}
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testAjaxSingleTabWithEXternalValidationFailureAndProcess(Template template) {
renderPage(INIT_AJAX_SINGLE_TEST_URL, template, INIT_AJAX_SINGLE_TEST);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/VirtualEarthTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/VirtualEarthTest.java 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/VirtualEarthTest.java 2009-04-27 10:46:56 UTC (rev 13884)
@@ -14,7 +14,7 @@
/**
* component is present on the page together with map images and there are no JS errors
*/
- @Test
+ @Test(groups=FAILURES_GROUP)
public void testImages(Template template) {
AutoTester autoTester = getAutoTester(this);
autoTester.renderPage(template, null);
Added: trunk/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-failures.xml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-failures.xml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-failures.xml 2009-04-27 10:46:56 UTC (rev 13884)
@@ -0,0 +1,47 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="seleniumTestAANe-failures">
+ <test name="all_all_none">
+ <parameter name="browser" value="*firefox"/>
+ <parameter name="loadStyleStrategy" value="ALL"/>
+ <parameter name="loadScriptStrategy" value="ALL"/>
+ <parameter name="filterPrefix" value="/faces/NONE/"/>
+ <packages>
+ <package name="org.richfaces.testng">
+ <include name="failures" />
+ </package>
+ </packages>
+ </test>
+ <test name="default_default_neko">
+ <parameter name="browser" value="*firefox"/>
+ <parameter name="loadStyleStrategy" value="DEFAULT"/>
+ <parameter name="loadScriptStrategy" value="DEFAULT"/>
+ <parameter name="filterPrefix" value="/faces/NEKO/"/>
+ <packages>
+ <package name="org.richfaces.testng">
+ <include name="failures" />
+ </package>
+ </packages>
+ </test>
+ <test name="default_default_none">
+ <parameter name="browser" value="*firefox"/>
+ <parameter name="loadStyleStrategy" value="DEFAULT"/>
+ <parameter name="loadScriptStrategy" value="DEFAULT"/>
+ <parameter name="filterPrefix" value="/faces/NONE/"/>
+ <packages>
+ <package name="org.richfaces.testng">
+ <include name="failures" />
+ </package>
+ </packages>
+ </test>
+ <test name="default_default_tidy">
+ <parameter name="loadStyleStrategy" value="DEFAULT"/>
+ <parameter name="loadScriptStrategy" value="DEFAULT"/>
+ <parameter name="filterPrefix" value="/faces/TIDY/"/>
+ <parameter name="browser" value="*firefox"/>
+ <packages>
+ <package name="org.richfaces.testng">
+ <include name="failures" />
+ </package>
+ </packages>
+ </test>
+</suite>
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng.xml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng.xml 2009-04-26 19:16:57 UTC (rev 13883)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng.xml 2009-04-27 10:46:56 UTC (rev 13884)
@@ -1,93 +1,25 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="seleniumTestAANe">
- <!--test name="all_all_neko">
- <parameter name="browser" value="*firefox"/>
- <parameter name="loadStyleStrategy" value="ALL"/>
- <parameter name="loadScriptStrategy" value="ALL"/>
- <parameter name="filterPrefix" value="/faces/NEKO/"/>
- <packages>
- <package name="org.richfaces.testng" />
- </packages>
- </test-->
<test name="all_all_none">
<parameter name="browser" value="*firefox"/>
<parameter name="loadStyleStrategy" value="ALL"/>
<parameter name="loadScriptStrategy" value="ALL"/>
<parameter name="filterPrefix" value="/faces/NONE/"/>
<packages>
- <package name="org.richfaces.testng" />
+ <package name="org.richfaces.testng">
+ <exclude name="failures" />
+ </package>
</packages>
</test>
- <!--test name="all_all_tidy">
- <parameter name="loadStyleStrategy" value="ALL"/>
- <parameter name="loadScriptStrategy" value="ALL"/>
- <parameter name="filterPrefix" value="/faces/TIDY/"/>
- <parameter name="browser" value="*firefox"/>
- <packages>
- <package name="org.richfaces.testng" />
- </packages>
- </test>
- <test name="all_default_neko">
- <parameter name="browser" value="*firefox"/>
- <parameter name="loadStyleStrategy" value="ALL"/>
- <parameter name="loadScriptStrategy" value="DEFAULT"/>
- <parameter name="filterPrefix" value="/faces/NEKO/"/>
- <packages>
- <package name="org.richfaces.testng" />
- </packages>
- </test>
- <test name="all_default_none">
- <parameter name="browser" value="*firefox"/>
- <parameter name="loadStyleStrategy" value="ALL"/>
- <parameter name="loadScriptStrategy" value="DEFAULT"/>
- <parameter name="filterPrefix" value="/faces/NONE/"/>
- <packages>
- <package name="org.richfaces.testng" />
- </packages>
- </test>
- <test name="all_default_tidy">
- <parameter name="loadStyleStrategy" value="ALL"/>
- <parameter name="loadScriptStrategy" value="DEFAULT"/>
- <parameter name="filterPrefix" value="/faces/TIDY/"/>
- <parameter name="browser" value="*firefox"/>
- <packages>
- <package name="org.richfaces.testng" />
- </packages>
- </test>
- <test name="default_all_neko">
- <parameter name="browser" value="*firefox"/>
- <parameter name="loadStyleStrategy" value="DEFAULT"/>
- <parameter name="loadScriptStrategy" value="ALL"/>
- <parameter name="filterPrefix" value="/faces/NEKO/"/>
- <packages>
- <package name="org.richfaces.testng" />
- </packages>
- </test>
- <test name="default_all_none">
- <parameter name="browser" value="*firefox"/>
- <parameter name="loadStyleStrategy" value="DEFAULT"/>
- <parameter name="loadScriptStrategy" value="ALL"/>
- <parameter name="filterPrefix" value="/faces/NONE/"/>
- <packages>
- <package name="org.richfaces.testng" />
- </packages>
- </test>
- <test name="default_all_tidy">
- <parameter name="loadStyleStrategy" value="DEFAULT"/>
- <parameter name="loadScriptStrategy" value="ALL"/>
- <parameter name="filterPrefix" value="/faces/TIDY/"/>
- <parameter name="browser" value="*firefox"/>
- <packages>
- <package name="org.richfaces.testng" />
- </packages>
- </test-->
<test name="default_default_neko">
<parameter name="browser" value="*firefox"/>
<parameter name="loadStyleStrategy" value="DEFAULT"/>
<parameter name="loadScriptStrategy" value="DEFAULT"/>
<parameter name="filterPrefix" value="/faces/NEKO/"/>
<packages>
- <package name="org.richfaces.testng" />
+ <package name="org.richfaces.testng">
+ <exclude name="failures" />
+ </package>
</packages>
</test>
<test name="default_default_none">
@@ -96,7 +28,9 @@
<parameter name="loadScriptStrategy" value="DEFAULT"/>
<parameter name="filterPrefix" value="/faces/NONE/"/>
<packages>
- <package name="org.richfaces.testng" />
+ <package name="org.richfaces.testng">
+ <exclude name="failures" />
+ </package>
</packages>
</test>
<test name="default_default_tidy">
@@ -105,7 +39,9 @@
<parameter name="filterPrefix" value="/faces/TIDY/"/>
<parameter name="browser" value="*firefox"/>
<packages>
- <package name="org.richfaces.testng" />
+ <package name="org.richfaces.testng">
+ <exclude name="failures" />
+ </package>
</packages>
</test>
</suite>
15 years, 8 months
JBoss Rich Faces SVN: r13883 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-26 15:16:57 -0400 (Sun, 26 Apr 2009)
New Revision: 13883
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
https://jira.jboss.org/jira/browse/RF-6913
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-04-26 19:00:37 UTC (rev 13882)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-04-26 19:16:57 UTC (rev 13883)
@@ -1728,7 +1728,7 @@
initIds(getParentId());
String expectedDefaultTime = "05/05/2007 13:13";
- String notEmptySelectedDate = "04/04/2006 10:00";
+ String notEmptySelectedDate = "04/04/2006 10:10";
writeStatus("Check 'defaultTime' and 'resetTimeOnDateSelect' attributes");
15 years, 8 months
JBoss Rich Faces SVN: r13882 - trunk/ui/tree/src/main/config/component.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-26 15:00:37 -0400 (Sun, 26 Apr 2009)
New Revision: 13882
Modified:
trunk/ui/tree/src/main/config/component/commonTreeListeners.ent
Log:
https://jira.jboss.org/jira/browse/RF-5638
Modified: trunk/ui/tree/src/main/config/component/commonTreeListeners.ent
===================================================================
--- trunk/ui/tree/src/main/config/component/commonTreeListeners.ent 2009-04-26 18:57:18 UTC (rev 13881)
+++ trunk/ui/tree/src/main/config/component/commonTreeListeners.ent 2009-04-26 19:00:37 UTC (rev 13882)
@@ -21,6 +21,10 @@
org.richfaces.taglib.DropListenerHandler
</classname>
</taghandler>
+ <property existintag="true" exist="true" el="false">
+ <name>type</name>
+ <classname>java.lang.String</classname>
+ </property>
</listener>
<listener>
@@ -45,6 +49,10 @@
org.richfaces.taglib.DragListenerHandler
</classname>
</taghandler>
+ <property existintag="true" exist="true" el="false">
+ <name>type</name>
+ <classname>java.lang.String</classname>
+ </property>
</listener>
@@ -75,6 +83,11 @@
org.richfaces.taglib.ChangeExpandListenerTag
</classname>
</tag>
+
+ <property existintag="true" exist="true" el="false">
+ <name>type</name>
+ <classname>java.lang.String</classname>
+ </property>
</listener>
<listener>
<name>nodeSelectListener</name>
@@ -103,4 +116,9 @@
org.richfaces.taglib.NodeSelectListenerTag
</classname>
</tag>
+
+ <property existintag="true" exist="true" el="false">
+ <name>type</name>
+ <classname>java.lang.String</classname>
+ </property>
</listener>
15 years, 8 months
JBoss Rich Faces SVN: r13881 - trunk/ui/drag-drop/src/main/config/component.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-26 14:57:18 -0400 (Sun, 26 Apr 2009)
New Revision: 13881
Modified:
trunk/ui/drag-drop/src/main/config/component/dragSupport.xml
trunk/ui/drag-drop/src/main/config/component/dropSupport.xml
Log:
https://jira.jboss.org/jira/browse/RF-5638
Modified: trunk/ui/drag-drop/src/main/config/component/dragSupport.xml
===================================================================
--- trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2009-04-26 18:20:23 UTC (rev 13880)
+++ trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2009-04-26 18:57:18 UTC (rev 13881)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
-">
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd">
<components>
<component>
@@ -128,5 +127,10 @@
org.richfaces.taglib.DragListenerTag
</classname>
</tag>
+
+ <property existintag="true" exist="true" el="false">
+ <name>type</name>
+ <classname>java.lang.String</classname>
+ </property>
</listener>
</components>
Modified: trunk/ui/drag-drop/src/main/config/component/dropSupport.xml
===================================================================
--- trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2009-04-26 18:20:23 UTC (rev 13880)
+++ trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2009-04-26 18:57:18 UTC (rev 13881)
@@ -118,6 +118,10 @@
org.richfaces.taglib.DropListenerTag
</classname>
</tag>
+ <property existintag="true" exist="true" el="false">
+ <name>type</name>
+ <classname>java.lang.String</classname>
+ </property>
</listener>
</components>
15 years, 8 months
JBoss Rich Faces SVN: r13880 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-26 14:20:23 -0400 (Sun, 26 Apr 2009)
New Revision: 13880
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
https://jira.jboss.org/jira/browse/RF-6910
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2009-04-26 14:47:12 UTC (rev 13879)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2009-04-26 18:20:23 UTC (rev 13880)
@@ -391,10 +391,50 @@
} else {
// need to check for firstChild due to opera 8 bug with hasChildNodes
Sarissa.clearChildNodes(oldnode);
- var importednode = window.document.importNode(newnode, true);
+
+ var importednode = window.document.importNode(newnode, true);
//importednode.innerHTML = importednode.innerHTML;
LOG.debug("Replace content of node by replaceChild()");
- anchor.replaceChild(importednode,oldnode);
+
+ var oldGetElementById = null;
+
+ A4J.AJAX.TestReplacedGetElementByIdVisibility();
+ if (!A4J.AJAX._testReplacedGetElementByIdVisibility) {
+ LOG.debug("Temporarily substituting document.getElementById() to work around WebKit issue");
+ oldGetElementById = document.getElementById;
+ document.getElementById = function(id) {
+ var elt = oldGetElementById.apply(document, arguments);
+ if (!elt) {
+ var id = arguments[0];
+
+ LOG.debug("Element [@id='" + id + "'] was not found in document, trying to locate XPath match");
+
+ try {
+ var result = importednode.ownerDocument.evaluate("//*[@id='" + id + "']",
+ importednode, null, XPathResult.ANY_UNORDERED_NODE_TYPE);
+
+ if (result) {
+ elt = result.singleNodeValue;
+ }
+
+ LOG.debug("XPath located: " + elt);
+ } catch (e) {
+ LOG.error("Error locating [@id='" + id + "'] element: " + e.message);
+ }
+ }
+
+ return elt;
+ };
+ }
+
+ try {
+ anchor.replaceChild(importednode,oldnode);
+ } finally {
+ if (oldGetElementById) {
+ LOG.debug("Restoring document.getElementById()");
+ document.getElementById = oldGetElementById;
+ }
+ }
}
// re-execute all script fragments in imported subtree...
@@ -1733,3 +1773,30 @@
}
A4J.AJAX._scriptTested = true;
}
+
+A4J.AJAX.TestReplacedGetElementByIdVisibility = function() {
+ if (!A4J.AJAX._replacedGetElementByIdVisibilityTested) {
+ A4J.AJAX._replacedGetElementByIdVisibilityTested = true;
+
+ A4J.AJAX.TestScriptEvaluation();
+ if (A4J.AJAX._scriptEvaluated) {
+ try {
+ A4J.AJAX._testReplacedGetElementByIdVisibility = true;
+
+ var _span = document.createElement("span");
+ document.body.appendChild(_span);
+
+ var xmlString = "<html xmlns='http://www.w3.org/1999/xhtml'><span id='_A4J_AJAX_TestReplacedGetElementByIdVisibility'><sc"+"ript>A4J.AJAX._testReplacedGetElementByIdVisibility = !!(document.getElementById('_A4J_AJAX_TestReplacedGetElementByIdVisibility'));</scr"+"ipt></span></html>";
+ oDomDoc = (new DOMParser()).parseFromString(xmlString, "text/xml");
+ var _newSpan = oDomDoc.getElementsByTagName("span")[0];
+
+ var importednode;
+ importednode = window.document.importNode(_newSpan, true);
+ document.body.replaceChild(importednode,_span);
+ document.body.removeChild(importednode);
+ } catch (e) {
+ LOG.error("Error testing replaced elements getElementById() visibility: " + e.message);
+ }
+ }
+ }
+};
15 years, 8 months
JBoss Rich Faces SVN: r13879 - trunk/samples/richfaces-demo.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-26 10:47:12 -0400 (Sun, 26 Apr 2009)
New Revision: 13879
Modified:
trunk/samples/richfaces-demo/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-6941
Modified: trunk/samples/richfaces-demo/pom.xml
===================================================================
--- trunk/samples/richfaces-demo/pom.xml 2009-04-25 22:45:56 UTC (rev 13878)
+++ trunk/samples/richfaces-demo/pom.xml 2009-04-26 14:47:12 UTC (rev 13879)
@@ -387,6 +387,13 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>3.2.6.ga</version>
+
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
15 years, 8 months
JBoss Rich Faces SVN: r13878 - in trunk/docs: userguide/en/src/main/docbook/included and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: smukhina
Date: 2009-04-25 18:45:56 -0400 (Sat, 25 Apr 2009)
New Revision: 13878
Modified:
trunk/docs/migrationguide/en/src/main/docbook/included/contextMenuDisablement.xml
trunk/docs/userguide/en/src/main/docbook/included/contextMenu.xml
Log:
RF-5724 English is checked
Modified: trunk/docs/migrationguide/en/src/main/docbook/included/contextMenuDisablement.xml
===================================================================
--- trunk/docs/migrationguide/en/src/main/docbook/included/contextMenuDisablement.xml 2009-04-25 22:27:33 UTC (rev 13877)
+++ trunk/docs/migrationguide/en/src/main/docbook/included/contextMenuDisablement.xml 2009-04-25 22:45:56 UTC (rev 13878)
@@ -3,7 +3,7 @@
<?dbhtml filename="contextMenuDisablement.html"?>
<sectioninfo>
<keywordset>
- <keyword>contextMenu</keyword>
+ <keyword>contextMenu</keyword>
</keywordset>
</sectioninfo>
@@ -11,10 +11,10 @@
<section>
<title>Description</title>
<para>
- The <emphasis role="bold"><property><rich:contextMenu></property></emphasis> component
- if rendered disables right mouse click on a page by default in <property>RichFaces</property> 3.3.0.
+ The <emphasis role="bold"><property><rich:contextMenu></property></emphasis> component
+ if rendered disables a right mouse click on a page by default in <property>RichFaces</property> 3.3.0.
</para>
- </section>
+ </section>
<section>
<title>Links</title>
<itemizedlist>
@@ -28,25 +28,25 @@
<section>
<title>How to reproduce</title>
<para>
- Checkout RichFaces Live Demo 3.3.0, run it, and proceed to the Context Menu page.
- If you right click on the image
- <emphasis role="bold"><property><rich:contextMenu></property></emphasis> appears.
- If you click anywhere else the right click will be non functional.
+ Checkout RichFaces Live Demo 3.3.0, run it, and proceed to the Context Menu page.
+ If you right click on the image
+ <emphasis role="bold"><property><rich:contextMenu></property></emphasis> appears.
+ If you click anywhere else, the right click will be non functional.
</para>
- </section>
+ </section>
<section>
<title>Causes</title>
<para>
- The <emphasis role="bold"><property><rich:contextMenu></property></emphasis> in <property>RichFaces</property> 3.3.0 completely disables
+ The <emphasis role="bold"><property><rich:contextMenu></property></emphasis> in <property>RichFaces</property> 3.3.0 completely disables
right mouse click on a page by default.
</para>
</section>
<section>
<title>Workarounds</title>
- <para>
- Update to <property>RichFaces</property> 3.3.1.
- By default, the <emphasis role="bold"><property><rich:contextMenu></property></emphasis> in <property>RichFaces</property> 3.3.1 completely disables
- right mouse click in the Context Menu zone only.
+ <para>
+ Update to <property>RichFaces</property> 3.3.1.
+ By default, the <emphasis role="bold"><property><rich:contextMenu></property></emphasis> in <property>RichFaces</property> 3.3.1 completely disables
+ right mouse click in the Context Menu area only.
</para>
- </section>
-</section>
+ </section>
+</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/contextMenu.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/contextMenu.xml 2009-04-25 22:27:33 UTC (rev 13877)
+++ trunk/docs/userguide/en/src/main/docbook/included/contextMenu.xml 2009-04-25 22:45:56 UTC (rev 13878)
@@ -86,7 +86,7 @@
</emphasis>. </para>
<para>
By default, the <emphasis role="bold"><property><rich:contextMenu></property></emphasis> completely disables
- right mouse click on a page in the context menu zone only.
+ right mouse click on a page in the context menu area only.
But if you want to disable browser's context menu completely you should set the
<emphasis><property>"disableDefaultMenu"</property></emphasis> attribute value to "true".
</para>
15 years, 8 months
JBoss Rich Faces SVN: r13877 - in trunk/docs/realworld_app_guide/en/src/main/docbook: modules and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: smukhina
Date: 2009-04-25 18:27:33 -0400 (Sat, 25 Apr 2009)
New Revision: 13877
Modified:
trunk/docs/realworld_app_guide/en/src/main/docbook/includes/hiw.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml
Log:
RF-5768 - English is checked
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/includes/hiw.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/includes/hiw.xml 2009-04-25 16:01:30 UTC (rev 13876)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/includes/hiw.xml 2009-04-25 22:27:33 UTC (rev 13877)
@@ -187,7 +187,7 @@
<title>Building the control with <rich:inputNumberSlider></title>
<para>
The <emphasis role="bold"><property>rich:inputNumberSlider</property></emphasis> component in the Photo Album Demo is used as a control that helps a user to change photos size while previewing an album.
- A handler position on the slider track corresponds to a particular value of image size.
+ A handler position on the slider track corresponds to a particular value of an image size.
The component is included into the page with the help of <emphasis role="bold"><property>ui:include</property></emphasis>:
</para>
<programlisting role="XML"><![CDATA[...
@@ -284,7 +284,7 @@
...]]></programlisting>
<para>
- When the <emphasis role="bold"><property><rich:inputNumberSlider<</property></emphasis> is rendered at first its default value for image size is 120 px.
+ When the <emphasis role="bold"><property><rich:inputNumberSlider<</property></emphasis> is rendered, at first its default value for image size is 120 px.
</para>
<figure>
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml 2009-04-25 16:01:30 UTC (rev 13876)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml 2009-04-25 22:27:33 UTC (rev 13877)
@@ -38,7 +38,7 @@
<ulink url="https://anonsvn.jboss.org/repos/richfaces/management/design/realWorldDemo...">https://anonsvn.jboss.org/repos/richfaces/management/design/realWorldDemo...</ulink>
</para>
<para>
- In order to document key concepts and conceptual representation of data of the <property>Photo Album Demo</property> application the Entity Relation Diagram (ERD) is created.
+ In order to document the key concepts and conceptual representation of data of the <property>Photo Album Demo</property> application the Entity Relation Diagram (ERD) is created.
The diagram also identifies the relationships among all major entities within the system and their significant methods and attributes.
It provides a structural view of the system that can be complemented by other dynamic views in use case models.
</para>
@@ -69,8 +69,8 @@
</para>
<itemizedlist>
<listitem><para>Create a new project directory on your hard disk;</para></listitem>
- <listitem><para>Browse to the directory with the archetype (<code>richfaces\cdk\maven-archetype-seam-app</code>), switch to command line and type the next command <code>mvn install</code> to install the archetype in your repository;</para></listitem>
- <listitem><para>Then browse to your project directory and type in command line</para>
+ <listitem><para>Browse to the directory with the archetype (<code>richfaces\cdk\maven-archetype-seam-app</code>), switch to the command line and type the next command <code>mvn install</code> to install the archetype in your repository;</para></listitem>
+ <listitem><para>Then browse to your project directory and type in the command line</para>
<para><code>mvn archetype:generate </code></para>
<para><code>-DarchetypeGroupId=org.richfaces.cdk </code></para>
<para><code>-DarchetypeArtifactId=maven-archetype-seam-app </code></para>
@@ -116,7 +116,7 @@
</itemizedlist>
<para>
- The EJB module contains the entity diagram classes and the classes for interaction with database. The structure of EJB module is illustrated below:
+ The EJB module contains the entity diagram classes and the classes for interaction with a database. The structure of EJB module is illustrated below:
</para>
<figure>
@@ -141,7 +141,7 @@
</mediaobject>
</figure>
- <para>Since the Photo Album Demo uses Facelets technology the main page <code>index.xhtml</code> represents an <include> (or facelet) wrapped with the <emphasis role="bold"><ui:composition></emphasis> tag.
+ <para>Since the Photo Album Demo uses the Facelets technology the main page <code>index.xhtml</code> represents an <include> (or facelet) wrapped with the <emphasis role="bold"><ui:composition></emphasis> tag.
This tag is used to trim unnecessary markup in the facelet.
Any content outside of <emphasis role="bold"><ui:composition></emphasis> tag is ignored by the Facelets view handler.
A facelet can be incorporated into another page or facelet with the help of <emphasis role="bold"><ui:define></emphasis> and <emphasis role="bold"><ui:include></emphasis> tags pointed to by the <emphasis role="bold"><ui:include></emphasis> "src" attribute.
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml 2009-04-25 16:01:30 UTC (rev 13876)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml 2009-04-25 22:27:33 UTC (rev 13877)
@@ -8,7 +8,7 @@
It provides social services for uploading photos, storing and previewing them,
creating your own albums and sharing them with other users, searching albums,
photos or users, managing the environment.
- Newcomers or not registered users can navigate through other users shelves and albums
+ Newcomers or not registered users can navigate through other users' shelves and albums
in "Anonymous mode", but in this case no possibilities to create personal
shelves or albums or upload photos are available.
</para>
@@ -29,13 +29,13 @@
</listitem>
<listitem>
<para>
- <emphasis>built-in Ajax capability</emphasis> - the <property>RichFaces</property> offers
+ <emphasis>Built-in Ajax capability</emphasis> - the <property>RichFaces</property> offers
both component-wide and very flexible page-wide Ajax support with no need to write any JavaScript code;
</para>
</listitem>
<listitem>
<para>
- <emphasis>highly customizable look-and-feel</emphasis> - the <property>RichFaces</property> have special feature called
+ <emphasis>Highly customizable look-and-feel</emphasis> - the <property>RichFaces</property> have special feature called
<ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">Skinnability</ulink>.
</para>
</listitem>
15 years, 8 months
JBoss Rich Faces SVN: r13876 - trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tab.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-04-25 12:01:30 -0400 (Sat, 25 Apr 2009)
New Revision: 13876
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tab/TabsBean.java
Log:
tabs removing sample TODO added
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tab/TabsBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tab/TabsBean.java 2009-04-25 15:58:14 UTC (rev 13875)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tab/TabsBean.java 2009-04-25 16:01:30 UTC (rev 13876)
@@ -24,7 +24,7 @@
public void setTabsRendered(boolean tabsRendered) {
this.tabsRendered = tabsRendered;
}
-
+ //TODO Need to resolve duplicate call
public void deleteTab(ActionEvent event) {
int tabIndex = Integer.parseInt(FacesContext.getCurrentInstance()
.getExternalContext().getRequestParameterMap().get("tabToDelete"));
15 years, 8 months
JBoss Rich Faces SVN: r13875 - in trunk/samples/richfaces-demo/src/main: webapp/richfaces/tabPanel/examples and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-04-25 11:58:14 -0400 (Sat, 25 Apr 2009)
New Revision: 13875
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tab/TabsBean.java
trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel/examples/tabRemove.xhtml
Log:
tabs removing sample added
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tab/TabsBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tab/TabsBean.java 2009-04-25 15:57:12 UTC (rev 13874)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tab/TabsBean.java 2009-04-25 15:58:14 UTC (rev 13875)
@@ -27,7 +27,7 @@
public void deleteTab(ActionEvent event) {
int tabIndex = Integer.parseInt(FacesContext.getCurrentInstance()
- .getExternalContext().getRequestParameterMap().get("tab"));
+ .getExternalContext().getRequestParameterMap().get("tabToDelete"));
tabRendered[tabIndex] = false;
for (int i = 0; i < tabRendered.length; i++) {
tabsRendered = tabsRendered||tabRendered[i];
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel/examples/tabRemove.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel/examples/tabRemove.xhtml 2009-04-25 15:57:12 UTC (rev 13874)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel/examples/tabRemove.xhtml 2009-04-25 15:58:14 UTC (rev 13875)
@@ -4,14 +4,14 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
- <h:form id="form">
+ <h:form id="tabs_form">
<a4j:outputPanel id="tabsWrapper" layout="block">
- <rich:tabPanel rendered="#{tabsBean.tabsRendered}" id="tabPanel" switchType="ajax">
+ <rich:tabPanel rendered="#{tabsBean.tabsRendered}" id="RemoveAbleTabPanel" switchType="ajax">
<rich:tab rendered="#{tabsBean.tabRendered[0]}">
<f:facet name="label">
<h:panelGroup>
<h:outputText value="Ajax with RichFaces" />
- <h:graphicImage value="/images/modal/close.png" id="hidelink1" styleClass="hidelink" onclick="deleteTab('1');Event.stop(event);"/>
+ <h:graphicImage value="/images/modal/close.png" id="hidelink1" styleClass="hidelink" onclick="deleteTab('0');Event.stop(event);"/>
</h:panelGroup>
</f:facet>
<p>
@@ -30,7 +30,7 @@
<f:facet name="label">
<h:panelGroup>
<h:outputText value="RichFaces CDK" />
- <h:graphicImage value="/images/modal/close.png" id="hidelink2" styleClass="hidelink" onclick="deleteTab('2');Event.stop(event);"/>
+ <h:graphicImage value="/images/modal/close.png" id="hidelink2" styleClass="hidelink" onclick="deleteTab('1');Event.stop(event);"/>
</h:panelGroup>
</f:facet>
<p>
@@ -48,7 +48,7 @@
<f:facet name="label">
<h:panelGroup>
<h:outputText value="RichFaces Skinability" />
- <h:graphicImage value="/images/modal/close.png" id="hidelink3" styleClass="hidelink" onclick="deleteTab('3');Event.stop(event);"/>
+ <h:graphicImage value="/images/modal/close.png" id="hidelink3" styleClass="hidelink" onclick="deleteTab('2');Event.stop(event);"/>
</h:panelGroup>
</f:facet>
<p>
@@ -63,11 +63,10 @@
</rich:tab>
</rich:tabPanel>
</a4j:outputPanel>
- <a4j:jsFunction id="deleteFunc" reRender="tabsWrapper" name="deleteTab">
- <a4j:actionparam name="tab" actionListener="#{tabsBean.deleteTab}"/>
+ <a4j:jsFunction id="deleteFunc" reRender="tabsWrapper" name="deleteTab" actionListener="#{tabsBean.deleteTab}">
+ <f:param name="tabToDelete" />
</a4j:jsFunction>
<a4j:commandButton action="#{tabsBean.resetTabs}" value="Reset Tabs" reRender="tabsWrapper"/>
</h:form>
- <a4j:log popup="false"/>
<rich:messages></rich:messages>
</ui:composition>
15 years, 8 months