Author: julien_viet Date: 2011-08-13 18:10:10 -0400 (Sat, 13 Aug 2011) New Revision: 7076 Modified: components/pc/trunk/test/servers/jboss42/pom.xml components/pc/trunk/test/servers/jboss51/pom.xml components/pc/trunk/test/servers/jboss6/pom.xml components/pc/trunk/test/servers/jetty6/pom.xml components/pc/trunk/test/servers/pom.xml components/pc/trunk/test/servers/tomcat6/pom.xml components/pc/trunk/test/servers/tomcat7/pom.xml Log: more DRY Modified: components/pc/trunk/test/servers/jboss42/pom.xml =================================================================== --- components/pc/trunk/test/servers/jboss42/pom.xml 2011-08-13 21:43:05 UTC (rev 7075) +++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-08-13 22:10:10 UTC (rev 7076) @@ -10,6 +10,11 @@ <packaging>jar</packaging> <name>GateIn - Portlet Container (test - servers - JBoss 4.2)</name> + <properties> + <!-- Fix 1.0.3 deployment problems with jboss42 --> + <version.cargo>1.0.2</version.cargo> + </properties> + <dependencies> <dependency> @@ -23,88 +28,8 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.5</version> - - <dependencies> - - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>test</id> - <phase>test</phase> - <configuration> - <tasks> - - <property name="compile_classpath" refid="maven.compile.classpath"/> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <property name="test_classpath" refid="maven.test.classpath"/> - <property name="plugin_classpath" refid="maven.plugin.classpath"/> - <property name="project.version" value="${project.version}"/> - <property name="basedir" value="${basedir}"/> - - <condition property="cargo.debug" value="${test.cargo.debug}"> - <isset property="test.cargo.debug"/> - </condition> - <condition property="cargo.debug" value=""> - <not> - <isset property="test.cargo.debug"/> - </not> - </condition> - - <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> - <target name="tests"/> - </ant> - - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> </plugin> </plugins> - </build> - <properties> - <!-- Fix 1.0.3 deployment problems with jboss42 --> - <version.cargo>1.0.2</version.cargo> - </properties> + </project> Modified: components/pc/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/pc/trunk/test/servers/jboss51/pom.xml 2011-08-13 21:43:05 UTC (rev 7075) +++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-08-13 22:10:10 UTC (rev 7076) @@ -9,6 +9,11 @@ <packaging>jar</packaging> <name>GateIn - Portlet Container (test - servers - JBoss 5.1)</name> + <properties> + <!-- Fix 1.0.3 deployment problems with jboss51 deployer--> + <version.cargo>1.0.2</version.cargo> + </properties> + <dependencies> <dependency> @@ -22,87 +27,8 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.5</version> - - <dependencies> - - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>test</id> - <phase>test</phase> - <configuration> - <tasks> - - <property name="compile_classpath" refid="maven.compile.classpath" /> - <property name="runtime_classpath" refid="maven.runtime.classpath" /> - <property name="test_classpath" refid="maven.test.classpath" /> - <property name="plugin_classpath" refid="maven.plugin.classpath" /> - <property name="project.version" value="${project.version}" /> - <property name="basedir" value="${basedir}" /> - - <condition property="cargo.debug" value="${test.cargo.debug}"> - <isset property="test.cargo.debug" /> - </condition> - <condition property="cargo.debug" value=""> - <not> - <isset property="test.cargo.debug" /> - </not> - </condition> - - <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> - <target name="tests" /> - </ant> - - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> - <properties> - <!-- Fix 1.0.3 deployment problems with jboss51 deployer--> - <version.cargo>1.0.2</version.cargo> - </properties> + </project> Modified: components/pc/trunk/test/servers/jboss6/pom.xml =================================================================== --- components/pc/trunk/test/servers/jboss6/pom.xml 2011-08-13 21:43:05 UTC (rev 7075) +++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-08-13 22:10:10 UTC (rev 7076) @@ -9,6 +9,11 @@ <packaging>jar</packaging> <name>GateIn - Portlet Container (test - servers - JBoss 6)</name> + <properties> + <!-- Fix 1.0.3 deployment problems with jboss6 deployer--> + <version.cargo>1.0.2</version.cargo> + </properties> + <dependencies> <dependency> @@ -22,87 +27,8 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.5</version> - - <dependencies> - - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>test</id> - <phase>test</phase> - <configuration> - <tasks> - - <property name="compile_classpath" refid="maven.compile.classpath" /> - <property name="runtime_classpath" refid="maven.runtime.classpath" /> - <property name="test_classpath" refid="maven.test.classpath" /> - <property name="plugin_classpath" refid="maven.plugin.classpath" /> - <property name="project.version" value="${project.version}" /> - <property name="basedir" value="${basedir}" /> - - <condition property="cargo.debug" value="${test.cargo.debug}"> - <isset property="test.cargo.debug" /> - </condition> - <condition property="cargo.debug" value=""> - <not> - <isset property="test.cargo.debug" /> - </not> - </condition> - - <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> - <target name="tests" /> - </ant> - - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> - <properties> - <!-- Fix 1.0.3 deployment problems with jboss6 deployer--> - <version.cargo>1.0.2</version.cargo> - </properties> + </project> Modified: components/pc/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/pc/trunk/test/servers/jetty6/pom.xml 2011-08-13 21:43:05 UTC (rev 7075) +++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-08-13 22:10:10 UTC (rev 7076) @@ -29,84 +29,8 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.5</version> - - <dependencies> - - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>test</id> - <phase>test</phase> - <configuration> - <tasks> - - <property name="compile_classpath" refid="maven.compile.classpath" /> - <property name="runtime_classpath" refid="maven.runtime.classpath" /> - <property name="test_classpath" refid="maven.test.classpath" /> - <property name="plugin_classpath" refid="maven.plugin.classpath" /> - <property name="project.version" value="${project.version}" /> - <property name="basedir" value="${basedir}" /> - - <condition property="cargo.debug" value="${test.cargo.debug}"> - <isset property="test.cargo.debug" /> - </condition> - <condition property="cargo.debug" value=""> - <not> - <isset property="test.cargo.debug" /> - </not> - </condition> - - <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> - <target name="tests" /> - </ant> - - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> </plugin> </plugins> - </build> + </project> Modified: components/pc/trunk/test/servers/pom.xml =================================================================== --- components/pc/trunk/test/servers/pom.xml 2011-08-13 21:43:05 UTC (rev 7075) +++ components/pc/trunk/test/servers/pom.xml 2011-08-13 22:10:10 UTC (rev 7076) @@ -206,6 +206,87 @@ <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.5</version> + <dependencies> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-tooling-ant</artifactId> + <version>${version.jboss.unit}</version> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit</artifactId> + <version>${version.jboss.unit}</version> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-ant</artifactId> + <version>${version.cargo}</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>test</id> + <phase>test</phase> + <configuration> + <tasks> + + <property name="compile_classpath" refid="maven.compile.classpath" /> + <property name="runtime_classpath" refid="maven.runtime.classpath" /> + <property name="test_classpath" refid="maven.test.classpath" /> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <property name="project.version" value="${project.version}" /> + <property name="basedir" value="${basedir}" /> + + <condition property="cargo.debug" value="${test.cargo.debug}"> + <isset property="test.cargo.debug" /> + </condition> + <condition property="cargo.debug" value=""> + <not> + <isset property="test.cargo.debug" /> + </not> + </condition> + + <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> + <target name="tests" /> + </ant> + + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> <profiles> Modified: components/pc/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-08-13 21:43:05 UTC (rev 7075) +++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-08-13 22:10:10 UTC (rev 7076) @@ -22,84 +22,8 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.5</version> - - <dependencies> - - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>test</id> - <phase>test</phase> - <configuration> - <tasks> - - <property name="compile_classpath" refid="maven.compile.classpath" /> - <property name="runtime_classpath" refid="maven.runtime.classpath" /> - <property name="test_classpath" refid="maven.test.classpath" /> - <property name="plugin_classpath" refid="maven.plugin.classpath" /> - <property name="project.version" value="${project.version}" /> - <property name="basedir" value="${basedir}" /> - - <condition property="cargo.debug" value="${test.cargo.debug}"> - <isset property="test.cargo.debug" /> - </condition> - <condition property="cargo.debug" value=""> - <not> - <isset property="test.cargo.debug" /> - </not> - </condition> - - <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> - <target name="tests" /> - </ant> - - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> </plugin> </plugins> - </build> + </project> Modified: components/pc/trunk/test/servers/tomcat7/pom.xml =================================================================== --- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-08-13 21:43:05 UTC (rev 7075) +++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-08-13 22:10:10 UTC (rev 7076) @@ -18,88 +18,4 @@ </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.5</version> - - <dependencies> - - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>test</id> - <phase>test</phase> - <configuration> - <tasks> - - <property name="compile_classpath" refid="maven.compile.classpath" /> - <property name="runtime_classpath" refid="maven.runtime.classpath" /> - <property name="test_classpath" refid="maven.test.classpath" /> - <property name="plugin_classpath" refid="maven.plugin.classpath" /> - <property name="project.version" value="${project.version}" /> - <property name="basedir" value="${basedir}" /> - - <condition property="cargo.debug" value="${test.cargo.debug}"> - <isset property="test.cargo.debug" /> - </condition> - <condition property="cargo.debug" value=""> - <not> - <isset property="test.cargo.debug" /> - </not> - </condition> - - <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> - <target name="tests" /> - </ant> - - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - </build> </project>