Author: alain_defrance Date: 2010-12-21 12:12:17 -0500 (Tue, 21 Dec 2010) New Revision: 5618 Added: components/pc/branches/adf/test/servers/tomcat6/src/test/resources/config/ components/pc/branches/adf/test/servers/tomcat6/src/test/resources/config/tomcat-users.xml 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/src/common/resources/common.xml components/pc/branches/adf/test/servers/tomcat6/pom.xml components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml components/pc/branches/adf/test/servers/tomcat7/pom.xml components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml Log: cargo manager refactoring Modified: components/pc/branches/adf/test/servers/jboss42/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-21 15:53:21 UTC (rev 5617) +++ components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-21 17:12:17 UTC (rev 5618) @@ -132,22 +132,6 @@ <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> - <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-manager</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>javax.ccpp</groupId> @@ -179,6 +163,18 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat6</artifactId> </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> </dependencies> <profiles> @@ -355,32 +351,38 @@ <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.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> </dependency> <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> </dependency> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> </dependencies> <executions> <execution> @@ -470,10 +472,6 @@ <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.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}"/> Modified: components/pc/branches/adf/test/servers/jboss51/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-21 15:53:21 UTC (rev 5617) +++ components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-21 17:12:17 UTC (rev 5618) @@ -132,22 +132,6 @@ <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> - <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-manager</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>javax.ccpp</groupId> @@ -185,6 +169,18 @@ <artifactId>jboss-profileservice-spi</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> </dependencies> <profiles> @@ -486,10 +482,6 @@ <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.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}"/> @@ -509,6 +501,9 @@ </executions> </plugin> </plugins> - </build> + <properties> + <!-- Fix 1.0.3 deployment problems with jboss51 deployer--> + <version.cargo>1.0.2</version.cargo> + </properties> </project> \ No newline at end of file Modified: components/pc/branches/adf/test/servers/jetty6/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-21 15:53:21 UTC (rev 5617) +++ components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-21 17:12:17 UTC (rev 5618) @@ -134,23 +134,7 @@ <artifactId>commons-httpclient</artifactId> </dependency> <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-manager</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-jetty-deployer</artifactId> <type>war</type> <scope>test</scope> @@ -186,6 +170,18 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-jetty</artifactId> </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> </dependencies> <profiles> @@ -362,32 +358,38 @@ <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.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> </dependency> <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> </dependency> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> </dependencies> <executions> <execution> @@ -477,10 +479,6 @@ <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.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}"/> Modified: components/pc/branches/adf/test/servers/src/common/resources/common.xml =================================================================== --- components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-21 15:53:21 UTC (rev 5617) +++ components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-21 17:12:17 UTC (rev 5618) @@ -511,11 +511,6 @@ <fileset dir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war"/> </jar> - <!-- Strip cargo manager war filename--> - <copy file="${dependency.cargo-manager.war}" tofile="${test.temp.lib}/manager.war"/> - <!-- unjar the war --> - <unzip src="${test.temp.lib}/manager.war" dest="${test.temp.lib}/manager"/> - </target> <target name="__cargo.setup"> Modified: components/pc/branches/adf/test/servers/tomcat6/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-21 15:53:21 UTC (rev 5617) +++ components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-21 17:12:17 UTC (rev 5618) @@ -133,22 +133,6 @@ <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> - <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-manager</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>javax.ccpp</groupId> @@ -180,6 +164,18 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat6</artifactId> </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> </dependencies> <profiles> @@ -356,32 +352,38 @@ <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.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> </dependency> <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> </dependency> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> </dependencies> <executions> <execution> @@ -471,10 +473,6 @@ <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.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}"/> Modified: components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml 2010-12-21 15:53:21 UTC (rev 5617) +++ components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml 2010-12-21 17:12:17 UTC (rev 5618) @@ -40,8 +40,7 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/> - <deployable type="war" file="${test.temp.lib}/manager.war"/> - <file file="${test.temp.lib}/manager" todir="webapps/manager"/> + <file file="${target}/test-classes/config/tomcat-users.xml" tofile="conf/tomcat-users.xml" overwrite="true"/> <deployable type="war" file="${test.temp.lib}/Tomcat-6.0/portlet-test.war"/> </configuration> </cargo> Added: components/pc/branches/adf/test/servers/tomcat6/src/test/resources/config/tomcat-users.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat6/src/test/resources/config/tomcat-users.xml (rev 0) +++ components/pc/branches/adf/test/servers/tomcat6/src/test/resources/config/tomcat-users.xml 2010-12-21 17:12:17 UTC (rev 5618) @@ -0,0 +1,3 @@ +<tomcat-users> + <user name="admin" password="admin" roles="manager"/> +</tomcat-users> Modified: components/pc/branches/adf/test/servers/tomcat7/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-21 15:53:21 UTC (rev 5617) +++ components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-21 17:12:17 UTC (rev 5618) @@ -145,22 +145,6 @@ <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> - <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-manager</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <!--<dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <scope>test</scope> - </dependency>--> - <!--<dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <scope>test</scope> - </dependency>--> <dependency> <groupId>javax.ccpp</groupId> @@ -501,10 +485,6 @@ <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.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}"/> Modified: components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-21 15:53:21 UTC (rev 5617) +++ components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-21 17:12:17 UTC (rev 5618) @@ -40,8 +40,6 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/> - <!--<deployable type="war" file="${test.temp.lib}/manager.war"/>--> - <!--<file file="${test.temp.lib}/manager" todir="webapps/manager"/>--> <file file="${target}/test-classes/config/tomcat-users.xml" tofile="conf/tomcat-users.xml" overwrite="true"/> <deployable type="war" file="${test.temp.lib}/Tomcat-7.0/portlet-test.war"/> </configuration>