JBoss Rich Faces SVN: r21683 - modules/tests/metamer/trunk/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-16 04:36:18 -0500 (Wed, 16 Feb 2011)
New Revision: 21683
Modified:
modules/tests/metamer/trunk/ftest/issue-tracking-query.sh
Log:
extended issue-tracking-query.sh
Modified: modules/tests/metamer/trunk/ftest/issue-tracking-query.sh
===================================================================
--- modules/tests/metamer/trunk/ftest/issue-tracking-query.sh 2011-02-16 09:05:49 UTC (rev 21682)
+++ modules/tests/metamer/trunk/ftest/issue-tracking-query.sh 2011-02-16 09:36:18 UTC (rev 21683)
@@ -2,12 +2,16 @@
issues=`find -name "issues.txt" -exec cat {} \; -exec echo '' \; | sed -r 's# #\n#' | sort | uniq | grep RF- | sed -r 's#.*/(RF-[0-9]+)#\1,#'`
issues=`echo $issues | sed -r 's#,[^A-Z]*$##'`
-echo "===================================================================="
-echo "=============== ALL TRACKED ISSUES ================================="
-echo "===================================================================="
-echo "project = RF AND key in ($issues) AND status != Closed ORDER BY status DESC, key DESC"
-echo "===================================================================="
-echo "=============== ISSUES WHICH ARE NOT LABELED IN JIRA ==============="
-echo "===================================================================="
-echo "project = RF AND key in ($issues) AND status != Closed AND labels != "metamer-ftest-tracked" ORDER BY status DESC, key DESC"
-echo "===================================================================="
+echo "####################################################################"
+echo "############### ALL TRACKED ISSUES #################################"
+echo "####################################################################"
+echo "project = RF AND key in ($issues) AND ORDER BY status DESC, key DESC"
+echo "####################################################################"
+echo "############### ISSUES WHICH ARE NOT LABELED IN JIRA ###############"
+echo "####################################################################"
+echo "project = RF AND key in ($issues) AND AND labels != "metamer-ftest-tracked" ORDER BY status DESC, key DESC"
+echo "####################################################################"
+echo "############### ISSUES LABEL IN JIRA BUT PASSING ###################"
+echo "####################################################################"
+echo "project = RF AND key NOT IN ($issues) AND labels = metamer-ftest-tracked ORDER BY status DESC, key DESC"
+echo "####################################################################"
15 years, 2 months
JBoss Rich Faces SVN: r21682 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richAccordion and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-16 04:05:49 -0500 (Wed, 16 Feb 2011)
New Revision: 21682
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/RegressionTest.java
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java
Log:
added @RegressionTest annotation + transition of closed issues to this annotation + removing issue tracking (RF-10061, RF-10040, RF-10255, RF-9737)
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java 2011-02-16 08:51:09 UTC (rev 21681)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java 2011-02-16 09:05:49 UTC (rev 21682)
@@ -27,7 +27,7 @@
import static java.lang.annotation.ElementType.*;
/**
- * @author <a href="mailto:ppitonak@redhat.com">Lukas Fryc</a>
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
@Target({ METHOD, TYPE })
Copied: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/RegressionTest.java (from rev 21672, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java)
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/RegressionTest.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/RegressionTest.java 2011-02-16 09:05:49 UTC (rev 21682)
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.ftest.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.*;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+@Target({ METHOD, TYPE })
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface RegressionTest {
+ String[] value();
+}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-16 08:51:09 UTC (rev 21681)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-16 09:05:49 UTC (rev 21682)
@@ -46,6 +46,7 @@
import org.jboss.test.selenium.waiting.EventFiredCondition;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
import org.testng.annotations.Test;
/**
@@ -172,7 +173,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10061")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10061")
public void testData() {
selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4");
selenium.waitForPageToLoad();
@@ -524,7 +525,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10040")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10040")
public void testSwitchTypeServer() {
selenium.click(pjq("input[type=radio][name$=switchTypeInput][value=server]"));
selenium.waitForPageToLoad();
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java 2011-02-16 08:51:09 UTC (rev 21681)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java 2011-02-16 09:05:49 UTC (rev 21682)
@@ -41,6 +41,7 @@
import org.jboss.test.selenium.locator.AttributeLocator;
import org.jboss.test.selenium.waiting.EventFiredCondition;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
import org.testng.annotations.Test;
/**
@@ -190,7 +191,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10255")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10255")
public void testButtonDisabledIcon() {
selenium.click(pjq("input[name$=disabledInput][value=true]"));
selenium.waitForPageToLoad();
@@ -263,7 +264,8 @@
for (int i = 2; i < 42; i += 7) {
if (!selenium.belongsClass(cellDay.format(i), "rf-cal-boundary-day")) {
- assertTrue(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Cell nr. " + i + " should be yellow.");
+ assertTrue(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Cell nr. " + i
+ + " should be yellow.");
}
}
@@ -273,12 +275,13 @@
selenium.click(input);
for (int i = 0; i < 42; i++) {
- assertFalse(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Cell nr. " + i + " should not be yellow.");
+ assertFalse(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Cell nr. " + i
+ + " should not be yellow.");
}
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-9837 https://issues.jboss.org/browse/RF-10085")
+ @RegressionTest({ "https://issues.jboss.org/browse/RF-9837", "https://issues.jboss.org/browse/RF-10085" })
public void testDefaultTime() {
selenium.type(pjq("input[type=text][id$=defaultTimeInput]"), "21:24");
selenium.waitForPageToLoad();
@@ -328,7 +331,7 @@
selenium.click(input);
- String[] labels = {"", "Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri"};
+ String[] labels = { "", "Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri" };
for (int i = 0; i < 8; i++) {
String label = selenium.getText(weekDayLabel.format(i));
@@ -344,8 +347,8 @@
// labels = new String[]{"", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
//
// for (int i = 0; i < 8; i++) {
- // String label = selenium.getText(weekDayLabel.format(i));
- // assertEquals(label, labels[i], "Week day label " + i);
+ // String label = selenium.getText(weekDayLabel.format(i));
+ // assertEquals(label, labels[i], "Week day label " + i);
// }
}
@@ -376,7 +379,7 @@
selenium.click(input);
- String[] labels = {"", "Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"};
+ String[] labels = { "", "Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб" };
for (int i = 0; i < 8; i++) {
String label = selenium.getText(weekDayLabel.format(i));
@@ -389,7 +392,8 @@
String selectedDate = null;
try {
- Date date = new SimpleDateFormat("d MMMM, yyyy hh:mm", new Locale("ru")).parse(day + " " + month + " 12:00");
+ Date date = new SimpleDateFormat("d MMMM, yyyy hh:mm", new Locale("ru"))
+ .parse(day + " " + month + " 12:00");
selectedDate = new SimpleDateFormat("MMM d, yyyy hh:mm", new Locale("ru")).format(date);
} catch (ParseException ex) {
fail(ex.getMessage());
@@ -417,7 +421,7 @@
selenium.type(input, "Dec 23, 2010 19:27");
waitGui.failWith("Attribute oninputchange does not work correctly").until(
- new EventFiredCondition(new Event("inputchange")));
+ new EventFiredCondition(new Event("inputchange")));
}
@Test
@@ -675,13 +679,16 @@
*/
private void assertNoDateSelected() {
for (int i = 0; i < 42; i++) {
- assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + " should not be selected.");
+ assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i
+ + " should not be selected.");
}
}
/**
* Checks that no date in the open month is selected except of one passed as argument.
- * @param exceptOfDate date that should be selected (e.g. "13")
+ *
+ * @param exceptOfDate
+ * date that should be selected (e.g. "13")
*/
private void assertSelected(String exceptOfDate) {
int lowerBoundary = 0;
@@ -696,9 +703,11 @@
// check 3 lines of cells that contain selected date
for (int i = lowerBoundary; i < upperBoundary; i++) {
if (exceptOfDate.equals(selenium.getText(cellDay.format(i)))) {
- assertTrue(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + " should not be selected.");
+ assertTrue(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i
+ + " should not be selected.");
} else {
- assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + " should not be selected.");
+ assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i
+ + " should not be selected.");
}
}
@@ -707,7 +716,8 @@
// check other 3 lines of cells
for (int i = lowerBoundary; i < upperBoundary; i++) {
- assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + " should not be selected.");
+ assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i
+ + " should not be selected.");
}
}
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-02-16 08:51:09 UTC (rev 21681)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-02-16 09:05:49 UTC (rev 21682)
@@ -43,6 +43,7 @@
import org.jboss.test.selenium.locator.JQueryLocator;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
import org.testng.annotations.Test;
/**
@@ -95,7 +96,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10061")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10061")
public void testData() {
selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4");
selenium.waitForPageToLoad();
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java 2011-02-16 08:51:09 UTC (rev 21681)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java 2011-02-16 09:05:49 UTC (rev 21682)
@@ -21,15 +21,16 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.richSelect;
-import static org.jboss.test.selenium.locator.LocatorFactory.jq;
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest;
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr;
+import static org.jboss.test.selenium.locator.LocatorFactory.jq;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import java.net.URL;
+
import javax.faces.event.PhaseId;
import org.jboss.test.selenium.css.CssProperty;
@@ -40,6 +41,7 @@
import org.jboss.test.selenium.waiting.EventFiredCondition;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
import org.testng.annotations.Test;
/**
@@ -232,7 +234,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-9737")
+ @RegressionTest("https://issues.jboss.org/browse/RF-9737")
public void testListHeight() {
selenium.type(pjq("input[type=text][id$=listHeightInput]"), "300px");
selenium.waitForPageToLoad();
@@ -251,7 +253,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-9737")
+ @RegressionTest("https://issues.jboss.org/browse/RF-9737")
public void testListWidth() {
selenium.type(pjq("input[type=text][id$=listWidthInput]"), "300px");
selenium.waitForPageToLoad();
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-16 08:51:09 UTC (rev 21681)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-16 09:05:49 UTC (rev 21682)
@@ -42,6 +42,7 @@
import org.jboss.test.selenium.waiting.EventFiredCondition;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
import org.testng.annotations.Test;
/**
@@ -178,7 +179,8 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10061 https://issues.jboss.org/browse/RF-10521")
+ @IssueTracking("https://issues.jboss.org/browse/RF-10521")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10061")
public void testData() {
selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4");
selenium.waitForPageToLoad();
@@ -433,7 +435,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10040")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10040")
public void testSwitchTypeServer() {
selenium.click(pjq("input[name$=switchTypeInput][value=server]"));
selenium.waitForPageToLoad();
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-16 08:51:09 UTC (rev 21681)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-16 09:05:49 UTC (rev 21682)
@@ -41,6 +41,7 @@
import org.jboss.test.selenium.waiting.EventFiredCondition;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
import org.testng.annotations.Test;
/**
@@ -139,7 +140,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10040")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10040")
public void testFirstLastPrevNextSwitchServer() {
selenium.click(pjq("input[name$=switchTypeInput][value=server]"));
selenium.waitForPageToLoad();
@@ -209,7 +210,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10061")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10061")
public void testData() {
selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4");
selenium.waitForPageToLoad();
@@ -473,7 +474,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10040")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10040")
public void testSwitchTypeServer() {
selenium.click(pjq("input[name$=switchTypeInput][value=server]"));
selenium.waitForPageToLoad();
15 years, 2 months
JBoss Rich Faces SVN: r21681 - trunk/ui/output/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-16 03:51:09 -0500 (Wed, 16 Feb 2011)
New Revision: 21681
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java
Log:
RF-10523 Tab panel: item change listener not called
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java 2011-02-16 01:03:14 UTC (rev 21680)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java 2011-02-16 08:51:09 UTC (rev 21681)
@@ -82,33 +82,20 @@
public abstract String getTabHeaderClass();
@Attribute(hidden = true)
- public boolean isBypassUpdates() {
- throw new IllegalStateException("this method shouldn't be used");
- }
+ public abstract boolean isBypassUpdates();
@Attribute(hidden = true)
- public boolean isLimitRender() {
- throw new IllegalStateException("this method shouldn't be used");
- }
+ public abstract boolean isLimitRender();
@Attribute(hidden = true)
- public Object getData() {
- throw new IllegalStateException("this method shouldn't be used");
- }
-
+ public abstract Object getData();
+
@Attribute(hidden = true)
- public String getStatus() {
- throw new IllegalStateException("this method shouldn't be used");
- }
+ public abstract String getStatus();
@Attribute(hidden = true)
- public Object getExecute() {
- throw new IllegalStateException("this method shouldn't be used");
- }
+ public abstract Object getExecute();
@Attribute(hidden = true)
- public Object getRender() {
- throw new IllegalStateException("this method shouldn't be used");
- }
-
+ public abstract Object getRender();
}
15 years, 2 months
JBoss Rich Faces SVN: r21680 - trunk/dist.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2011-02-15 20:03:14 -0500 (Tue, 15 Feb 2011)
New Revision: 21680
Removed:
trunk/dist/JBossORG-EULA.txt
Modified:
trunk/dist/richfaces-examples.xml
trunk/dist/richfaces.xml
Log:
RF-10508 removed JBossORG-EULA.txt from distributions
Deleted: trunk/dist/JBossORG-EULA.txt
===================================================================
--- trunk/dist/JBossORG-EULA.txt 2011-02-16 00:40:55 UTC (rev 21679)
+++ trunk/dist/JBossORG-EULA.txt 2011-02-16 01:03:14 UTC (rev 21680)
@@ -1,104 +0,0 @@
-LICENSE AGREEMENT
-JBOSS(r)
-
-This License Agreement governs the use of the Software Packages and any updates to the Software
-Packages, regardless of the delivery mechanism. Each Software Package is a collective work
-under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
-the user ("Client") a license to the applicable collective work(s) pursuant to the
-GNU Lesser General Public License v. 2.1 except for the following Software Packages:
-(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
-GNU General Public License v.2;
-
-(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
-
-(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
-(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
-it may purchase a license from Sleepycat Software);
-
-and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
-and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
-royalty-free patent licenses.
-
-Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
-
-1. The Software. "Software Packages" refer to the various software modules that are created and made available
-for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
-may be comprised of hundreds of software components. The end user license agreement for each component is located in
-the component's source code. With the exception of certain image files identified in Section 2 below,
-the license terms for the components permit Client to copy, modify, and redistribute the component,
-in both source code and binary code forms. This agreement does not limit Client's rights under,
-or grant Client rights that supersede, the license terms of any particular component.
-
-2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
-and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
-remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
-individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
-in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
-using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
-trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
-these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
-If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
-http://www.jboss.com/company/logos unless a separate agreement with Red Hat is executed or other permission granted.
-Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
-
-3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
-component, to the maximum extent permitted under applicable law, the Software Packages and the
-components are provided and licensed "as is" without warranty of any kind, expressed or implied,
-including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
-Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
-materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
-Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
-or that the operation of the Software Packages will be entirely error free or appear precisely as described
-in the accompanying documentation. This warranty extends only to the party that purchases the Services
-pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
-
-4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
-described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
-exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
-delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
-refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
-Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
-damages, including lost profits or lost savings arising out of the use or inability to use the Software,
-even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
-Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
-Agreement during the twelve months preceding the action.
-
-5. Export Control. As required by U.S. law, Client represents and warrants that it:
-(a) understands that the Software Packages are subject to export controls under the
-U.S. Commerce Department's Export Administration Regulations ("EAR");
-
-(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
-(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
-
-(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
-or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
-
-(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
-biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
-regulation or specific license;
-
-(e) understands and agrees that if it is in the United States and exports or transfers the Software
-Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
-reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
-address (including country) of each transferee;
-
-and (f) understands that countries other than the United States may restrict the import, use, or
-export of encryption products and that it shall be solely responsible for compliance with any such
-import, use, or export restrictions.
-
-6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
-that are not part of the Software Packages and which Client must install separately. These third party
-programs are subject to their own license terms. The license terms either accompany the programs or
-can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
-license terms for such programs, then Client may not install them. If Client wishes to install the programs
-on more than one system or transfer the programs to another party, then Client must contact the licensor
-of the programs.
-
-7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
-enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
-State of North Carolina and of the United States, without regard to any conflict of laws provisions,
-except that the United Nations Convention on the International Sale of Goods shall not apply.
-
-Copyright 2006-2008 Red Hat, Inc. All rights reserved.
-"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
-All other trademarks are the property of their respective owners.
Modified: trunk/dist/richfaces-examples.xml
===================================================================
--- trunk/dist/richfaces-examples.xml 2011-02-16 00:40:55 UTC (rev 21679)
+++ trunk/dist/richfaces-examples.xml 2011-02-16 01:03:14 UTC (rev 21680)
@@ -11,9 +11,6 @@
<source>readme-examples.txt</source>
<destName>readme.txt</destName>
</file>
- <file>
- <source>JBossORG-EULA.txt</source>
- </file>
</files>
<moduleSets>
Modified: trunk/dist/richfaces.xml
===================================================================
--- trunk/dist/richfaces.xml 2011-02-16 00:40:55 UTC (rev 21679)
+++ trunk/dist/richfaces.xml 2011-02-16 01:03:14 UTC (rev 21680)
@@ -39,9 +39,6 @@
<source>readme-examples.txt</source>
<destName>examples/readme.txt</destName>
</file>
- <file>
- <source>JBossORG-EULA.txt</source>
- </file>
</files>
<fileSets>
15 years, 2 months
JBoss Rich Faces SVN: r21679 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2011-02-15 19:40:55 -0500 (Tue, 15 Feb 2011)
New Revision: 21679
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Drag_and_drop.xml
Log:
Updated drag and drop as per RFPL-1035
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Drag_and_drop.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Drag_and_drop.xml 2011-02-16 00:24:46 UTC (rev 21678)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Drag_and_drop.xml 2011-02-16 00:40:55 UTC (rev 21679)
@@ -19,23 +19,23 @@
<section id="sect-Component_Reference-Drag_and_drop-richdragSource">
<title><sgmltag><rich:dragSource></sgmltag></title>
<para>
- The <sgmltag><rich:dragSource></sgmltag> behavior can be added to a component to indicate it is capable of being dragged by the user. The dragged item can then be dropped into a compatible drop area, designated using the <sgmltag><rich:dropTarget></sgmltag> behavior.
+ The <sgmltag><rich:dragSource></sgmltag> component can be added to a component to indicate it is capable of being dragged by the user. The dragged item can then be dropped into a compatible drop area, designated using the <sgmltag><rich:dropTarget></sgmltag> component.
</para>
<section id="sect-Component_Reference-richdragSource-Basic_usage">
<title>Basic usage</title>
<para>
- To add drag support to a component, attach the <sgmltag><rich:dragSource></sgmltag> behavior as a child element.
+ To add drag support to a component, attach the <sgmltag><rich:dragSource></sgmltag> component as a child element.
</para>
<para>
- The <varname>type</varname> attribute must be specified, and can be any identifying string. Dragged items can only be dropped in drop zones where the <varname>type</varname> attribute of the <sgmltag><rich:dragSource></sgmltag> behavior is listed in the <varname>acceptedTypes</varname> attribute of the <sgmltag><rich:dropTarget></sgmltag> behavior.
+ The <varname>type</varname> attribute must be specified, and can be any identifying string. Dragged items can only be dropped in drop zones where the <varname>type</varname> attribute of the <sgmltag><rich:dragSource></sgmltag> component is listed in the <varname>acceptedTypes</varname> attribute of the <sgmltag><rich:dropTarget></sgmltag> component.
</para>
</section>
<section id="sect-Component_Reference-richdragSource-Dragging_an_object">
<title>Dragging an object</title>
<para>
- Use the <varname>dragIndicator</varname> parameter to customize the appearance of a dragged object while it is being dragged. The <varname>dragIndicator</varname> parameter must point to the <varname>id</varname> identifier of a <sgmltag><rich:dragIndicator></sgmltag> component.
+ Use the <varname>dragIndicator</varname> parameter to customize the appearance of a dragged object while it is being dragged. The <varname>dragIndicator</varname> parameter must point to the <varname>id</varname> identifier of a <sgmltag><rich:dragIndicator></sgmltag> component. If the <varname>dragIndicator</varname> attribute is not defined, the drag indicator appears as a clone of the <sgmltag><rich:dragSource></sgmltag> component's parent control.
</para>
<para>
To bind data to the dragged object, use the <varname>dragValue</varname> attribute. The <varname>dragValue</varname> attribute specifies an item in a data model, which is then bound to the parent component when it is dragged. This facilitates handling event data during a drop event.
@@ -78,16 +78,16 @@
<section id="sect-Component_Reference-Drag_and_drop-richdropTarget">
<title><sgmltag><rich:dropTarget></sgmltag></title>
<para>
- The <sgmltag><rich:dropTarget></sgmltag> behavior can be added to a component so that the component can accept dragged items. The dragged items must support the <sgmltag><rich:dragSource></sgmltag> behavior, and be of a compatible drop type.
+ The <sgmltag><rich:dropTarget></sgmltag> component can be added to a component so that the component can accept dragged items. The dragged items must support the <sgmltag><rich:dragSource></sgmltag> component, and be of a compatible drop type.
</para>
<section id="sect-Component_Reference-richdropTarget-Basic_usage">
<title>Basic usage</title>
<para>
- To allow dragged items to be dropped on a component, attach the <sgmltag><rich:dropTarget></sgmltag> behavior as a child element to the component.
+ To allow dragged items to be dropped on a component, attach the <sgmltag><rich:dropTarget></sgmltag> component as a child element to the component.
</para>
<para>
- The <varname>acceptedTypes</varname> attribute must be specified. The <varname>acceptedTypes</varname> attribute is a comma-separated list of strings that match the types of dragged items. Dragged items can only be dropped in drop zones where the <varname>type</varname> attribute of the <sgmltag><rich:dragSource></sgmltag> behavior is listed in the <varname>acceptedTypes</varname> attribute of the <sgmltag><rich:dropTarget></sgmltag> behavior.
+ The <varname>acceptedTypes</varname> attribute must be specified. The <varname>acceptedTypes</varname> attribute is a comma-separated list of strings that match the types of dragged items. Dragged items can only be dropped in drop zones where the <varname>type</varname> attribute of the <sgmltag><rich:dragSource></sgmltag> component is listed in the <varname>acceptedTypes</varname> attribute of the <sgmltag><rich:dropTarget></sgmltag> component.
</para>
<para>
The <varname>acceptedTypes</varname> attribute can optionally be set to either <literal>@none</literal> or <literal>@all</literal>. If set to <literal>@none</literal>, the component will not accept any type of dropped object. If set to <literal>@all</literal>, the component accepts all dropped objects. If the <varname>acceptedTypes</varname> attribute is not specified, the default value is <literal>null</literal>, which is the same as a <literal>@none</literal> setting.
@@ -100,22 +100,22 @@
To provide additional parameters for a drop event, use the <varname>dropValue</varname> attribute.
</para>
<para>
- The <sgmltag><rich:dropTarget></sgmltag> behavior raises the <varname>DropEvent</varname> server-side event when an object is dropped. The event uses the following parameters:
+ The <sgmltag><rich:dropTarget></sgmltag> component raises the <varname>DropEvent</varname> server-side event when an object is dropped. The event uses the following parameters:
</para>
<itemizedlist>
<listitem>
<para>
- The <parameter>dragSource</parameter> identifies the component being dragged (the parent of the <sgmltag><rich:dragSource></sgmltag> behavior).
+ The <parameter>dragSource</parameter> identifies the component being dragged (the parent of the <sgmltag><rich:dragSource></sgmltag> component).
</para>
</listitem>
<listitem>
<para>
- The <parameter>dragValue</parameter> parameter is the content of the <sgmltag><rich:dragSource></sgmltag> behavior's <varname>dragValue</varname> attribute.
+ The <parameter>dragValue</parameter> parameter is the content of the <sgmltag><rich:dragSource></sgmltag> component's <varname>dragValue</varname> attribute.
</para>
</listitem>
<listitem>
<para>
- The <parameter>dropValue</parameter> parameter is the content of the <sgmltag><rich:dropTarget></sgmltag> behavior's <varname>dropValue</varname> attribute.
+ The <parameter>dropValue</parameter> parameter is the content of the <sgmltag><rich:dropTarget></sgmltag> component's <varname>dropValue</varname> attribute.
</para>
</listitem>
</itemizedlist>
@@ -189,7 +189,7 @@
<term><varname>acceptClass</varname></term>
<listitem>
<para>
- The <varname>acceptClass</varname> attribute specifies the style when the dragged element is over an acceptable drop target. It indicates that the <varname>type</varname> attribute of the element's <sgmltag><rich:dragSource></sgmltag> behavior matches <varname>acceptedTypes</varname> attribute of the drop target's <sgmltag><rich:dropTarget></sgmltag> behavior.
+ The <varname>acceptClass</varname> attribute specifies the style when the dragged element is over an acceptable drop target. It indicates that the <varname>type</varname> attribute of the element's <sgmltag><rich:dragSource></sgmltag> component matches <varname>acceptedTypes</varname> attribute of the drop target's <sgmltag><rich:dropTarget></sgmltag> component.
</para>
</listitem>
</varlistentry>
@@ -197,7 +197,7 @@
<term><varname>rejectClass</varname></term>
<listitem>
<para>
- The <varname>rejectClass</varname> attribute specifies the style when the dragged element is over a drop target that is not acceptable. It indicates that the <varname>type</varname> attribute of the element's <sgmltag><rich:dragSource></sgmltag> behavior is not found in the <varname>acceptedTypes</varname> attribute of the drop target's <sgmltag><rich:dropTarget></sgmltag> behavior.
+ The <varname>rejectClass</varname> attribute specifies the style when the dragged element is over a drop target that is not acceptable. It indicates that the <varname>type</varname> attribute of the element's <sgmltag><rich:dragSource></sgmltag> component is not found in the <varname>acceptedTypes</varname> attribute of the drop target's <sgmltag><rich:dropTarget></sgmltag> component.
</para>
</listitem>
</varlistentry>
15 years, 2 months
JBoss Rich Faces SVN: r21678 - trunk/core/impl.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2011-02-15 19:24:46 -0500 (Tue, 15 Feb 2011)
New Revision: 21678
Removed:
trunk/core/impl/generatescript.xml
Log:
RF-10019 remove unneeded legacy file
Deleted: trunk/core/impl/generatescript.xml
===================================================================
--- trunk/core/impl/generatescript.xml 2011-02-15 21:19:49 UTC (rev 21677)
+++ trunk/core/impl/generatescript.xml 2011-02-16 00:24:46 UTC (rev 21678)
@@ -1,157 +0,0 @@
-<?xml version="1.0"?>
-<!-- ======================================================================
- 12.11.2005 23:40:43
-
- assemblescripts
- Assemble all javaScript library files to one AJAXJSF.js
-
- shura
- ====================================================================== -->
-<project name="assemblescripts" default="assembly">
- <description>
- Assemble all javaScript library files to one AJAXJSF.js
- </description>
-
- <property name="scripts-path" value="org/ajax4jsf/javascript/scripts"></property>
- <property name="prototype-scripts-path" value="org/ajax4jsf/javascript/scripts"></property>
- <property name="scriptaculous-scripts-path" value="org/richfaces/renderkit/html/scripts/scriptaculous"></property>
- <property name="jquery-scripts-path" value="org/richfaces/renderkit/html/scripts/jquery"></property>
-
- <property name="target-dir" value="${project.build.directory}/javascript"></property>
-
- <property name="scripts.dir"
- value="${target-dir}/${scripts-path}"
- />
- <property name="prototype.scripts.dir"
- value="${target-dir}/${prototype-scripts-path}"
- />
- <property name="script" value="AJAX.js" />
-
- <property name="script.rico" value="rico.js"></property>
- <property name="script.aculo" value="scriptaculo.js"></property>
- <property name="script.scriptaculous" value="scriptaculous.js"></property>
- <property name="scriptaculous.scripts.dir"
- value="${target-dir}/${scriptaculous-scripts-path}"/>
- <property name="jquery.scripts.dir"
- value="${target-dir}/${jquery-scripts-path}"/>
-
- <property name="script.prototype" value="prototype.js"></property>
- <property name="script.jquery" value="jquery.js"></property>
-
- <property name="script.imagecache" value="imagecache.js"></property>
- <property name="script.dnd" value="dnd.js"></property>
- <property name="script.css-rules" value="css-rules.js"></property>
- <filelist id="imagecache" dir="${basedir}/src/main/javascript/ajaxjsf" files="imagecache.js"></filelist>
-<!--
- <filelist id="prototype"
- dir="${basedir}/src/main/javascript/prototype"
- files="empty.js,base.js,string.js,enumerable.js,array.js,hash.js,range.js"
- >
--->
- <filelist id="jquery"
- dir="${basedir}/src/main/javascript/jquery"
- files="jquery-1.3.2.js,../memory.js,patches.js">
- </filelist>
-
- <filelist id="scriptaculous"
- dir="${basedir}/src/main/javascript/scriptaculous"
- files="builder.js,effects.js,dragdrop.js,controls.js,slider.js,sound.js" >
- </filelist>
-
-
- <filelist id="prototype"
- dir="${basedir}/src/main/javascript/prototype"
- files="prototype-1.6.0.3.js,../memory.js,patches.js">
- </filelist>
-
-
- <filelist id="dnd"
- dir="${basedir}/src/main/javascript/dnd"
- files="prolog.js,dnd.js,epilog.js">
- </filelist>
-
- <filelist id="ajaxjsf" dir="${basedir}/src/main/javascript/ajaxjsf" files="prolog.js,sarissa.js,JSFAJAX.js,queue.js,log4ajax.js,epilog.js,../memory.js"></filelist>
- <!-- =================================
- target: assemble
- ================================= -->
- <target name="assembly"
- depends="depends"
- description="--> Assemble all javaScript library files to one AJAXJSF.js"
- >
- <concat append="false"
- binary="false"
- destfile="${scripts.dir}/${script}"
- fixlastline="yes"
- eol="unix"
- >
- <filelist refid="ajaxjsf">
- </filelist>
- </concat>
- <concat append="false"
- binary="false"
- destfile="${scripts.dir}/${script.imagecache}"
- fixlastline="yes"
- eol="unix"
- >
- <filelist refid="imagecache"/>
- </concat>
- <concat append="false"
- binary="false"
- destfile="${scripts.dir}/${script.dnd}"
- fixlastline="yes"
- eol="unix"
- >
- <filelist refid="dnd"/>
- </concat>
- <concat append="false"
- binary="false"
- destfile="${prototype.scripts.dir}/${script.prototype}"
- fixlastline="yes"
- eol="unix">
- <filelist refid="prototype">
- </filelist>
- </concat>
- <concat append="false"
- binary="false"
- destfile="${scriptaculous.scripts.dir}/${script.scriptaculous}"
- fixlastline="yes"
- eol="unix"
- >
- <filelist refid="scriptaculous"></filelist>
- </concat>
-
- <concat append="false"
- binary="false"
- destfile="${jquery.scripts.dir}/${script.jquery}"
- fixlastline="yes"
- eol="unix"
- >
- <filelist refid="jquery"></filelist>
- </concat>
-
-
- <copy todir="${prototype.scripts.dir}" file="${basedir}/src/main/javascript/ajaxjsf/smartposition.js">
- </copy>
- <copy todir="${scriptaculous.scripts.dir}">
- <fileset dir="${basedir}/src/main/javascript/scriptaculous"></fileset>
- </copy>
- </target>
-
-
- <!-- =================================
- target: fixeol
- ================================= -->
- <target name="fixeol" depends="depends" description="--> Fix CR/LF in files">
- <fixcrlf srcdir="${basedir}" includes="*.js" eol="unix">
- </fixcrlf>
- </target>
-
-
- <!-- - - - - - - - - - - - - - - - - -
- target: depends
- - - - - - - - - - - - - - - - - - -->
- <target name="depends">
- </target>
-
-</project>
-
15 years, 2 months
JBoss Rich Faces SVN: r21677 - trunk/ui/input/ui/src/main/java/org/richfaces/context.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2011-02-15 16:19:49 -0500 (Tue, 15 Feb 2011)
New Revision: 21677
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java
Log:
RESOLVED - issue RF-10528: Multipart request processing stops RichFaces in portals
https://issues.jboss.org/browse/RF-10528
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java 2011-02-15 17:43:17 UTC (rev 21676)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java 2011-02-15 21:19:49 UTC (rev 21677)
@@ -91,53 +91,57 @@
public PartialViewContext getPartialViewContext(FacesContext facesContext) {
PartialViewContext partialViewContext = parentFactory.getPartialViewContext(facesContext);
ExternalContext externalContext = facesContext.getExternalContext();
- HttpServletRequest request = (HttpServletRequest) externalContext.getRequest();
- Map<String, String> queryParamMap = parseQueryString(request.getQueryString());
- String uid = queryParamMap.get(UID_KEY);
- if (uid != null) {
- long contentLength = Long.parseLong(externalContext.getRequestHeaderMap().get("Content-Length"));
- if (maxRequestSize != 0 && contentLength > maxRequestSize) {
- printResponse(facesContext, uid, ResponseState.sizeExceeded);
- } else {
- final MultipartRequest multipartRequest = new MultipartRequest(request, createTempFiles,
- tempFilesDirectory, uid);
- try {
- final PartialViewContext viewContext = partialViewContext;
- partialViewContext = new PartialViewContextWrapper() {
- @Override
- public void processPartial(PhaseId phaseId) {
- try {
- super.processPartial(phaseId);
- } finally {
- if (PhaseId.RENDER_RESPONSE.equals(phaseId)) {
- multipartRequest.cancel();
- //TODO PartialViewContext.release isn't invoked by JSF. Maybe it's a bug.
- //So we should use PartialViewContext.processPartial instead of.
+ Object request = externalContext.getRequest();
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ Map<String, String> queryParamMap = parseQueryString(httpRequest.getQueryString());
+ String uid = queryParamMap.get(UID_KEY);
+ if (uid != null) {
+ long contentLength = Long.parseLong(externalContext.getRequestHeaderMap().get("Content-Length"));
+ if (maxRequestSize != 0 && contentLength > maxRequestSize) {
+ printResponse(facesContext, uid, ResponseState.sizeExceeded);
+ } else {
+ final MultipartRequest multipartRequest =
+ new MultipartRequest(httpRequest, createTempFiles, tempFilesDirectory, uid);
+ try {
+ final PartialViewContext viewContext = partialViewContext;
+ partialViewContext = new PartialViewContextWrapper() {
+ @Override
+ public void processPartial(PhaseId phaseId) {
+ try {
+ super.processPartial(phaseId);
+ } finally {
+ if (PhaseId.RENDER_RESPONSE.equals(phaseId)) {
+ multipartRequest.cancel();
+ // TODO PartialViewContext.release isn't invoked by JSF. Maybe it's a bug.
+ // So we should use PartialViewContext.processPartial instead of.
+ }
}
}
+
+ // TODO This method can be removed from here when PartialViewContextWrapper will implement
+ // it.
+ @Override
+ public void setPartialRequest(boolean isPartialRequest) {
+ viewContext.setPartialRequest(isPartialRequest);
+ }
+
+ @Override
+ public PartialViewContext getWrapped() {
+ return viewContext;
+ }
+ };
+ multipartRequest.parseRequest();
+ if (!multipartRequest.isDone()) {
+ printResponse(facesContext, uid, ResponseState.stopped);
+ } else {
+ externalContext.setRequest(multipartRequest);
}
-
- //TODO This method can be removed from here when PartialViewContextWrapper will implement it.
- @Override
- public void setPartialRequest(boolean isPartialRequest) {
- viewContext.setPartialRequest(isPartialRequest);
- }
-
- @Override
- public PartialViewContext getWrapped() {
- return viewContext;
- }
- };
- multipartRequest.parseRequest();
- if (!multipartRequest.isDone()) {
- printResponse(facesContext, uid, ResponseState.stopped);
- } else {
- externalContext.setRequest(multipartRequest);
+ } catch (FileUploadException e) {
+ printResponse(facesContext, uid, ResponseState.serverError);
+ } finally {
+ multipartRequest.clearRequestData();
}
- } catch (FileUploadException e) {
- printResponse(facesContext, uid, ResponseState.serverError);
- } finally {
- multipartRequest.clearRequestData();
}
}
}
15 years, 2 months
JBoss Rich Faces SVN: r21676 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2011-02-15 12:43:17 -0500 (Tue, 15 Feb 2011)
New Revision: 21676
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.js
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js
Log:
https://jira.jboss.org/browse/RF-10401
https://jira.jboss.org/browse/RF-10526
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.js 2011-02-15 17:38:21 UTC (rev 21675)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.js 2011-02-15 17:43:17 UTC (rev 21676)
@@ -56,7 +56,7 @@
menuGroup.__panelMenu().bind("expand", function (event) {
menuGroup.__childGroups().each (function (index, group) {
if (event.target.id != group.id) {
- rf.$(group.id).collapse();
+ rf.$(group.id).__collapse();
}
});
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js 2011-02-15 17:38:21 UTC (rev 21675)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js 2011-02-15 17:43:17 UTC (rev 21676)
@@ -91,9 +91,9 @@
* */
execClient : function (group, expand) {
if (expand) {
- group.expand();
+ group.__expand();
} else {
- group.collapse();
+ group.__collapse();
}
return group.__fireEvent("switch");
@@ -209,23 +209,19 @@
// return this.__content().hasClass("rf-pm-exp")
return this.__getExpandValue();
},
-
+
expand : function () {
if (this.expanded()) return;
if (!this.__fireEvent("beforeexpand")) {
return false;
}
-
+
EXPAND_ITEM.exec(this, true);
-
- return this.__fireEvent("expand");
},
__expand : function () {
- this.__content().removeClass("rf-pm-colps").addClass("rf-pm-exp");
- this.__header().removeClass("rf-pm-hdr-colps").addClass("rf-pm-hdr-exp");
-
- this.__setExpandValue(true);
+ this.__updateStyles(true);
+ return this.__fireEvent("expand");
},
collapsed : function () {
@@ -233,28 +229,40 @@
// return this.__content().hasClass("rf-pm-colps")
return !this.__getExpandValue();
},
-
+
collapse : function () {
if (!this.expanded()) return;
- if (!this.__fireEvent("beforecollapse")) {
+ if (!this.__fireEvent("beforecollapse")) {
return false;
}
- EXPAND_ITEM.exec(this, true);
-
+ EXPAND_ITEM.exec(this, false);
+ },
+
+ __collapse : function () {
+ this.__updateStyles(false);
+
this.__childGroups().each (function(index, group) {
//TODO nick - why not group.collapse()?
rf.$(group.id).__collapse();
});
-
- return this.__fireEvent("collapse");
+
+ return this.__fireEvent("collapse");
},
- __collapse : function () {
- this.__content().addClass("rf-pm-colps").removeClass("rf-pm-exp");
- this.__header().addClass("rf-pm-hdr-colps").removeClass("rf-pm-hdr-exp");
+ __updateStyles : function (expand) {
+ if (expand) {
+ //expand
+ this.__content().removeClass("rf-pm-colps").addClass("rf-pm-exp");
+ this.__header().removeClass("rf-pm-hdr-colps").addClass("rf-pm-hdr-exp");
- this.__setExpandValue(false);
+ this.__setExpandValue(true);
+ } else {
+ this.__content().addClass("rf-pm-colps").removeClass("rf-pm-exp");
+ this.__header().addClass("rf-pm-hdr-colps").removeClass("rf-pm-hdr-exp");
+
+ this.__setExpandValue(false);
+ }
},
/**
@@ -272,7 +280,11 @@
return false;
}
- EXPAND_ITEM.exec(this, !this.expanded());
+ if (this.expanded()) {
+ this.collapse();
+ } else {
+ this.expand();
+ }
},
/**
15 years, 2 months
JBoss Rich Faces SVN: r21675 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-15 12:38:21 -0500 (Tue, 15 Feb 2011)
New Revision: 21675
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js
Log:
https://issues.jboss.org/browse/RF-10507 class hardcoded in menu-base.js
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js 2011-02-15 17:35:56 UTC (rev 21674)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js 2011-02-15 17:38:21 UTC (rev 21675)
@@ -15,6 +15,7 @@
selectItemCss : "rf-ddm-itm-sel",
unselectItemCss : "rf-ddm-itm-unsel",
disabledItemCss : "rf-ddm-itm-dis",
+ labelCss: "rf-ddm-lbl",
listCss : "rf-ddm-lst",
listContainerCss : "rf-ddm-lst-bg"
};
@@ -143,12 +144,12 @@
__getParentMenuFromItem : function(item) {
var menu;
if (item)
- menu = item.parents('div.rf-ddm-itm')
- .has('div.rf-ddm-lst-bg').eq(1);
+ menu = item.parents('div.'+this.options.itemCss)
+ .has('div.'+this.options.listContainerCss).eq(1);
if (menu && menu.length > 0)
return menu;
else {
- menu = item.parents('div.rf-ddm-lbl');
+ menu = item.parents('div.'+this.options.labelCss);
if (menu && menu.length > 0)
return menu;
else
@@ -157,8 +158,8 @@
},
__getParentMenu : function() {
- var menu = $(this.element).parents('div.rf-ddm-itm')
- .has('div.rf-ddm-lst-bg').eq(0);
+ var menu = $(this.element).parents('div.'+this.options.itemCss)
+ .has('div.'+this.options.listContainerCss).eq(0);
if (menu && menu.length > 0)
return menu;
else {
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js 2011-02-15 17:35:56 UTC (rev 21674)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js 2011-02-15 17:38:21 UTC (rev 21675)
@@ -5,8 +5,7 @@
direction : "AA",
jointPoint : "AA",
positionType : "DDMENUGROUP",
- showDelay : 300,
- itemCss : "rf-ddm-itm"
+ showDelay : 300
}
// constructor definition
rf.ui.MenuGroup = function(componentId, options) {
@@ -59,12 +58,12 @@
},
select : function() {
- this.jqueryElement.removeClass('rf-ddm-itm-unsel');
- this.jqueryElement.addClass('rf-ddm-itm-sel');
+ this.jqueryElement.removeClass(this.options.unselectItemCss);
+ this.jqueryElement.addClass(this.options.selectItemCss);
},
unselect : function() {
- this.jqueryElement.removeClass('rf-ddm-itm-sel');
- this.jqueryElement.addClass('rf-ddm-itm-unsel');
+ this.jqueryElement.removeClass(this.options.selectItemCss);
+ this.jqueryElement.addClass(this.options.unselectItemCss);
},
__showHandler : function() {
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js 2011-02-15 17:35:56 UTC (rev 21674)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js 2011-02-15 17:38:21 UTC (rev 21675)
@@ -1,9 +1,13 @@
(function($, rf) {
rf.ui = rf.ui || {};
- var defaultOptions = {
- mode : "server"
- }
+ var defaultOptions = {
+ itemCss : "rf-ddm-itm",
+ selectItemCss : "rf-ddm-itm-sel",
+ unselectItemCss : "rf-ddm-itm-unsel",
+ labelCss: "rf-ddm-lbl",
+ mode : "server"
+ }
// constructor definition
@@ -29,13 +33,13 @@
return {
name : "MenuItem",
select : function() {
- this.element.removeClass('rf-ddm-itm-unsel');
- this.element.addClass('rf-ddm-itm-sel');
+ this.element.removeClass(this.options.unselectItemCss);
+ this.element.addClass(this.options.selectItemCss);
this.selected = true;
},
unselect : function() {
- this.element.removeClass('rf-ddm-itm-sel');
- this.element.addClass('rf-ddm-itm-unsel');
+ this.element.removeClass(this.options.selectItemCss);
+ this.element.addClass(this.options.unselectItemCss);
this.selected = false;
},
activate : function() {
@@ -82,7 +86,7 @@
},
__getParentMenu : function() {
- var menu = this.element.parents('div.rf-ddm-lbl');
+ var menu = this.element.parents('div.'+this.options.labelCss);
if (menu && menu.length > 0)
return rf.$(menu);
else
15 years, 2 months
JBoss Rich Faces SVN: r21674 - modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-15 12:35:56 -0500 (Tue, 15 Feb 2011)
New Revision: 21674
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml
Log:
unnecessary attributes removed from rich:select sample
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml 2011-02-15 17:35:34 UTC (rev 21673)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml 2011-02-15 17:35:56 UTC (rev 21674)
@@ -41,12 +41,9 @@
<ui:define name="component">
<rich:select id="select"
- changedStateClass="#{richSelectBean.attributes['changedStateClass'].value}"
converterMessage="#{richSelectBean.attributes['converterMessage'].value}"
defaultLabel="#{richSelectBean.attributes['defaultLabel'].value}"
disabled="#{richSelectBean.attributes['disabled'].value}"
- disabledStateClass="#{richSelectBean.attributes['disabledStateClass'].value}"
- editStateClass="#{richSelectBean.attributes['editStateClass'].value}"
enableManualInput="#{richSelectBean.attributes['enableManualInput'].value}"
immediate="#{richSelectBean.attributes['immediate'].value}"
itemClass="#{richSelectBean.attributes['itemClass'].value}"
@@ -79,7 +76,6 @@
onmouseover="#{richSelectBean.attributes['onmouseover'].value}"
onmouseup="#{richSelectBean.attributes['onmouseup'].value}"
onselectitem="#{richSelectBean.attributes['onselectitem'].value}"
- readyStateClass="#{richSelectBean.attributes['readyStateClass'].value}"
rendered="#{richSelectBean.attributes['rendered'].value}"
required="#{richSelectBean.attributes['required'].value}"
requiredMessage="#{richSelectBean.attributes['requiredMessage'].value}"
15 years, 2 months