JBoss Rich Faces SVN: r22823 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-10-19 05:56:25 -0400 (Wed, 19 Oct 2011)
New Revision: 22823
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java
Log:
tests for tree model adaptors fixed
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2011-10-19 09:06:48 UTC (rev 22822)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2011-10-19 09:56:25 UTC (rev 22823)
@@ -219,7 +219,7 @@
<fieldset>
<legend>rich:tree</legend>
- <metamer:attributes value="#{richTreeBean.attributes}" id="treeAttributes" />
+ <metamer:attributes value="#{richTreeBean.attributes}" id="attributes" />
<fieldset>
<legend>rich:treeModelRecursiveAdaptor [0]</legend>
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-10-19 09:06:48 UTC (rev 22822)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-10-19 09:56:25 UTC (rev 22823)
@@ -59,7 +59,7 @@
private boolean recursiveLeafChildrenNullable;
public URL getTestUrl() {
- return buildUrl(contextPath, "/faces/components/richTree/treeAdaptors.xhtml");
+ return buildUrl(contextPath, "faces/components/richTree/treeAdaptors.xhtml");
}
@BeforeMethod
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java 2011-10-19 09:06:48 UTC (rev 22822)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java 2011-10-19 09:56:25 UTC (rev 22823)
@@ -63,7 +63,7 @@
}
public URL getTestUrl() {
- return buildUrl(contextPath, "/faces/components/richTree/treeAdaptors.xhtml");
+ return buildUrl(contextPath, "faces/components/richTree/treeAdaptors.xhtml");
}
@Test
12 years, 6 months
JBoss Rich Faces SVN: r22822 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-10-19 05:06:48 -0400 (Wed, 19 Oct 2011)
New Revision: 22822
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java
Log:
tests for attributes handleClass, iconClass and labelClass in rich:tree fixed
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-10-19 08:40:18 UTC (rev 22821)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-10-19 09:06:48 UTC (rev 22822)
@@ -82,9 +82,9 @@
* @version $Revision$
*/
public class TestTreeSimple extends AbstractMetamerTest {
-
+
private static final String IMAGE_URL = "/resources/images/loading.gif";
-
+
SeleniumCondition treeNodeExpanded = new SeleniumCondition() {
@Override
@@ -96,12 +96,12 @@
@Inject
@Use(empty = true)
Event eventToFire;
- Event[] eventsToFire = new Event[] {MOUSEDOWN, MOUSEUP, MOUSEOVER, MOUSEOUT};
+ Event[] eventsToFire = new Event[] { MOUSEDOWN, MOUSEUP, MOUSEOVER, MOUSEOUT };
@Inject
@Use(empty = true)
Event domEvent;
- Event[] domEvents = {CLICK, DBLCLICK, KEYDOWN, KEYPRESS, KEYUP, MOUSEDOWN, MOUSEMOVE, MOUSEOUT, MOUSEOVER, MOUSEUP};
+ Event[] domEvents = { CLICK, DBLCLICK, KEYDOWN, KEYPRESS, KEYUP, MOUSEDOWN, MOUSEMOVE, MOUSEOUT, MOUSEOVER, MOUSEUP };
TreeModel tree = new TreeModel(pjq("div.rf-tr[id$=richTree]"));
TreeNodeModel treeNode;
@@ -141,19 +141,37 @@
@Test
public void testHandleClass() {
expandAll();
- super.testStyleClass(tree.getAnyNode().getHandle(), handleClass);
+
+ final String value = "metamer-ftest-class";
+ selenium.type(jq("input[id$=attributes:handleClassInput]"), value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr = tree.getAnyNode().getHandle().getAttribute(Attribute.CLASS);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute handleClass should contain \"" + value
+ + "\"");
}
@Test
public void testIconClass() {
expandAll();
- super.testStyleClass(tree.getAnyNode().getIcon(), iconClass);
+
+ final String value = "metamer-ftest-class";
+ selenium.type(jq("input[id$=attributes:iconClassInput]"), value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr = tree.getAnyNode().getIcon().getAttribute(Attribute.CLASS);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute iconClass should contain \"" + value
+ + "\"");
}
@Test
public void testLabelClass() {
expandAll();
- super.testStyleClass(tree.getAnyNode().getLabel(), labelClass);
+
+ final String value = "metamer-ftest-class";
+ selenium.type(jq("input[id$=attributes:labelClassInput]"), value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr = tree.getAnyNode().getLabel().getAttribute(Attribute.CLASS);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute labelClass should contain \"" + value
+ + "\"");
}
@Test
12 years, 6 months
JBoss Rich Faces SVN: r22821 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richTreeNode and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-10-19 04:40:18 -0400 (Wed, 19 Oct 2011)
New Revision: 22821
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java
Log:
testStyle and testStyleClass fixed for tree/tree node
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-10-19 07:05:14 UTC (rev 22820)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-10-19 08:40:18 UTC (rev 22821)
@@ -63,6 +63,8 @@
import org.jboss.cheiron.halt.XHRHalter;
import org.jboss.test.selenium.dom.Event;
+import org.jboss.test.selenium.locator.Attribute;
+import org.jboss.test.selenium.locator.AttributeLocator;
import org.jboss.test.selenium.locator.ElementLocator;
import org.jboss.test.selenium.locator.ExtendedLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
@@ -287,12 +289,20 @@
@Test
public void testStyle() {
- this.testStyle(tree);
+ final String value = "background-color: yellow; font-size: 1.5em;";
+ selenium.type(jq("input[id$=attributes:styleInput]"), value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr = tree.getAttribute(Attribute.STYLE);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute style should contain \"" + value + "\"");
}
@Test
public void testStyleClass() {
- this.testStyleClass(tree);
+ final String value = "metamer-ftest-class";
+ selenium.type(jq("input[id$=attributes:styleClassInput]"), value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr = tree.getAttribute(Attribute.CLASS);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute class should contain \"" + value + "\"");
}
@Test
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java 2011-10-19 07:05:14 UTC (rev 22820)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java 2011-10-19 08:40:18 UTC (rev 22821)
@@ -36,6 +36,7 @@
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
+import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.basicAttributes;
import static org.richfaces.tests.metamer.ftest.richTreeNode.TreeNodeAttributes.*;
import java.net.URL;
@@ -44,6 +45,7 @@
import org.jboss.test.selenium.dom.Event;
import org.jboss.test.selenium.geometry.Point;
+import org.jboss.test.selenium.locator.Attribute;
import org.jboss.test.selenium.locator.AttributeLocator;
import org.jboss.test.selenium.locator.ElementLocator;
import org.jboss.test.selenium.waiting.EventFiredCondition;
@@ -70,29 +72,29 @@
private static final String IMAGE_URL = "/resources/images/loading.gif";
Attributes<TreeAttributes> attributesTree = new Attributes<TreeAttributes>(jq("span[id$=attributes:panel]"));
- Attributes<TreeNodeAttributes> attributes = new Attributes<TreeNodeAttributes>(jq("span[id$=treeNode1Attributes:panel]"));
- Attributes<TreeNodeAttributes> attributesLeaf = new Attributes<TreeNodeAttributes>(jq("span[id$=treeNode3Attributes:panel]"));
+ Attributes<TreeNodeAttributes> attributes = new Attributes<TreeNodeAttributes>(
+ jq("span[id$=treeNode1Attributes:panel]"));
+ Attributes<TreeNodeAttributes> attributesLeaf = new Attributes<TreeNodeAttributes>(
+ jq("span[id$=treeNode3Attributes:panel]"));
TreeModel tree = new TreeModel(pjq("div.rf-tr[id$=richTree]"));
TreeNodeModel treeNode = tree.getNode(1);
TreeNodeModel subTreeNode = treeNode.getNode(1);
TreeNodeModel leaf = subTreeNode.getNode(1);
-
+
ElementLocator<?> iconImage = treeNode.getIcon();
AttributeLocator<?> imageSrc = iconImage.getAttribute(SRC);
AttributeRetriever retrieveImageSrc = retrieveAttribute.attributeLocator(imageSrc);
-
@Inject
@Use(empty = true)
Event event = CLICK;
- Event[] events = new Event[] {CLICK, DBLCLICK, MOUSEDOWN, MOUSEMOVE, MOUSEOUT,
- MOUSEOVER, MOUSEUP };
+ Event[] events = new Event[] { CLICK, DBLCLICK, MOUSEDOWN, MOUSEMOVE, MOUSEOUT, MOUSEOVER, MOUSEUP };
@Inject
@Use(empty = true)
SwitchType toggleType;
- SwitchType[] toggleTypes = new SwitchType[] {SwitchType.ajax, SwitchType.server };
+ SwitchType[] toggleTypes = new SwitchType[] { SwitchType.ajax, SwitchType.server };
@BeforeMethod
public void init() {
@@ -261,12 +263,20 @@
@Test
public void testStyle() {
- super.testStyle(treeNode.getTreeNode());
+ final String value = "background-color: yellow; font-size: 1.5em;";
+ selenium.type(jq("input[id$=treeNode1Attributes:styleInput]"), value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr = treeNode.getTreeNode().getAttribute(Attribute.STYLE);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute style should contain \"" + value + "\"");
}
@Test
public void testStyleClass() {
- super.testStyleClass(treeNode.getTreeNode());
+ final String value = "metamer-ftest-class";
+ selenium.type(jq("input[id$=treeNode1Attributes:styleClassInput]"), value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr = treeNode.getTreeNode().getAttribute(Attribute.CLASS);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute class should contain \"" + value + "\"");
}
@Test
12 years, 6 months
JBoss Rich Faces SVN: r22820 - in modules/tests/metamer/trunk/application/src/main: java/org/richfaces/tests/metamer/bean/rich and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-10-19 03:05:14 -0400 (Wed, 19 Oct 2011)
New Revision: 22820
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichCalendarBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml
Log:
fixed two server-side listeners
added two JavaScript event handlers for file upload
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-10-18 10:00:01 UTC (rev 22819)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-10-19 07:05:14 UTC (rev 22820)
@@ -430,8 +430,8 @@
* @param event
* an event representing the activation of a user interface component
*/
- public void changeEventListener(ValueChangeEvent event) {
- logToPage("*2 value changed: " + event.getOldValue() + " -> " + event.getNewValue());
+ public void changeEventListener(AjaxBehaviorEvent event) {
+ logToPage("*2 value changed ");
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichCalendarBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichCalendarBean.java 2011-10-18 10:00:01 UTC (rev 22819)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichCalendarBean.java 2011-10-19 07:05:14 UTC (rev 22820)
@@ -47,7 +47,7 @@
/**
* Managed bean for rich:calendar.
- *
+ *
* @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
* @version $Revision$
*/
@@ -149,7 +149,7 @@
/**
* A value change listener that logs to the page old and new value.
- *
+ *
* @param event
* an event representing the activation of a user interface component
*/
@@ -161,10 +161,18 @@
String newDate = "null";
if (event.getOldValue() != null) {
- oldDate = sdf.format((Date) event.getOldValue());
+ if (event.getOldValue() instanceof String) {
+ oldDate = (String) event.getOldValue();
+ } else {
+ oldDate = sdf.format((Date) event.getOldValue());
+ }
}
if (event.getNewValue() != null) {
- newDate = sdf.format((Date) event.getNewValue());
+ if (event.getNewValue() instanceof String) {
+ newDate = (String) event.getNewValue();
+ } else {
+ newDate = sdf.format((Date) event.getNewValue());
+ }
}
RichBean.logToPage("* value changed: " + oldDate + " -> " + newDate);
@@ -180,7 +188,7 @@
int componentYear = cal.get(Calendar.YEAR);
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Date too far in the past.",
- "Select a date from year 1991 or newer.");
+ "Select a date from year 1991 or newer.");
if (componentYear < 1991) {
FacesContext.getCurrentInstance().addMessage("form:calendar", message);
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-10-18 10:00:01 UTC (rev 22819)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-10-19 07:05:14 UTC (rev 22820)
@@ -55,6 +55,7 @@
noDuplicate="#{richFileUploadBean.attributes['noDuplicate'].value}"
onbeforedomupdate="#{richFileUploadBean.attributes['onbeforedomupdate'].value}"
onbegin="#{richFileUploadBean.attributes['onbegin'].value}"
+ onclear="#{richFileUploadBean.attributes['onclear'].value}"
onclick="#{richFileUploadBean.attributes['onclick'].value}"
oncomplete="#{richFileUploadBean.attributes['oncomplete'].value}"
ondblclick="#{richFileUploadBean.attributes['ondblclick'].value}"
@@ -67,6 +68,7 @@
onmouseout="#{richFileUploadBean.attributes['onmouseout'].value}"
onmouseover="#{richFileUploadBean.attributes['onmouseover'].value}"
onmouseup="#{richFileUploadBean.attributes['onmouseup'].value}"
+ ontyperejected="#{richFileUploadBean.attributes['ontyperejected'].value}"
onuploadcomplete="#{richFileUploadBean.attributes['onuploadcomplete'].value}"
render="#{richFileUploadBean.attributes['render'].value}"
rendered="#{richFileUploadBean.attributes['rendered'].value}"
12 years, 6 months
JBoss Rich Faces SVN: r22819 - modules/tests/metamer/trunk/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-10-18 06:00:01 -0400 (Tue, 18 Oct 2011)
New Revision: 22819
Added:
modules/tests/metamer/trunk/ftest/run-test-with-replace-context-params.sh
Log:
Add script to run ftests with profiles replacing configuration in web.xml
To invoke all important profiled to update metamer application, deploy, start container and run tests is neccessary many params. Collected them in this script to simulate similar env as on Jenkins job
Added: modules/tests/metamer/trunk/ftest/run-test-with-replace-context-params.sh
===================================================================
--- modules/tests/metamer/trunk/ftest/run-test-with-replace-context-params.sh (rev 0)
+++ modules/tests/metamer/trunk/ftest/run-test-with-replace-context-params.sh 2011-10-18 10:00:01 UTC (rev 22819)
@@ -0,0 +1,2 @@
+#!/bin/bash
+mvn clean package -Pjboss6x-mojarra -Dtemplates=plain -DcontainerId=jboss6x -Dcargo.jvmargs.additional=-Xmx1536m -Dcontainer.installer.url=file:///media/velkyDisk/Download/jboss-as-distribution-6.0.0.Final.zip -Dorg.richfaces.resourceMapping.enabled -Dorg.richfaces.resourceMapping.packedStages -Dorg.richfaces.resourceMapping.compressedStages -Dbrowser="*chrome /opt/firefox-3.5.5/firefox-bin" -Dtest=TestRichMenuItem -Ddeployable.location=$PWD/target/metamer-updated-jee6.war
12 years, 6 months
JBoss Rich Faces SVN: r22818 - modules/tests/metamer/trunk/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-10-17 19:39:43 -0400 (Mon, 17 Oct 2011)
New Revision: 22818
Modified:
modules/tests/metamer/trunk/ftest/pom.xml
Log:
Fix phase in replacer plugin configuration for web.xml
Replacer plugin configuration for resourceMapping enabling was tied to the same phase as repack, which caused that new metamer war was packed before this value changed
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-10-17 23:39:38 UTC (rev 22817)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-10-17 23:39:43 UTC (rev 22818)
@@ -500,7 +500,7 @@
<execution>
<id>replacer-org.richfaces.resourceMapping.enabled</id>
- <phase>process-test-resources</phase>
+ <phase>generate-test-resources</phase>
<goals>
<goal>replace</goal>
</goals>
12 years, 6 months
JBoss Rich Faces SVN: r22817 - modules/tests/metamer/trunk/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-10-17 19:39:38 -0400 (Mon, 17 Oct 2011)
New Revision: 22817
Modified:
modules/tests/metamer/trunk/ftest/pom.xml
Log:
Fix problem with replacer plugin: not updated context params in web.xml
There were configuration problems in replacer plugin and in maven-war-plugin,
which causes not match replace condition and then rewrite modified web.xml by original file
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-10-17 23:39:33 UTC (rev 22816)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-10-17 23:39:38 UTC (rev 22817)
@@ -505,10 +505,12 @@
<goal>replace</goal>
</goals>
<configuration>
- <file>target/metamer/WEB-INF/web.xml</file>
- <regex>false</regex>
- <token><param-name>org.richfaces.resourceMapping.enabled</param-name>\s*<param-value>false</param-value>></token>
- <value><param-name>org.richfaces.resourceMapping.enabled</param-name>\n\t<param-value>true</param-value>></value>
+ <file>target/metamer/WEB-INF/web.xml</file>
+ <regexFlags>
+ <regexFlag>MULTILINE</regexFlag>
+ </regexFlags>
+ <token><param-name>org.richfaces.resourceMapping.enabled</param-name>\s*<param-value>false</param-value></token>
+ <value><param-name>org.richfaces.resourceMapping.enabled</param-name><param-value>true</param-value></value>
</configuration>
</execution>
@@ -606,8 +608,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <classifier>${deployable.classifier}</classifier>
- <webappDirectory>target/metamer</webappDirectory>
+ <classifier>${deployable.classifier}</classifier>
+ <warSourceDirectory>target/metamer</warSourceDirectory>
<warName>metamer-updated</warName>
</configuration>
<executions>
12 years, 6 months
JBoss Rich Faces SVN: r22816 - modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-10-17 19:39:33 -0400 (Mon, 17 Oct 2011)
New Revision: 22816
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml
Log:
Set resourceMapping context params in web.xml back to default
Since org.richfaces.resourceMapping.* context params should be disabled by default changing this params back, and let change them on demand in job
Modified: modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml 2011-10-17 23:39:24 UTC (rev 22815)
+++ modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml 2011-10-17 23:39:33 UTC (rev 22816)
@@ -35,15 +35,17 @@
<!-- resource mapping enable/disable/configure -->
<context-param>
<param-name>org.richfaces.resourceMapping.compressedStages</param-name>
- <param-value>All</param-value>
+ <param-value>None</param-value>
</context-param>
+ <!-- -->
<context-param>
<param-name>org.richfaces.resourceMapping.packedStages</param-name>
- <param-value>All</param-value>
+ <param-value>None</param-value>
</context-param>
+ <!-- -->
<context-param>
<param-name>org.richfaces.resourceMapping.enabled</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</context-param>
<context-param>
<param-name>org.richfaces.skin</param-name>
12 years, 6 months
JBoss Rich Faces SVN: r22815 - modules/tests/metamer/trunk/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-10-17 19:39:24 -0400 (Mon, 17 Oct 2011)
New Revision: 22815
Modified:
modules/tests/metamer/trunk/ftest/pom.xml
Log:
Add profiles for changes context params in web.xml
This newly added profiles provide additional functionality to ftest process. Firstly unpack maven dependency - metamer-*.war, then update web.xml's context-params (related to richfaces resources mapping/compressing) and then pack metamer back to war.
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-10-17 11:36:24 UTC (rev 22814)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-10-17 23:39:24 UTC (rev 22815)
@@ -440,6 +440,190 @@
<deployable.classifier>jee6</deployable.classifier>
</properties>
</profile>
+
+ <!-- unpack metamer -->
+ <profile>
+ <id>unpack-metamer</id>
+ <activation>
+ <property>
+ <name>org.richfaces.resourceMapping.enabled</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-metamer-war</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.richfaces.tests</groupId>
+ <artifactId>metamer</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ <type>war</type>
+ <classifier>${deployable.classifier}</classifier>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/metamer</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- enable resource mapping by context-param in web.xml -->
+ <profile>
+ <id>org.richfaces.resourceMapping.enabled</id>
+ <activation>
+ <property>
+ <name>org.richfaces.resourceMapping.enabled</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ <version>1.3.9</version>
+ <executions>
+
+ <execution>
+ <id>replacer-org.richfaces.resourceMapping.enabled</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ <configuration>
+ <file>target/metamer/WEB-INF/web.xml</file>
+ <regex>false</regex>
+ <token><param-name>org.richfaces.resourceMapping.enabled</param-name>\s*<param-value>false</param-value>></token>
+ <value><param-name>org.richfaces.resourceMapping.enabled</param-name>\n\t<param-value>true</param-value>></value>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- enable resource mapping compressedStages -->
+ <profile>
+ <id>org.richfaces.resourceMapping.compressedStages</id>
+ <activation>
+ <property>
+ <name>org.richfaces.resourceMapping.compressedStages</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ <version>1.3.9</version>
+ <executions>
+ <execution>
+ <id>replacer-org.richfaces.resourceMapping.compressedStages</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ <configuration>
+ <file>target/metamer/WEB-INF/web.xml</file>
+ <regex>true</regex>
+ <regexFlags>
+ <regexFlag>MULTILINE</regexFlag>
+ </regexFlags>
+ <token><param-name>org.richfaces.resourceMapping.compressedStages</param-name>\s*<param-value>None</param-value></token>
+ <value><param-name>org.richfaces.resourceMapping.compressedStages</param-name><param-value>All</param-value></value>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- enable resource mapping packedStages -->
+ <profile>
+ <id>org.richfaces.resourceMapping.packedStages</id>
+ <activation>
+ <property>
+ <name>org.richfaces.resourceMapping.packedStages</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ <version>1.3.9</version>
+ <executions>
+ <execution>
+ <id>replacer-org.richfaces.resourceMapping.packedStages</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ <configuration>
+ <file>target/metamer/WEB-INF/web.xml</file>
+ <regex>true</regex>
+ <regexFlags>
+ <regexFlag>MULTILINE</regexFlag>
+ </regexFlags>
+ <token><param-name>org.richfaces.resourceMapping.packedStages</param-name>\s*<param-value>None</param-value></token>
+ <value><param-name>org.richfaces.resourceMapping.packedStages</param-name><param-value>All</param-value></value>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- pack metamer back to WAR -->
+ <profile>
+ <id>repack-metamer</id>
+ <activation>
+ <property>
+ <name>org.richfaces.resourceMapping.enabled</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <classifier>${deployable.classifier}</classifier>
+ <webappDirectory>target/metamer</webappDirectory>
+ <warName>metamer-updated</warName>
+ </configuration>
+ <executions>
+ <execution>
+ <id>repack-metamer-back-to-war</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
<build>
12 years, 6 months
JBoss Rich Faces SVN: r22814 - in modules/tests/metamer/trunk: ftest and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-10-17 07:36:24 -0400 (Mon, 17 Oct 2011)
New Revision: 22814
Modified:
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
RichFaces version changed back to snapshot
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-10-17 09:01:09 UTC (rev 22813)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-10-17 11:36:24 UTC (rev 22814)
@@ -81,8 +81,8 @@
<properties>
<context.path>/metamer/</context.path>
<deployable.classifier>mojarra</deployable.classifier>
- <deployable.version>4.1.0.20111014-M3</deployable.version>
- <ftest.source.version>4.1.0.20111014-M3</ftest.source.version>
+ <deployable.version>4.1.0-SNAPSHOT</deployable.version>
+ <ftest.source.version>4.1.0-SNAPSHOT</ftest.source.version>
<testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml>
<container.home>target/installs/${container.dir.deflatted}/${container.dir.unflatted}</container.home>
<jsf.config>Mojarra-2.0</jsf.config>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-10-17 09:01:09 UTC (rev 22813)
+++ modules/tests/metamer/trunk/pom.xml 2011-10-17 11:36:24 UTC (rev 22814)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>richfaces-example-parent</artifactId>
- <version>4.1.0.20111014-M3</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.tests</groupId>
@@ -124,7 +124,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<richfaces.checkstyle.version>2</richfaces.checkstyle.version>
- <version.richfaces>4.1.0.20111014-M3</version.richfaces>
+ <version.richfaces>4.1.0-SNAPSHOT</version.richfaces>
</properties>
<dependencyManagement>
12 years, 6 months