Author: alain_defrance
Date: 2010-12-21 10:53:21 -0500 (Tue, 21 Dec 2010)
New Revision: 5617
Modified:
components/pc/branches/adf/test/servers/jboss42/pom.xml
components/pc/branches/adf/test/servers/jboss51/pom.xml
components/pc/branches/adf/test/servers/jetty6/pom.xml
components/pc/branches/adf/test/servers/tomcat6/pom.xml
components/pc/branches/adf/test/servers/tomcat7/pom.xml
Log:
replace org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin by
maven-antrun-plugin
Modified: components/pc/branches/adf/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-21 15:07:49 UTC (rev
5616)
+++ components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-21 15:53:21 UTC (rev
5617)
@@ -332,30 +332,6 @@
<build>
<plugins>
- <!--<plugin>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-maven2</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <failOnError>true</failOnError>
- <testsuites>
- <testsuite>
- <config>test/local-jboss-unit.xml</config>
- </testsuite>
- </testsuites>
- <reports>
- <xml>target/tests/reports/xml/local</xml>
- <html>target/tests/reports/html/local</html>
- </reports>
- </configuration>
- </plugin>-->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -369,9 +345,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<dependencies>
@@ -449,98 +424,58 @@
</condition>
<property name="dependency.log4j.jar"
value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar"
-
value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar"
-
value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar"
-
value="${maven.dependency.javax.activation.activation.jar.path}"/>
+ <property name="dependency.commons-logging.jar"
value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
+ <property name="dependency.commons-httpclient.jar"
value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
+ <property name="dependency.activation.jar"
value="${maven.dependency.javax.activation.activation.jar.path}"/>
<property name="dependency.junit.jar"
value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.jsr168api.jar"
-
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+ <property name="dependency.jsr168api.jar"
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar"
value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
<property name="dependency.jaxb.jar"
value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
- <property
name="dependency.portal-common-common.jar"
-
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar"
-
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property
name="dependency.portal-common-logging.jar"
-
value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar"
-
value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar"
-
value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
+ <property name="dependency.portal-common-common.jar"
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar"
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
+ <property
name="dependency.portal-common-logging.jar"
value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
+ <property name="dependency.slf4j-simple.jar"
value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
+ <property name="dependency.slf4j-api.jar"
value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
- <property name="dependency.portal-wci-wci.jar"
-
value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar"
-
value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar"
value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-tomcat.jar"
value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
- <property
name="dependency.portal-portlet-portlet.jar"
-
value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property
name="dependency.portal-portlet-controller.jar"
-
value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar"
-
value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar"
-
value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
+ <property
name="dependency.portal-portlet-portlet.jar"
value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+ <property
name="dependency.portal-portlet-controller.jar"
value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
+ <property name="dependency.portal-portlet-mc.jar"
value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
+ <property name="dependency.portal-portlet-api.jar"
value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
- <property name="dependency.jboss-unit.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar"
-
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar"
-
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
-
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar"
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar"
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar"
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
- <property name="dependency.concurrent.jar"
-
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.concurrent.jar"
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar"
value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar"
-
value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar"
-
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar"
-
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar"
-
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar"
-
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar"
-
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.resolver.jar"
-
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar"
-
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar"
-
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <property name="dependency.jboss-logging-spi.jar"
value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
+ <property name="dependency.jboss-logging-jdk.jar"
value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
+ <property name="dependency.jboss-logging-log4j.jar"
value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
+ <property name="dependency.jboss-kernel.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar"
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar"
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar"
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar"
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar"
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar"
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar"
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar"
value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar"
-
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar"
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar"
-
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar"
-
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war"
-
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-manager.war"
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.apache-jstl.jar"
-
value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar"
-
value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+ <property name="dependency.apache-jstl.jar"
value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar"
value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
<!-- location of common.xml shared between the different
server's build.xml -->
<property name="common.xml.file"
value="${test.common.xml}"/>
Modified: components/pc/branches/adf/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-21 15:07:49 UTC (rev
5616)
+++ components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-21 15:53:21 UTC (rev
5617)
@@ -338,30 +338,6 @@
<build>
<plugins>
- <!--<plugin>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-maven2</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <failOnError>true</failOnError>
- <testsuites>
- <testsuite>
- <config>test/local-jboss-unit.xml</config>
- </testsuite>
- </testsuites>
- <reports>
- <xml>target/tests/reports/xml/local</xml>
- <html>target/tests/reports/html/local</html>
- </reports>
- </configuration>
- </plugin>-->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -375,9 +351,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<dependencies>
@@ -461,102 +436,62 @@
</condition>
<property name="dependency.log4j.jar"
value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar"
-
value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar"
-
value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar"
-
value="${maven.dependency.javax.activation.activation.jar.path}"/>
+ <property name="dependency.commons-logging.jar"
value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
+ <property name="dependency.commons-httpclient.jar"
value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
+ <property name="dependency.activation.jar"
value="${maven.dependency.javax.activation.activation.jar.path}"/>
<property name="dependency.junit.jar"
value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.jsr168api.jar"
-
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+ <property name="dependency.jsr168api.jar"
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar"
value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
<property name="dependency.jaxb.jar"
value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
- <property
name="dependency.portal-common-common.jar"
-
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar"
-
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property
name="dependency.portal-common-logging.jar"
-
value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar"
-
value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar"
-
value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
+ <property name="dependency.portal-common-common.jar"
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar"
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
+ <property
name="dependency.portal-common-logging.jar"
value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
+ <property name="dependency.slf4j-simple.jar"
value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
+ <property name="dependency.slf4j-api.jar"
value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
- <property name="dependency.portal-wci-wci.jar"
-
value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar"
-
value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar"
value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-tomcat.jar"
value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
- <property
name="dependency.portal-portlet-portlet.jar"
-
value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property
name="dependency.portal-portlet-controller.jar"
-
value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar"
-
value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar"
-
value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
+ <property
name="dependency.portal-portlet-portlet.jar"
value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+ <property
name="dependency.portal-portlet-controller.jar"
value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
+ <property name="dependency.portal-portlet-mc.jar"
value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
+ <property name="dependency.portal-portlet-api.jar"
value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
- <property name="dependency.jboss-unit.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar"
-
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar"
-
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
-
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar"
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar"
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar"
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
- <property name="dependency.concurrent.jar"
-
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.concurrent.jar"
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar"
value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar"
-
value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar"
-
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar"
-
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar"
-
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar"
-
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar"
-
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.resolver.jar"
-
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar"
-
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar"
-
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <property name="dependency.jboss-logging-spi.jar"
value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
+ <property name="dependency.jboss-logging-jdk.jar"
value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
+ <property name="dependency.jboss-logging-log4j.jar"
value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
+ <property name="dependency.jboss-kernel.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar"
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar"
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar"
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar"
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar"
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar"
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar"
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar"
value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar"
-
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar"
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
<property name="dependency.cargo-jboss-deployer.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-core-tools-jboss-deployer-5.1-and-onwards.jar.path}"
/>
<property
name="dependency.jboss-profile-service.jar"
value="${maven.dependency.org.jboss.integration.jboss-profileservice-spi.jar.path}"
/>
<property
name="dependency.cargo-core-container-jboss.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-core-container-jboss.jar.path}"
/>
- <property name="dependency.cargo-core-uberjar.jar"
-
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar"
-
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war"
-
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-manager.war"
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.apache-jstl.jar"
-
value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar"
-
value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+ <property name="dependency.apache-jstl.jar"
value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar"
value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
<!-- location of common.xml shared between the different
server's build.xml -->
<property name="common.xml.file"
value="${test.common.xml}"/>
Modified: components/pc/branches/adf/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-21 15:07:49 UTC (rev
5616)
+++ components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-21 15:53:21 UTC (rev
5617)
@@ -339,30 +339,6 @@
<build>
<plugins>
- <!--<plugin>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-maven2</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <failOnError>true</failOnError>
- <testsuites>
- <testsuite>
- <config>test/local-jboss-unit.xml</config>
- </testsuite>
- </testsuites>
- <reports>
- <xml>target/tests/reports/xml/local</xml>
- <html>target/tests/reports/html/local</html>
- </reports>
- </configuration>
- </plugin>-->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -376,9 +352,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<dependencies>
@@ -456,100 +431,59 @@
</condition>
<property name="dependency.log4j.jar"
value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar"
-
value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar"
-
value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar"
-
value="${maven.dependency.javax.activation.activation.jar.path}"/>
+ <property name="dependency.commons-logging.jar"
value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
+ <property name="dependency.commons-httpclient.jar"
value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
+ <property name="dependency.activation.jar"
value="${maven.dependency.javax.activation.activation.jar.path}"/>
<property name="dependency.junit.jar"
value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.jsr168api.jar"
-
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+ <property name="dependency.jsr168api.jar"
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar"
value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
<property name="dependency.jaxb.jar"
value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
- <property
name="dependency.portal-common-common.jar"
-
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar"
-
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property
name="dependency.portal-common-logging.jar"
-
value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar"
-
value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar"
-
value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
+ <property name="dependency.portal-common-common.jar"
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar"
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
+ <property
name="dependency.portal-common-logging.jar"
value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
+ <property name="dependency.slf4j-simple.jar"
value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
+ <property name="dependency.slf4j-api.jar"
value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
- <property name="dependency.portal-wci-wci.jar"
-
value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-jetty.jar"
-
value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar"
value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-jetty.jar"
value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}"/>
- <property
name="dependency.portal-portlet-portlet.jar"
-
value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property
name="dependency.portal-portlet-controller.jar"
-
value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar"
-
value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar"
-
value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
+ <property
name="dependency.portal-portlet-portlet.jar"
value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+ <property
name="dependency.portal-portlet-controller.jar"
value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
+ <property name="dependency.portal-portlet-mc.jar"
value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
+ <property name="dependency.portal-portlet-api.jar"
value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
- <property name="dependency.jboss-unit.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar"
-
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar"
-
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
-
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar"
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar"
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar"
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
- <property name="dependency.concurrent.jar"
-
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.concurrent.jar"
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar"
value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar"
-
value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar"
-
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar"
-
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar"
-
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar"
-
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar"
-
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.resolver.jar"
-
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar"
-
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar"
-
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <property name="dependency.jboss-logging-spi.jar"
value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
+ <property name="dependency.jboss-logging-jdk.jar"
value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
+ <property name="dependency.jboss-logging-log4j.jar"
value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
+ <property name="dependency.jboss-kernel.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar"
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar"
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar"
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar"
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar"
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar"
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar"
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar"
value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar"
-
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar"
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar"
-
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar"
-
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war"
-
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-manager.war"
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.apache-jstl.jar"
-
value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar"
-
value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
- <property name="dependency.cargo.jetty-deployer"
-
value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/>
+ <property name="dependency.apache-jstl.jar"
value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar"
value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+ <property name="dependency.cargo.jetty-deployer"
value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/>
<!-- location of common.xml shared between the different
server's build.xml -->
<property name="common.xml.file"
value="${test.common.xml}"/>
Modified: components/pc/branches/adf/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-21 15:07:49 UTC (rev
5616)
+++ components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-21 15:53:21 UTC (rev
5617)
@@ -333,30 +333,6 @@
<build>
<plugins>
- <!--<plugin>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-maven2</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <failOnError>true</failOnError>
- <testsuites>
- <testsuite>
- <config>test/local-jboss-unit.xml</config>
- </testsuite>
- </testsuites>
- <reports>
- <xml>target/tests/reports/xml/local</xml>
- <html>target/tests/reports/html/local</html>
- </reports>
- </configuration>
- </plugin>-->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -370,9 +346,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<dependencies>
@@ -450,98 +425,58 @@
</condition>
<property name="dependency.log4j.jar"
value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar"
-
value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar"
-
value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar"
-
value="${maven.dependency.javax.activation.activation.jar.path}"/>
+ <property name="dependency.commons-logging.jar"
value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
+ <property name="dependency.commons-httpclient.jar"
value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
+ <property name="dependency.activation.jar"
value="${maven.dependency.javax.activation.activation.jar.path}"/>
<property name="dependency.junit.jar"
value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.jsr168api.jar"
-
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+ <property name="dependency.jsr168api.jar"
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar"
value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
<property name="dependency.jaxb.jar"
value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
- <property
name="dependency.portal-common-common.jar"
-
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar"
-
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property
name="dependency.portal-common-logging.jar"
-
value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar"
-
value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar"
-
value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
+ <property name="dependency.portal-common-common.jar"
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar"
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
+ <property
name="dependency.portal-common-logging.jar"
value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
+ <property name="dependency.slf4j-simple.jar"
value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
+ <property name="dependency.slf4j-api.jar"
value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
- <property name="dependency.portal-wci-wci.jar"
-
value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar"
-
value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar"
value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-tomcat.jar"
value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
- <property
name="dependency.portal-portlet-portlet.jar"
-
value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property
name="dependency.portal-portlet-controller.jar"
-
value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar"
-
value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar"
-
value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
+ <property
name="dependency.portal-portlet-portlet.jar"
value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+ <property
name="dependency.portal-portlet-controller.jar"
value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
+ <property name="dependency.portal-portlet-mc.jar"
value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
+ <property name="dependency.portal-portlet-api.jar"
value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
- <property name="dependency.jboss-unit.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar"
-
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar"
-
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
-
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar"
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar"
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar"
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
- <property name="dependency.concurrent.jar"
-
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.concurrent.jar"
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar"
value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar"
-
value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar"
-
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar"
-
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar"
-
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar"
-
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar"
-
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.resolver.jar"
-
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar"
-
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar"
-
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <property name="dependency.jboss-logging-spi.jar"
value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
+ <property name="dependency.jboss-logging-jdk.jar"
value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
+ <property name="dependency.jboss-logging-log4j.jar"
value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
+ <property name="dependency.jboss-kernel.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar"
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar"
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar"
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar"
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar"
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar"
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar"
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar"
value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar"
-
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar"
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar"
-
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar"
-
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war"
-
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-manager.war"
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.apache-jstl.jar"
-
value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar"
-
value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+ <property name="dependency.apache-jstl.jar"
value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar"
value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
<!-- location of common.xml shared between the different
server's build.xml -->
<property name="common.xml.file"
value="${test.common.xml}"/>
Modified: components/pc/branches/adf/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-21 15:07:49 UTC (rev
5616)
+++ components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-21 15:53:21 UTC (rev
5617)
@@ -370,9 +370,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<dependencies>
@@ -456,98 +455,58 @@
</condition>
<property name="dependency.log4j.jar"
value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar"
-
value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar"
-
value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar"
-
value="${maven.dependency.javax.activation.activation.jar.path}"/>
+ <property name="dependency.commons-logging.jar"
value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
+ <property name="dependency.commons-httpclient.jar"
value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
+ <property name="dependency.activation.jar"
value="${maven.dependency.javax.activation.activation.jar.path}"/>
<property name="dependency.junit.jar"
value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.jsr168api.jar"
-
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+ <property name="dependency.jsr168api.jar"
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar"
value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
<property name="dependency.jaxb.jar"
value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
- <property
name="dependency.portal-common-common.jar"
-
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar"
-
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property
name="dependency.portal-common-logging.jar"
-
value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar"
-
value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar"
-
value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
+ <property name="dependency.portal-common-common.jar"
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar"
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
+ <property
name="dependency.portal-common-logging.jar"
value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
+ <property name="dependency.slf4j-simple.jar"
value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
+ <property name="dependency.slf4j-api.jar"
value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
- <property name="dependency.portal-wci-wci.jar"
-
value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar"
-
value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar"
value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-tomcat.jar"
value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}"/>
- <property
name="dependency.portal-portlet-portlet.jar"
-
value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property
name="dependency.portal-portlet-controller.jar"
-
value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar"
-
value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar"
-
value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
+ <property
name="dependency.portal-portlet-portlet.jar"
value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+ <property
name="dependency.portal-portlet-controller.jar"
value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
+ <property name="dependency.portal-portlet-mc.jar"
value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
+ <property name="dependency.portal-portlet-api.jar"
value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
- <property name="dependency.jboss-unit.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar"
-
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar"
-
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar"
-
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
-
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar"
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar"
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar"
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
- <property name="dependency.concurrent.jar"
-
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.concurrent.jar"
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar"
value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar"
-
value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar"
-
value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar"
-
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar"
-
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar"
-
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar"
-
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar"
-
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.resolver.jar"
-
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar"
-
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar"
-
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <property name="dependency.jboss-logging-spi.jar"
value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
+ <property name="dependency.jboss-logging-jdk.jar"
value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
+ <property name="dependency.jboss-logging-log4j.jar"
value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
+ <property name="dependency.jboss-kernel.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar"
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar"
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar"
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar"
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar"
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar"
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar"
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar"
value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar"
-
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar"
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar"
-
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar"
-
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war"
-
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-manager.war"
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.apache-jstl.jar"
-
value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar"
-
value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+ <property name="dependency.apache-jstl.jar"
value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar"
value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
<!-- location of common.xml shared between the different
server's build.xml -->
<property name="common.xml.file"
value="${test.common.xml}"/>