Author: mwringe Date: 2010-12-21 14:29:13 -0500 (Tue, 21 Dec 2010) New Revision: 5621 Added: components/wci/trunk/test/servers/tomcat7/ components/wci/trunk/test/servers/tomcat7/pom.xml components/wci/trunk/test/servers/tomcat7/src/ components/wci/trunk/test/servers/tomcat7/src/assembly/ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml components/wci/trunk/test/servers/tomcat7/src/integration-tests/ components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml components/wci/trunk/test/servers/tomcat7/src/test/ components/wci/trunk/test/servers/tomcat7/src/test/resources/ components/wci/trunk/test/servers/tomcat7/src/test/resources/config/ components/wci/trunk/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/ components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/config/servers.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/support/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml Modified: components/wci/trunk/test/servers/jboss42/pom.xml components/wci/trunk/test/servers/jboss51/pom.xml components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml components/wci/trunk/test/servers/jetty6/pom.xml components/wci/trunk/test/servers/pom.xml components/wci/trunk/test/servers/tomcat6/pom.xml Log: Missed changes on last commit. Modified: components/wci/trunk/test/servers/jboss42/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/pom.xml 2010-12-21 18:36:10 UTC (rev 5620) +++ components/wci/trunk/test/servers/jboss42/pom.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -17,7 +17,7 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> + <artifactId>wci-tomcat6</artifactId> <scope>test</scope> </dependency> <dependency> @@ -94,6 +94,12 @@ <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-remote</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> @@ -109,11 +115,23 @@ <groupId>org.jboss.unit</groupId> <artifactId>portal-test</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <!-- JBOSS MICROCONAINER DEPENDENCIES --> <dependency> @@ -173,6 +191,13 @@ <artifactId>jboss-remoting</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> + </dependencies> @@ -244,11 +269,20 @@ </exclusions> </dependency> <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> - <scope>test</scope> + <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> <version>1.3</version> <executions> @@ -299,7 +333,7 @@ <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.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> - <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat.jar.path}" /> + <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" /> <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" /> <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" /> Modified: components/wci/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/pom.xml 2010-12-21 18:36:10 UTC (rev 5620) +++ components/wci/trunk/test/servers/jboss51/pom.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -17,7 +17,7 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> + <artifactId>wci-tomcat6</artifactId> <scope>test</scope> </dependency> <dependency> @@ -84,6 +84,12 @@ <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-remote</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> @@ -99,11 +105,23 @@ <groupId>org.jboss.unit</groupId> <artifactId>portal-test</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <!-- JBOSS MICROCONAINER DEPENDENCIES --> <dependency> @@ -163,6 +181,21 @@ <artifactId>jboss-remoting</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> + + <!-- JBoss Deployer --> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.1.0.SP1</version> + <scope>test</scope> + </dependency> + </dependencies> @@ -234,11 +267,20 @@ </exclusions> </dependency> <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> - <scope>test</scope> + <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> <version>1.3</version> <executions> @@ -286,9 +328,12 @@ <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.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> - <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat.jar.path}" /> + <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" /> <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.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}" /> <!-- locations of archives to use --> <property name="test.archives.directory" value="${project.build.directory}/test-archives" /> @@ -322,6 +367,8 @@ </plugins> </build> <properties> + <!-- Fix 1.0.3 deployment problems with jboss51 deployer--> + <version.cargo>1.0.2</version.cargo> </properties> <profiles> Modified: components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml 2010-12-21 18:36:10 UTC (rev 5620) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -10,7 +10,7 @@ </service> <deployer> <remote> - <name>jboss5x</name> + <name>jboss51x</name> <host>localhost</host> <port>8080</port> </remote> Modified: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml 2010-12-21 18:36:10 UTC (rev 5620) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.1.0-Beta01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jetty6</artifactId> @@ -94,6 +94,12 @@ <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-remote</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> @@ -109,11 +115,23 @@ <groupId>org.jboss.unit</groupId> <artifactId>portal-test</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <!-- JBOSS MICROCONAINER DEPENDENCIES --> <dependency> @@ -172,13 +190,20 @@ <groupId>org.jboss.remoting</groupId> <artifactId>jboss-remoting</artifactId> </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> <!-- Jetty Deployer --> <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-jetty-deployer</artifactId> <type>war</type> - <version>${version.cargo}</version> + <version>${version.cargo.jetty.deployer}</version> </dependency> </dependencies> @@ -252,11 +277,20 @@ </exclusions> </dependency> <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> - <scope>test</scope> + <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> <version>1.3</version> <executions> Modified: components/wci/trunk/test/servers/pom.xml =================================================================== --- components/wci/trunk/test/servers/pom.xml 2010-12-21 18:36:10 UTC (rev 5620) +++ components/wci/trunk/test/servers/pom.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -64,6 +64,7 @@ </activation> <modules> <module>tomcat6</module> + <module>tomcat7</module> <module>jboss42</module> <module>jboss51</module> </modules> @@ -72,6 +73,7 @@ <id>all-servers</id> <modules> <module>tomcat6</module> + <module>tomcat7</module> <module>jboss42</module> <module>jboss51</module> <module>jetty6</module> @@ -81,9 +83,22 @@ <id>tomcat</id> <modules> <module>tomcat6</module> + <module>tomcat7</module> </modules> </profile> <profile> + <id>tomcat6</id> + <modules> + <module>tomcat6</module> + </modules> + </profile> + <profile> + <id>tomcat7</id> + <modules> + <module>tomcat7</module> + </modules> + </profile> + <profile> <id>jboss42</id> <modules> <module>jboss42</module> Modified: components/wci/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/pom.xml 2010-12-21 18:36:10 UTC (rev 5620) +++ components/wci/trunk/test/servers/tomcat6/pom.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -17,7 +17,7 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> + <artifactId>wci-tomcat6</artifactId> <scope>test</scope> </dependency> <dependency> @@ -94,6 +94,12 @@ <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-remote</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> @@ -109,11 +115,23 @@ <groupId>org.jboss.unit</groupId> <artifactId>portal-test</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> </dependency> <!-- JBOSS MICROCONAINER DEPENDENCIES --> <dependency> @@ -173,6 +191,13 @@ <artifactId>jboss-remoting</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> + </dependencies> @@ -249,6 +274,21 @@ <version>${version.cargo}</version> <scope>test</scope> </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> <version>1.3</version> <executions> @@ -298,7 +338,7 @@ <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.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> - <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat.jar.path}" /> + <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" /> <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" /> <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" /> Added: components/wci/trunk/test/servers/tomcat7/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/pom.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/pom.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,417 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-server-parent</artifactId> + <version>2.1.0-Alpha01-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-tomcat7</artifactId> + <packaging>jar</packaging> + <name>GateIn - WCI Tomcat 7 test component</name> + + <dependencies> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat7</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-gatein-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-exo-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + + <dependency> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-mc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + <!-- JBOSS UNIT DEPENDENCIES --> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-remote</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-mc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-tooling-ant</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test-generic</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- JBOSS MICROCONAINER DEPENDENCIES --> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-dependency</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + <!-- OTHER DEPENDENCIES --> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-serialization</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> + + </dependencies> + + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-common-build.xml</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>test</finalName> + <appendAssemblyId>true</appendAssemblyId> + <!-- we don't want to add these archives into the repo --> + <attach>false</attach> + <outputDirectory>${project.build.directory}/test-archives</outputDirectory> + <descriptors> + <descriptor>src/assembly/spi-native-server.xml</descriptor> + <descriptor>src/assembly/spi-generic-server.xml</descriptor> + <descriptor>src/assembly/spi-exo-server.xml</descriptor> + <descriptor>src/assembly/endpoint-default-servlet-mapping.xml</descriptor> + <descriptor>src/assembly/endpoint-path-mapping.xml</descriptor> + <descriptor>src/assembly/endpoint-root-path-mapping.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>assemble</id> + <phase>test</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <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> + <version>1.3</version> + <executions> + <execution> + <id>integration-testing</id> + <phase>integration-test</phase> + <configuration> + <tasks> + + <!-- properties to pass to the build.xml --> + <property name="project.build.directory" value="${project.build.directory}" /> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <property name="test_classpath" refid="maven.test.classpath" /> + + <!-- hack here allows for profiles to effect tasks in the build.xml --> + <!-- this should be removed when the antrun plugin properly handles properties --> + <condition property="test.generic.enable"> + <istrue value="${test.generic}" /> + </condition> + <condition property="test.native.enable"> + <istrue value="${test.native}" /> + </condition> + <condition property="test.exo.enable"> + <istrue value="${test.exo}" /> + </condition> + <condition property="test.endpoint.enable"> + <istrue value="${test.endpoint}" /> + </condition> + <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> + <!-- end profiles hack --> + + <!-- server dependencies --> + <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.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" /> + <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" /> + <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" /> + <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.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.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> + <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}" /> + <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" /> + <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" /> + + <!-- locations of archives to use --> + <property name="test.archives.directory" value="${project.build.directory}/test-archives" /> + <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" /> + <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" /> + <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" /> + + <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" /> + <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" /> + <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" /> + + <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> + <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> + <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> + + <!-- location of common.xml shared between the different server's build.xml --> + <property name="common.xml.file" value="${test.common.xml}" /> + <!-- --> + + <ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true"> + <target name="tests" /> + </ant> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> + </properties> + + <profiles> + <profile> + <id>all</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <test.generic>true</test.generic> + <test.native>true</test.native> + <test.exo>true</test.exo> + <test.endpoint>true</test.endpoint> + </properties> + </profile> + <profile> + <id>generic</id> + <properties> + <test.generic>true</test.generic> + </properties> + </profile> + <profile> + <id>native</id> + <properties> + <test.native>true</test.native> + </properties> + </profile> + <profile> + <id>exo</id> + <properties> + <test.exo>true</test.exo> + </properties> + </profile> + <profile> + <id>endpoint</id> + <properties> + <test.endpoint>true</test.endpoint> + </properties> + </profile> + <profile> + <id>cargo.debug</id> + <properties> + <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug> + </properties> + </profile> + </profiles> +</project> Added: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,47 @@ +<assembly> + <id>endpoint-default-servlet-mapping</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/endpoint/default-servlet-mapping-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,47 @@ +<assembly> + <id>endpoint-path-mapping</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/endpoint/path-mapping-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,47 @@ +<assembly> + <id>endpoint-root-path-mapping</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/endpoint/root-path-mapping-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,47 @@ +<assembly> + <id>spi-exo-server</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/exo/server-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,47 @@ +<assembly> + <id>spi-generic-server</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/generic/server-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,47 @@ +<assembly> + <id>spi-lifecycle-listener-server</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/native/server-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,48 @@ +<assembly> + <id>spi-native-server</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/native/server-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:resolver</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<project name="tomcat-integration-test" default="tests"> + + <import file="${common.xml.file}"/> + + <!-- SYSTEM PROPERTIES --> + <property environment="env"/> + <property name="test.cargo.home" value="${env.TOMCAT_7_0_HOME}"/> + + + <!-- properties unique per app server --> + <property name="test.server.name" value="Tomcat"/> + <property name="test.server.version" value="7.0"/> + <property name="test.remote.server.name" value="RemoteTomcat_7_0"/> + <property name="cargo.container.id" value="tomcat7x"/> + + <!-- end unique properties --> + + <target name="tests" unless="maven.test.skip"> + <antcall target="tests.common"/> + </target> + + <path id="server.libs"> + <path refid="jboss-logging"/> + <path refid="gatein-common-shared"/> + + <!-- tomcat specific dependencies --> + <path path="${dependency.log4j.jar}"/> + <path path="${dependency.activation.jar}"/> + <path path="${dependency.junit.jar}"/> + <path path="${dependency.gatein-wci-core.jar}"/> + <path path="${dependency.gatein-wci-tomcat.jar}"/> + <path path="${dependency.gatein-wci-exo.jar}"/> + <path path="${dependency.jboss-serialization.jar}"/> + </path> + + <target name="cargo.start" depends="cargo.setup"> + <cargo + containerId="${cargo.container.id}" + home="${test.cargo.home}" + log="${cargo.log.dir}/cargo.${test.id}.start.log" + action="start" + wait="${cargo.wait}"> + <sharedClasspath> + <path refid="server.libs"/> + </sharedClasspath> + <configuration home="${test.cargo.dir}"> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <property name="cargo.jvmargs" value="${cargo.debug}"/> + + <file file="${target.dir}/test-classes/config/server/tomcat-users.xml" tofile="conf/tomcat-users.xml"/> + <deployable type="war" file="${cargo.war}"> + <property name="context" value="${cargo.war.context}"/> + </deployable> + </configuration> + </cargo> + </target> + + <target name="cargo.stop" depends="cargo.setup"> + <cargo + containerId="${cargo.container.id}" + home="${test.cargo.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + action="stop"> + <configuration home="${test.cargo.dir}"> + </configuration> + </cargo> + </target> + +</project> Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + </generic> +</jboss-unit> + Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,5 @@ +<tomcat-users> + <role rolename="test"/> + <user name="manager" password="manager" roles="manager-script"/> + <user name="foo" password="bar" roles="test"/> +</tomcat-users> Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/config/servers.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/config/servers.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/config/servers.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,24 @@ +<servers> + <server> + <server-name>RemoteTomcat_7_0</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>tomcat7x</name> + <host>localhost</host> + <port>8080</port> + </remote> + <authentication> + <username>manager</username> + <password>manager</password> + </authentication> + </deployer> + </node> + </server> +</servers> Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/endpoint/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + + <welcome-file-list> + <welcome-file/> + </welcome-file-list> +</web-app> Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/endpoint/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/foo/*</url-pattern> + </servlet-mapping> + + <welcome-file-list> + <welcome-file/> + </welcome-file-list> +</web-app> Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/endpoint/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + + <welcome-file-list> + <welcome-file/> + </welcome-file-list> +</web-app> Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/spi/generic/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.exoplatform.services.portletcontainer.impl.servlet.PortletApplicationListener</listener-class> + </listener> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <listener> + <listener-class>org.gatein.wci.impl.generic.GenericServletContainerContext</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>PortletWrapper</servlet-name> + <servlet-class>org.exoplatform.services.portletcontainer.impl.servlet.ServletWrapper</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PortletWrapper</servlet-name> + <url-pattern>/PortletWrapper</url-pattern> + </servlet-mapping> + + <welcome-file-list> + <welcome-file/> + </welcome-file-list> +</web-app> Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,65 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/spi/generic/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <listener> + <listener-class>org.gatein.wci.impl.generic.GenericServletContainerContext</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>GateInServlet</servlet-name> + <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>GateInServlet</servlet-name> + <url-pattern>/gateinservlet</url-pattern> + </servlet-mapping> + + <welcome-file-list> + <welcome-file/> + </welcome-file-list> +</web-app> Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/jboss/portal/test/web/spi/generic/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + + <welcome-file-list> + <welcome-file/> + </welcome-file-list> +</web-app> Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621) @@ -0,0 +1,77 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/spi/native/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.gatein.wci.tomcat.TC7ContainerServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>SPITestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>SPITestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + + <security-constraint> + <display-name>Test security</display-name> + <web-resource-collection> + <web-resource-name>Protected resources</web-resource-name> + <url-pattern>/foo/*</url-pattern> + <http-method>GET</http-method> + <http-method>POST</http-method> + </web-resource-collection> + + <auth-constraint> + <role-name>test</role-name> + </auth-constraint> + </security-constraint> + + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>Test security</realm-name> + </login-config> + + <welcome-file-list> + <welcome-file/> + </welcome-file-list> +</web-app>