Author: ppitonak(a)redhat.com
Date: 2011-07-07 11:43:17 -0400 (Thu, 07 Jul 2011)
New Revision: 22543
Modified:
modules/tests/metamer/trunk/application/pom.xml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/cc.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/dragSource.xhtml
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
* code formatted
* cargo plugin upgraded
Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml 2011-07-07 13:41:57 UTC (rev 22542)
+++ modules/tests/metamer/trunk/application/pom.xml 2011-07-07 15:43:17 UTC (rev 22543)
@@ -12,7 +12,8 @@
02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-->
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -26,7 +27,7 @@
<artifactId>metamer</artifactId>
<packaging>war</packaging>
<name>Metamer: RichFaces Testing Application</name>
-
+
<distributionManagement>
<snapshotRepository>
<id>jboss-qa-snapshots</id>
@@ -60,7 +61,7 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
</dependency>
-
+
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
@@ -80,7 +81,7 @@
<groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -137,7 +138,7 @@
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
@@ -204,7 +205,6 @@
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
- <version>1.3.2</version>
<executions>
<execution>
<phase>pre-integration-test</phase>
@@ -245,6 +245,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.26</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
@@ -258,6 +259,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
@@ -542,7 +544,7 @@
<artifactId>jsf-impl</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/cc.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/cc.xhtml 2011-07-07
13:41:57 UTC (rev 22542)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/cc.xhtml 2011-07-07
15:43:17 UTC (rev 22543)
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
xmlns="http://www.w3.org/1999/xhtml"
-
xmlns:h="http://java.sun.com/jsf/html"
-
xmlns:f="http://java.sun.com/jsf/core"
-
xmlns:ui="http://java.sun.com/jsf/facelets"
-
xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
-
xmlns:rich="http://richfaces.org/rich"
-
xmlns:a4j="http://richfaces.org/a4j">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
+
xmlns:rich="http://richfaces.org/rich"
xmlns:a4j="http://richfaces.org/a4j">
<!--
JBoss, Home of Professional Open Source
@@ -31,150 +27,126 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:param name="componentId" value="richTree" />
+ <ui:param name="componentId" value="richTree" />
- <ui:define name="view">
- <f:metadata>
- <f:viewParam name="templates"
value="#{templateBean.templates}">
- <f:converter converterId="templatesListConverter" />
- </f:viewParam>
- </f:metadata>
- </ui:define>
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates"
value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richDragAndDrop.css"
/>
- </ui:define>
+ <ui:define name="head">
+ <h:outputStylesheet library="css"
name="richDragAndDrop.css" />
+ </ui:define>
- <ui:define name="component">
+ <ui:define name="component">
- <rich:dragIndicator id="indicator" />
+ <rich:dragIndicator id="indicator" />
- <rich:dragIndicator id="indicator2" acceptClass="acceptClass"
- rejectClass="rejectClass" draggingClass="draggingClass" />
- <p>Use @indicator=indicator2 to switch to usage of second defined
- indicator with custom styling</p>
+ <rich:dragIndicator id="indicator2"
acceptClass="acceptClass" rejectClass="rejectClass"
draggingClass="draggingClass" />
+ <p>Use @indicator=indicator2 to switch to usage of second defined indicator
with custom styling</p>
- <table>
- <tr>
- <td><metamer:dragSource id="draggable1"
- dragValue="#{richDragSourceBean.dragValues[0]}"
- dragIndicator="#{richDragSourceBean.attributes['dragIndicator'].value}"
- type="#{richDragSourceBean.attributes['type'].value}"
- rendered="#{richDragSourceBean.attributes['rendered'].value}"
/>
+ <table>
+ <tr>
+ <td><metamer:dragSource id="draggable1"
dragValue="#{richDragSourceBean.dragValues[0]}"
+
dragIndicator="#{richDragSourceBean.attributes['dragIndicator'].value}"
+
type="#{richDragSourceBean.attributes['type'].value}"
+
rendered="#{richDragSourceBean.attributes['rendered'].value}"
/></td>
+ <td><a4j:outputPanel id="draggable2"
layout="block" styleClass="metamer-draggable">
+ <h:outputText value="#2: type=drg2" />
+ <rich:dragSource type="drg2"
dragIndicator="indicator"
dragValue="#{richDragSourceBean.dragValues[1]}" />
+ </a4j:outputPanel></td>
+ <td><a4j:outputPanel id="draggable3"
layout="block" styleClass="metamer-draggable">
+ <h:outputText value="#3: type=drg3" />
+ <rich:dragSource type="drg3"
dragIndicator="indicator"
dragValue="#{richDragSourceBean.dragValues[2]}" />
+ </a4j:outputPanel></td>
+ </tr>
+ </table>
- </td>
- <td><a4j:outputPanel id="draggable2" layout="block"
- styleClass="metamer-draggable">
- <h:outputText value="#2: type=drg2" />
- <rich:dragSource type="drg2" dragIndicator="indicator"
- dragValue="#{richDragSourceBean.dragValues[1]}" />
- </a4j:outputPanel>
- </td>
- <td><a4j:outputPanel id="draggable3" layout="block"
- styleClass="metamer-draggable">
- <h:outputText value="#3: type=drg3" />
- <rich:dragSource type="drg3" dragIndicator="indicator"
- dragValue="#{richDragSourceBean.dragValues[2]}" />
- </a4j:outputPanel>
- </td>
- </tr>
- </table>
+ <a4j:outputPanel id="droppable1" layout="block"
styleClass="metamer-droppable" style="float: left">
+ <rich:dropTarget id="richDropTarget1"
dropValue="#{richDropTargetBean.dropValue}"
+ dropListener="#{richDropListenerBean.processDragging}"
acceptedTypes="drg1, drg2" render="droppable1 droppable2" />
- <a4j:outputPanel id="droppable1" layout="block"
- styleClass="metamer-droppable" style="float: left">
- <rich:dropTarget id="richDropTarget1"
- dropValue="#{richDropTargetBean.dropValue}"
- dropListener="#{richDropListenerBean.processDragging}"
- acceptedTypes="drg1, drg2" render="droppable1 droppable2" />
+ <h:outputText value="Accepts: drg1, drg2" />
+ <br />
- <h:outputText value="Accepts: drg1, drg2" />
- <br />
+ <h:outputText id="dropNumber1" value="Drops:
#{richDropTargetBean.dropValue.number}" />
+ <br />
- <h:outputText id="dropNumber1"
- value="Drops: #{richDropTargetBean.dropValue.number}" />
- <br />
-
- <h:dataTable id="droppedValues1" var="droppedValue"
- value="#{richDropTargetBean.droppedEntries1}">
- <h:column>
- <f:facet name="header">
+ <h:dataTable id="droppedValues1" var="droppedValue"
value="#{richDropTargetBean.droppedEntries1}">
+ <h:column>
+ <f:facet name="header">
Dragged
</f:facet>
- <h:outputText value="##{droppedValue.value.number}" />
- </h:column>
- <h:column>
- <f:facet name="header">
+ <h:outputText value="##{droppedValue.value.number}"
/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
Dropped
</f:facet>
- <h:outputText value="#{droppedValue.key.number}" />
- </h:column>
+ <h:outputText value="#{droppedValue.key.number}" />
+ </h:column>
- </h:dataTable>
- </a4j:outputPanel>
+ </h:dataTable>
+ </a4j:outputPanel>
- <a4j:outputPanel id="droppable2" layout="block"
- styleClass="metamer-droppable">
- <rich:dropTarget id="richDropTarget2"
- dropValue="#{richDropTargetBean.dropValue}"
- dropListener="#{richDropListenerBean.processDragging}"
- acceptedTypes="drg2, drg3" render="droppable1 droppable2" />
+ <a4j:outputPanel id="droppable2" layout="block"
styleClass="metamer-droppable">
+ <rich:dropTarget id="richDropTarget2"
dropValue="#{richDropTargetBean.dropValue}"
+ dropListener="#{richDropListenerBean.processDragging}"
acceptedTypes="drg2, drg3" render="droppable1 droppable2" />
- <h:outputText value="Accepts: drg2, drg3" />
- <br />
+ <h:outputText value="Accepts: drg2, drg3" />
+ <br />
- <h:outputText id="dropNumber2"
- value="Drops: #{richDropTargetBean.dropValue.number}" />
- <br />
+ <h:outputText id="dropNumber2" value="Drops:
#{richDropTargetBean.dropValue.number}" />
+ <br />
- <h:dataTable id="droppedValues2" var="droppedValue"
- value="#{richDropTargetBean.droppedEntries2}">
- <h:column>
- <f:facet name="header">
+ <h:dataTable id="droppedValues2" var="droppedValue"
value="#{richDropTargetBean.droppedEntries2}">
+ <h:column>
+ <f:facet name="header">
Dragged
</f:facet>
- <h:outputText value="##{droppedValue.value.number}" />
- </h:column>
- <h:column>
- <f:facet name="header">
+ <h:outputText value="##{droppedValue.value.number}"
/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
Dropped
</f:facet>
- <h:outputText value="#{droppedValue.key.number}" />
- </h:column>
+ <h:outputText value="#{droppedValue.key.number}" />
+ </h:column>
- </h:dataTable>
- </a4j:outputPanel>
+ </h:dataTable>
+ </a4j:outputPanel>
- </ui:define>
+ </ui:define>
- <ui:define name="outOfTemplateAfter">
- <a4j:outputPanel ajaxRendered="true">
- <h:panelGrid columns="2">
- <h:outputLabel value="Drop Event:"
- rendered="#{not empty richDropListenerBean.dropEvent}" />
- <h:panelGroup rendered="#{not empty
richDropListenerBean.dropEvent}">
- <h:panelGrid columns="2">
- <h:outputLabel value="clientId:" />
- <h:outputText
- value="#{richDropListenerBean.dropEvent.component.clientId}" />
+ <ui:define name="outOfTemplateAfter">
+ <a4j:outputPanel ajaxRendered="true">
+ <h:panelGrid columns="2">
+ <h:outputLabel value="Drop Event:" rendered="#{not
empty richDropListenerBean.dropEvent}" />
+ <h:panelGroup rendered="#{not empty
richDropListenerBean.dropEvent}">
+ <h:panelGrid columns="2">
+ <h:outputLabel value="clientId:" />
+ <h:outputText
value="#{richDropListenerBean.dropEvent.component.clientId}" />
- <h:outputLabel value="Drag Value:" />
- <h:outputText value="#{richDropListenerBean.dropEvent.dragValue}"
/>
+ <h:outputLabel value="Drag Value:" />
+ <h:outputText
value="#{richDropListenerBean.dropEvent.dragValue}" />
- <h:outputLabel value="Drop Value:" />
- <h:outputText value="#{richDropListenerBean.dropEvent.dropValue}"
/>
- </h:panelGrid>
- </h:panelGroup>
- </h:panelGrid>
- </a4j:outputPanel>
+ <h:outputLabel value="Drop Value:" />
+ <h:outputText
value="#{richDropListenerBean.dropEvent.dropValue}" />
+ </h:panelGrid>
+ </h:panelGroup>
+ </h:panelGrid>
+ </a4j:outputPanel>
- <metamer:attributes value="#{richDragSourceBean.attributes}"
- id="attributes" />
- </ui:define>
+ <metamer:attributes value="#{richDragSourceBean.attributes}"
id="attributes" />
+ </ui:define>
</ui:composition>
</html>
\ No newline at end of file
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/dragSource.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/dragSource.xhtml 2011-07-07
13:41:57 UTC (rev 22542)
+++
modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/dragSource.xhtml 2011-07-07
15:43:17 UTC (rev 22543)
@@ -1,29 +1,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
xmlns="http://www.w3.org/1999/xhtml"
-
xmlns:h="http://java.sun.com/jsf/html"
-
xmlns:f="http://java.sun.com/jsf/core"
-
xmlns:c="http://java.sun.com/jsp/jstl/core"
-
xmlns:composite="http://java.sun.com/jsf/composite"
-
xmlns:a4j="http://richfaces.org/a4j"
-
xmlns:rich="http://richfaces.org/rich">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:composite="http://java.sun.com/jsf/composite"
+
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
<h:body>
- <composite:interface>
- <composite:attribute name="id" type="java.lang.String"
required="true" />
- <composite:attribute name="dragValue" type="java.lang.String"
/>
- <composite:attribute name="type" type="java.lang.String"
required="true" />
- <composite:attribute name="dragIndicator"
type="java.lang.String" />
- <composite:attribute name="rendered" type="java.lang.Boolean"
/>
+ <composite:interface>
+ <composite:attribute name="id" type="java.lang.String"
required="true" />
+ <composite:attribute name="dragValue"
type="java.lang.String" />
+ <composite:attribute name="type" type="java.lang.String"
required="true" />
+ <composite:attribute name="dragIndicator"
type="java.lang.String" />
+ <composite:attribute name="rendered"
type="java.lang.Boolean" />
</composite:interface>
<composite:implementation>
- <a4j:outputPanel id="#{cc.attrs.id}" layout="block"
styleClass="metamer-draggable" style="border: 3px solid red">
- <h:outputText value="type=#{cc.attrs.type}" />
- <rich:dragSource dragValue="#{cc.attrs.dragValue}"
- dragIndicator="#{cc.attrs.dragIndicator}"
- type="#{cc.attrs.type}"
- rendered="#{cc.attrs.rendered}" />
- </a4j:outputPanel>
+ <a4j:outputPanel id="#{cc.attrs.id}" layout="block"
styleClass="metamer-draggable" style="border: 3px solid red">
+ <h:outputText value="type=#{cc.attrs.type}" />
+ <rich:dragSource dragValue="#{cc.attrs.dragValue}"
dragIndicator="#{cc.attrs.dragIndicator}" type="#{cc.attrs.type}"
+ rendered="#{cc.attrs.rendered}" />
+ </a4j:outputPanel>
</composite:implementation>
</h:body>
</html>
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-07-07 13:41:57 UTC (rev 22542)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-07-07 15:43:17 UTC (rev 22543)
@@ -19,7 +19,8 @@
USA, or see the FSF site:
http://www.fsf.org.
-->
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -153,6 +154,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.1.1</version>
<executions>
<execution>
<id>undeploy</id>
@@ -477,7 +479,7 @@
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
- <version>1.3.2</version>
+ <version>1.3.8</version>
<executions>
<execution>
<phase>package</phase>
@@ -490,7 +492,8 @@
<regexFlags>
<regexFlag>MULTILINE</regexFlag>
</regexFlags>
- <token><property
name="defaultJSFConfig">\s*<value>[a-zA-Z0-9\.\-]+</value></token>
+ <token><property
+
name="defaultJSFConfig">\s*<value>[a-zA-Z0-9\.\-]+</value></token>
<value><property
name="defaultJSFConfig"><value>${jsf.config}</value></value>
</configuration>
</execution>
@@ -525,7 +528,8 @@
<regexFlags>
<regexFlag>MULTILINE</regexFlag>
</regexFlags>
- <token><property
name="defaultJSFConfig">\s*<value>[a-zA-Z0-9\.\-]+</value></token>
+ <token><property
+
name="defaultJSFConfig">\s*<value>[a-zA-Z0-9\.\-]+</value></token>
<value><property
name="defaultJSFConfig"><value>${jsf.config}</value></value>
</configuration>
</execution>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-07-07 13:41:57 UTC (rev 22542)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-07-07 15:43:17 UTC (rev 22543)
@@ -19,80 +19,81 @@
USA, or see the FSF site:
http://www.fsf.org.
-->
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.richfaces.tests</groupId>
- <artifactId>metamer-root</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.richfaces.tests</groupId>
+ <artifactId>metamer-root</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ </parent>
- <groupId>org.richfaces.tests</groupId>
- <artifactId>metamer-ftest-source</artifactId>
- <name>Metamer: RichFaces Testing Application - Functional Test
Source</name>
+ <groupId>org.richfaces.tests</groupId>
+ <artifactId>metamer-ftest-source</artifactId>
+ <name>Metamer: RichFaces Testing Application - Functional Test
Source</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <artifactId>root</artifactId>
- <groupId>org.jboss.test.richfaces-selenium</groupId>
- <version>1.5.3.Final</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <artifactId>root</artifactId>
+ <groupId>org.jboss.test.richfaces-selenium</groupId>
+ <version>1.5.3.Final</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>richfaces-selenium</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.tests</groupId>
- <artifactId>metamer</artifactId>
- <version>${project.version}</version>
- <classifier>classes</classifier>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.12.1.GA</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-api</artifactId>
- <version>${version.richfaces}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-ui</artifactId>
- <version>${version.richfaces}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>richfaces-selenium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.tests</groupId>
+ <artifactId>metamer</artifactId>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.12.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-api</artifactId>
+ <version>${version.richfaces}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-ui</artifactId>
+ <version>${version.richfaces}</version>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
+ <build>
+ <plugins>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-07-07 13:41:57 UTC (rev 22542)
+++ modules/tests/metamer/trunk/pom.xml 2011-07-07 15:43:17 UTC (rev 22543)
@@ -19,7 +19,8 @@
USA, or see the FSF site:
http://www.fsf.org.
-->
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -89,23 +90,23 @@
<id>jboss-qa-releases-repository</id>
<url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url>
<releases>
- <updatePolicy>never</updatePolicy>
- <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <enabled>true</enabled>
</releases>
<snapshots>
- <enabled>false</enabled>
- </snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>jboss-qa-snapshots-repository</id>
<url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/snapshots</url>
<releases>
- <enabled>false</enabled>
+ <enabled>false</enabled>
</releases>
<snapshots>
- <updatePolicy>daily</updatePolicy>
- <enabled>true</enabled>
- </snapshots>
+ <updatePolicy>daily</updatePolicy>
+ <enabled>true</enabled>
+ </snapshots>
</repository>
<repository>
<id>jboss-public-repository-group</id>
@@ -136,7 +137,7 @@
<scope>import</scope>
<type>pom</type>
</dependency>
-
+
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
@@ -166,8 +167,10 @@
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
+ <version>2.2</version>
<configuration>
-
<arguments>-Pmyfaces,war-myfaces,war-jee6-bundled-mojarra,war-jee6-bundled-myfaces
-Dselenium.test.skip=true -Dselenium.server.skip=true</arguments>
+
<arguments>-Pmyfaces,war-myfaces,war-jee6-bundled-mojarra,war-jee6-bundled-myfaces
-Dselenium.test.skip=true
+ -Dselenium.server.skip=true</arguments>
<
tagBase>https://svn.jboss.org/repos/richfaces/modules/tests/metamer/ta...
<
branchBase>https://svn.jboss.org/repos/richfaces/modules/tests/metamer...
</configuration>
@@ -177,6 +180,7 @@
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.6</version>
<dependencies>
<dependency>
<groupId>org.richfaces</groupId>