[gatein-commits] gatein SVN: r4305 - in components/wci/branches/adf/test: servers/jboss51/src/test/resources/config and 3 other directories.

Author: alain_defrance Date: 2010-09-22 09:26:26 -0400 (Wed, 22 Sep 2010) New Revision: 4305 Modified: components/wci/branches/adf/test/servers/jboss51/pom.xml components/wci/branches/adf/test/servers/jboss51/src/test/resources/config/servers.xml components/wci/branches/adf/test/servers/jetty6/pom.xml components/wci/branches/adf/test/src/test/build.xml components/wci/branches/adf/test/src/test/resources/config/servers.xml Log: Tomcat 7 native support & integration tests Modified: components/wci/branches/adf/test/servers/jboss51/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/jboss51/pom.xml 2010-09-22 13:25:37 UTC (rev 4304) +++ components/wci/branches/adf/test/servers/jboss51/pom.xml 2010-09-22 13:26:26 UTC (rev 4305) @@ -188,6 +188,20 @@ <scope>test</scope> </dependency> + <!-- JBoss Deployer --> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-tools-jboss-deployer-5.1-and-onwards</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.1.0.SP1</version> + <scope>test</scope> + </dependency> + </dependencies> @@ -273,6 +287,7 @@ <artifactId>jaxen</artifactId> <version>1.1.1</version> </dependency> + </dependencies> <version>1.3</version> <executions> Modified: components/wci/branches/adf/test/servers/jboss51/src/test/resources/config/servers.xml =================================================================== --- components/wci/branches/adf/test/servers/jboss51/src/test/resources/config/servers.xml 2010-09-22 13:25:37 UTC (rev 4304) +++ components/wci/branches/adf/test/servers/jboss51/src/test/resources/config/servers.xml 2010-09-22 13:26:26 UTC (rev 4305) @@ -10,7 +10,7 @@ </service> <deployer> <remote> - <name>jboss5x</name> + <name>jboss51x</name> <host>localhost</host> <port>8080</port> </remote> Modified: components/wci/branches/adf/test/servers/jetty6/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/jetty6/pom.xml 2010-09-22 13:25:37 UTC (rev 4304) +++ components/wci/branches/adf/test/servers/jetty6/pom.xml 2010-09-22 13:26:26 UTC (rev 4305) @@ -190,20 +190,20 @@ <groupId>org.jboss.remoting</groupId> <artifactId>jboss-remoting</artifactId> </dependency> - - <!-- Jetty Deployer --> + <dependency> <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-jetty-deployer</artifactId> - <type>war</type> + <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> + <scope>test</scope> </dependency> + <!-- Jetty Deployer --> <dependency> <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> + <artifactId>cargo-jetty-deployer</artifactId> + <type>war</type> <version>${version.cargo}</version> - <scope>test</scope> </dependency> </dependencies> Modified: components/wci/branches/adf/test/src/test/build.xml =================================================================== --- components/wci/branches/adf/test/src/test/build.xml 2010-09-22 13:25:37 UTC (rev 4304) +++ components/wci/branches/adf/test/src/test/build.xml 2010-09-22 13:26:26 UTC (rev 4305) @@ -27,6 +27,7 @@ <target name="tests.call.all" unless="tests"> <antcall target="tests.jboss5"/> <antcall target="tests.jboss"/> + <antcall target="tests.tomcat7"/> <antcall target="tests.tomcat"/> <!-- <antcall target="tests.jetty"/> --> </target> Modified: components/wci/branches/adf/test/src/test/resources/config/servers.xml =================================================================== --- components/wci/branches/adf/test/src/test/resources/config/servers.xml 2010-09-22 13:25:37 UTC (rev 4304) +++ components/wci/branches/adf/test/src/test/resources/config/servers.xml 2010-09-22 13:26:26 UTC (rev 4305) @@ -148,7 +148,7 @@ </service> <deployer> <remote> - <name>jboss5x</name> + <name>jboss51x</name> <host>localhost</host> <port>8080</port> </remote>