Author: alain_defrance Date: 2010-09-21 11:50:14 -0400 (Tue, 21 Sep 2010) New Revision: 4297 Added: components/wci/branches/adf/test/servers/tomcat7/ components/wci/branches/adf/test/servers/tomcat7/pom.xml components/wci/branches/adf/test/servers/tomcat7/src/ components/wci/branches/adf/test/servers/tomcat7/src/assembly/ components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-exo-server.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-generic-server.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-native-server.xml components/wci/branches/adf/test/servers/tomcat7/src/integration-tests/ components/wci/branches/adf/test/servers/tomcat7/src/integration-tests/build.xml components/wci/branches/adf/test/servers/tomcat7/src/test/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/server/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/servers.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/context.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml components/wci/branches/adf/tomcat6/ components/wci/branches/adf/tomcat7/ components/wci/branches/adf/tomcat7/pom.xml components/wci/branches/adf/tomcat7/src/ components/wci/branches/adf/tomcat7/src/main/ components/wci/branches/adf/tomcat7/src/main/java/ components/wci/branches/adf/tomcat7/src/main/java/org/ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java Removed: components/wci/branches/adf/tomcat/ Modified: components/wci/branches/adf/pom.xml components/wci/branches/adf/test/servers/jboss42/pom.xml components/wci/branches/adf/test/servers/jboss51/pom.xml components/wci/branches/adf/test/servers/jetty6/pom.xml components/wci/branches/adf/test/servers/pom.xml components/wci/branches/adf/test/servers/tomcat6/pom.xml components/wci/branches/adf/test/src/test/build.xml components/wci/branches/adf/test/src/test/resources/config/servers.xml components/wci/branches/adf/tomcat6/pom.xml Log: Tomcat 7 native support & integration tests Modified: components/wci/branches/adf/pom.xml =================================================================== --- components/wci/branches/adf/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -32,7 +32,7 @@ <version.discovery>0.4</version.discovery> <!-- used in test module by maven-antrun-extended-plugin --> <version.jboss.unit>1.2.3</version.jboss.unit> - <version.cargo>1.0.1-alpha-2</version.cargo> + <version.cargo>1.0.3</version.cargo> </properties> @@ -70,9 +70,14 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> + <artifactId>wci-tomcat6</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat7</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-jetty</artifactId> @@ -126,7 +131,8 @@ <modules> <module>wci</module> <module>exo</module> - <module>tomcat</module> + <module>tomcat6</module> + <module>tomcat7</module> <module>jetty</module> <module>test</module> </modules> Modified: components/wci/branches/adf/test/servers/jboss42/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/jboss42/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/servers/jboss42/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/jboss51/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/jboss51/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/servers/jboss51/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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,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> @@ -234,11 +259,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,7 +320,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/branches/adf/test/servers/jetty6/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/jetty6/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/servers/jetty6/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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-Alpha01</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> @@ -181,6 +199,13 @@ <version>${version.cargo}</version> </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </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/branches/adf/test/servers/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/servers/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat6/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat6/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/servers/tomcat6/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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> @@ -298,7 +332,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}" /> Copied: components/wci/branches/adf/test/servers/tomcat7/pom.xml (from rev 4269, components/wci/branches/adf/test/servers/tomcat6/pom.xml) =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/pom.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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</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/branches/adf/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/assembly/spi-exo-server.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-exo-server.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-exo-server.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/assembly/spi-generic-server.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-generic-server.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-generic-server.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/assembly/spi-native-server.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-native-server.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-native-server.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/integration-tests/build.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/integration-tests/build.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/integration-tests/build.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,3 @@ +<tomcat-users> + <user name="manager" password="manager" roles="manager-script"/> +</tomcat-users> Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/servers.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/servers.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/servers.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/context.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/context.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/context.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,58 @@ +<?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> + + <welcome-file-list> + <welcome-file/> + </welcome-file-list> +</web-app> Modified: components/wci/branches/adf/test/src/test/build.xml =================================================================== --- components/wci/branches/adf/test/src/test/build.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/src/test/build.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -45,6 +45,9 @@ <target name="tests.tomcat"> <antcall target="tests.tomcat-6.0"/> </target> + <target name="tests.tomcat7"> + <antcall target="tests.tomcat-7.0"/> + </target> <target name="tests.jetty"> <antcall target="tests.jetty-6.1"/> </target> @@ -116,6 +119,14 @@ </not> </and> </condition> + <condition property="TOMCAT_7_0_HOME" value="${env.TOMCAT_7_0_HOME}"> + <and> + <isset property="env.TOMCAT_7_0_HOME"/> + <not> + <isset property="TOMCAT_7_0_HOME"/> + </not> + </and> + </condition> <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}"> <and> <isset property="env.JETTY_6_1_HOME"/> @@ -160,7 +171,7 @@ </condition> </fail> - <fail message="Please set the environment variable TOMCAT_6_0_HOME or use -Dtest.specified.containers to only run tests for containers specified with a HOME variable"> + <fail message="Please set the environment variable TOMCAT_6_0_HOME or TOMCAT_7_0_HOME or use -Dtest.specified.containers to only run tests for containers specified with a HOME variable"> <condition> <and> <not> @@ -169,6 +180,9 @@ <not> <isset property="TOMCAT_6_0_HOME"/> </not> + <not> + <isset property="TOMCAT_7_0_HOME"/> + </not> </and> </condition> </fail> @@ -276,6 +290,28 @@ <path location="${dependency.jboss-serialization.jar}"/> </path> + <path id="tomcat-7.0"> + <path refid="gatein-common"/> + <path refid="jboss-unit"/> + <path refid="jboss-microcontainer"/> + <pathelement path="${dependency.log4j.jar}"/> + <pathelement path="${dependency.xercesImpl.jar}"/> + <pathelement path="${dependency.xml-apis.jar}"/> + <pathelement path="${dependency.concurrent.jar}"/> + </path> + + <path id="tomcat-7.0-shared"> + <path refid="jboss-logging"/> + <path refid="gatein-common-shared"/> + <path location="${dependency.log4j.jar}"/> + <path location="${dependency.activation.jar}"/> + <path location="${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 location="${dependency.jboss-serialization.jar}"/> + </path> + <path id="jetty-6.1"> <path refid="gatein-common"/> <path refid="jboss-unit"/> @@ -381,8 +417,83 @@ <fileset dir="${target}/test-classes/spi/exo/app-war"/> </jar> + <!-- **************************** --> + <!-- Tomcat 7.0 container servlet --> + <!-- **************************** --> + <copy todir="${test.support}/tomcat-7.0-container-servlet/server-war/WEB-INF/lib" flatten="true"> + <path refid="tomcat-7.0"/> + </copy> + <mkdir dir="${test.temp.lib}/tomcat-7.0-container-servlet"/> + <war jarfile="${test.temp.lib}/tomcat-7.0-container-servlet/test-spi-server.war"> + <fileset dir="${test.support}/tomcat-7.0-container-servlet/server-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-spi-cs-lib.jar"/> + </war> + <jar jarfile="${test.temp.lib}/tomcat-7.0-container-servlet/test-spi-app.war"> + <fileset dir="${target}/test-classes/spi/app-war"/> + </jar> + <jar jarfile="${test.temp.lib}/tomcat-7.0-container-servlet/test-generic-app.war"> + <fileset dir="${target}/test-classes/spi/generic/app-war"/> + </jar> + <jar jarfile="${test.temp.lib}/tomcat-7.0-container-servlet/test-exo-app.war"> + <fileset dir="${target}/test-classes/spi/exo/app-war"/> + </jar> + <!-- **************************** --> + <!-- Tomcat 7.0 lifecyle listener --> + <!-- **************************** --> + + <copy todir="${test.support}/tomcat-7.0-lifecycle-listener/server-war/WEB-INF/lib" flatten="true"> + <path refid="tomcat-7.0"/> + </copy> + <mkdir dir="${test.temp.lib}/tomcat-7.0-lifecycle-listener"/> + <war jarfile="${test.temp.lib}/tomcat-7.0-lifecycle-listener/test-spi-server.war"> + <fileset dir="${test.support}/tomcat-7.0-lifecycle-listener/server-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/> + </war> + <jar jarfile="${test.temp.lib}/tomcat-7.0-lifecycle-listener/test-spi-app.war"> + <fileset dir="${target}/test-classes/spi/app-war"/> + </jar> + + <!-- ****************** --> + <!-- Tomcat 7.0 generic --> + <!-- ****************** --> + + <!-- --> + <mkdir dir="${test.support}/tomcat-7.0-generic/server-war/WEB-INF/lib"/> + <copy todir="${test.support}/tomcat-7.0-generic/server-war/WEB-INF/lib" flatten="true"> + <path refid="tomcat-7.0"/> + </copy> + <mkdir dir="${test.temp.lib}/tomcat-7.0-generic"/> + <war jarfile="${test.temp.lib}/tomcat-7.0-generic/test-spi-server.war"> + <fileset dir="${test.support}/tomcat-7.0-generic/server-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/> + </war> + <jar jarfile="${test.temp.lib}/tomcat-7.0-generic/test-spi-app.war"> + <fileset dir="${target}/test-classes/spi/generic/app-war"/> + </jar> + + <!-- ****************** --> + <!-- Tomcat 7.0 eXo --> + <!-- ****************** --> + + <!-- --> + <mkdir dir="${test.support}/tomcat-7.0-exo/server-war/WEB-INF/lib"/> + <copy todir="${test.support}/tomcat-7.0-exo/server-war/WEB-INF/lib" flatten="true"> + <path refid="tomcat-7.0"/> + </copy> + <mkdir dir="${test.temp.lib}/tomcat-7.0-exo"/> + <war jarfile="${test.temp.lib}/tomcat-7.0-exo/test-spi-server.war"> + <fileset dir="${test.support}/tomcat-7.0-exo/server-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/> + </war> + <jar jarfile="${test.temp.lib}/tomcat-7.0-exo/test-spi-app.war"> + <fileset dir="${target}/test-classes/spi/exo/app-war"/> + </jar> + + + + <!-- **************************** --> <!-- Jetty 6.1 handler --> <!-- **************************** --> @@ -596,6 +707,36 @@ <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/> </war> + <!-- ********** --> + <!-- Tomcat 7.0 --> + <!-- ********** --> + + <mkdir dir="${test.temp.lib}/tomcat-7.0"/> + + <copy todir="${test.support}/tomcat-7.0-endpoint/default-servlet-mapping-war/WEB-INF/lib" flatten="true"> + <path refid="tomcat-7.0"/> + </copy> + <war jarfile="${test.temp.lib}/tomcat-7.0/default-servlet-mapping.war"> + <fileset dir="${test.support}/tomcat-7.0-endpoint/default-servlet-mapping-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/> + </war> + + <copy todir="${test.support}/tomcat-7.0-endpoint/path-mapping-war/WEB-INF/lib" flatten="true"> + <path refid="tomcat-7.0"/> + </copy> + <war jarfile="${test.temp.lib}/tomcat-7.0/path-mapping.war"> + <fileset dir="${test.support}/tomcat-7.0-endpoint/path-mapping-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/> + </war> + + <copy todir="${test.support}/tomcat-7.0-endpoint/root-path-mapping-war/WEB-INF/lib" flatten="true"> + <path refid="tomcat-7.0"/> + </copy> + <war jarfile="${test.temp.lib}/tomcat-7.0/root-path-mapping.war"> + <fileset dir="${test.support}/tomcat-7.0-endpoint/root-path-mapping-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/> + </war> + <!-- ********* --> <!-- JETTY 6.1 --> <!-- ********* --> @@ -1084,6 +1225,119 @@ </target> + <target name="cargo.tomcat-7.0.start" depends="cargo.setup"> + + <cargo + containerId="tomcat7x" + home="${test.tomcat-7.0.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.start.log" + action="start" + wait="${cargo.wait}"> + <sharedClasspath> + + <path refid="tomcat-7.0-shared"/> + + </sharedClasspath> + <configuration home="${target}/cargo"> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/> + + <deployable type="war" file="${test.temp.lib}/manager.war"/> + <file file="${test.temp.lib}/manager" todir="webapps/manager"/> + <deployable type="war" file="${cargo.war}"/> + </configuration> + </cargo> + </target> + + <target name="cargo.tomcat-7.0.stop" depends="cargo.setup"> + <cargo + containerId="tomcat7x" + home="${test.tomcat-7.0.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + action="stop"> + <configuration home="${target}/cargo"> + </configuration> + </cargo> + </target> + + <target name="tests.tomcat-7.0.execute" unless="tests.tomcat-7.0.execute.skip"> + <echo message="Starting Tomcat 7.0 ${test.tomcat-7.0.name} with ${test.tomcat-7.0.home} to execute ${test.id} tests"/> + <antcall target="cargo.tomcat-7.0.start"> + <param name="cargo.wait" value="false"/> + <param name="cargo.war" value="${test.war}"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.remote.server.name" value="${test.tomcat-7.0.name}"/> + <param name="test.remote.archive.path" value="${test.archive.path}"/> + </antcall> + <antcall target="cargo.tomcat-7.0.stop"> + </antcall> + </target> + + <target name="tests.tomcat-7.0.spi"> + <condition property="tests.tomcat-7.0.execute.skip"> + <not> + <available file="${test.tomcat-7.0.home}" type="dir"/> + </not> + </condition> + <antcall target="tests.tomcat-7.0.execute"> + <param name="test.id" value="${test.tomcat-7.0.name}-spi-container-servlet"/> + <param name="test.war" value="${test.temp.lib}/tomcat-7.0-container-servlet/test-spi-server.war"/> + <param name="test.archive.path" value="tomcat-7.0-container-servlet"/> + </antcall> + <antcall target="tests.tomcat-7.0.execute"> + <param name="test.id" value="${test.tomcat-7.0.name}-spi-generic"/> + <param name="test.war" value="${test.temp.lib}/tomcat-7.0-generic/test-spi-server.war"/> + <param name="test.archive.path" value="tomcat-7.0-generic"/> + </antcall> + <antcall target="tests.tomcat-7.0.execute"> + <param name="test.id" value="${test.tomcat-7.0.name}-spi-exo"/> + <param name="test.war" value="${test.temp.lib}/tomcat-7.0-exo/test-spi-server.war"/> + <param name="test.archive.path" value="tomcat-7.0-exo"/> + </antcall> + </target> + + <target name="tests.tomcat-7.0.endpoint"> + <condition property="tests.tomcat-7.0.execute.skip"> + <not> + <available file="${test.tomcat-7.0.home}" type="dir"/> + </not> + </condition> + <antcall target="tests.tomcat-7.0.execute"> + <param name="test.id" value="${test.tomcat-7.0.name}-endpoint-default-servlet-mapping"/> + <param name="test.war" value="${test.temp.lib}/tomcat-7.0/default-servlet-mapping.war"/> + <param name="test.archive.path" value=""/> + </antcall> + <antcall target="tests.tomcat-7.0.execute"> + <param name="test.id" value="${test.tomcat-7.0.name}-endpoint-root-path-mapping"/> + <param name="test.war" value="${test.temp.lib}/tomcat-7.0/root-path-mapping.war"/> + <param name="test.archive.path" value=""/> + </antcall> + <antcall target="tests.tomcat-7.0.execute"> + <param name="test.id" value="${test.tomcat-7.0.name}-endpoint-path-mapping"/> + <param name="test.war" value="${test.temp.lib}/tomcat-7.0/path-mapping.war"/> + <param name="test.archive.path" value=""/> + </antcall> + </target> + + <target name="tests.tomcat-7.0"> + <!-- spi tests --> + <antcall target="tests.tomcat-7.0.spi"> + <param name="test.tomcat-7.0.name" value="RemoteTomcat_7_0"/> + <param name="test.tomcat-7.0.home" value="${TOMCAT_7_0_HOME}"/> + </antcall> + + <!-- endpoint tests --> + + <antcall target="tests.tomcat-7.0.endpoint"> + <param name="test.tomcat-7.0.name" value="RemoteTomcat_7_0"/> + <param name="test.tomcat-7.0.home" value="${TOMCAT_7_0_HOME}"/> + </antcall> + + </target> + <target name="cargo.jetty-6.1.start" depends="cargo.setup"> <cargo containerId="jetty6x" 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-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/src/test/resources/config/servers.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -22,6 +22,28 @@ </node> </server> <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>admin</username> + <password>admin</password> + </authentication> + </deployer> + </node> + </server> + <server> <server-name>RemoteJetty_6_1</server-name> <node> <node-id>default</node-id> Copied: components/wci/branches/adf/tomcat6 (from rev 4269, components/wci/branches/adf/tomcat) Modified: components/wci/branches/adf/tomcat6/pom.xml =================================================================== --- components/wci/branches/adf/tomcat/pom.xml 2010-09-21 07:58:08 UTC (rev 4269) +++ components/wci/branches/adf/tomcat6/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -5,9 +5,9 @@ <version>2.1.0-Alpha01</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>wci-tomcat</artifactId> + <artifactId>wci-tomcat6</artifactId> <packaging>jar</packaging> - <name>GateIn - WCI Tomcat compatibility component</name> + <name>GateIn - WCI Tomcat 6 compatibility component</name> <dependencies> <dependency> Added: components/wci/branches/adf/tomcat7/pom.xml =================================================================== --- components/wci/branches/adf/tomcat7/pom.xml (rev 0) +++ components/wci/branches/adf/tomcat7/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,30 @@ +<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-parent</artifactId> + <version>2.1.0-Alpha01</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-tomcat7</artifactId> + <packaging>jar</packaging> + <name>GateIn - WCI Tomcat 7 compatibility component</name> + + <dependencies> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina</artifactId> + <version>7.0.2</version> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + +</project> Added: components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java =================================================================== --- components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java (rev 0) +++ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,127 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.gatein.wci.tomcat; + +import org.apache.catalina.Container; +import org.apache.catalina.ContainerServlet; +import org.apache.catalina.Engine; +import org.apache.catalina.Wrapper; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; + +/** + * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a> + * @version $Revision: 1.0 $ + */ +public class TC7ContainerServlet extends HttpServlet implements ContainerServlet +{ + + /** . */ + private Wrapper wrapper; + + /** . */ + private TC7ServletContainerContext containerContext; + + /** . */ + private boolean started; + + public Wrapper getWrapper() + { + return wrapper; + } + + public void setWrapper(Wrapper wrapper) + { + this.wrapper = wrapper; + + // + if (wrapper != null) + { + attemptStart(); + } + else + { + attemptStop(); + } + } + + public void init() throws ServletException + { + started = true; + + // + attemptStart(); + } + + public void destroy() + { + started = false; + + // + attemptStop(); + } + + private void attemptStart() + { + if (started && wrapper != null) + { + start(); + } + } + + private void attemptStop() + { + if (!started || wrapper == null) + { + stop(); + } + } + + private void start() + { + Container container = wrapper; + while (container.getParent() != null) + { + container = container.getParent(); + if (container instanceof Engine) + { + Engine engine = (Engine)container; + containerContext = new TC7ServletContainerContext(engine); + containerContext.start(); + break; + } + } + } + + private void stop() + { + if (containerContext != null) + { + containerContext.stop(); + + // + containerContext = null; + } + } +} Added: components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java =================================================================== --- components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java (rev 0) +++ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,97 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.gatein.wci.tomcat; + +import org.apache.catalina.Container; +import org.apache.catalina.Engine; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.Server; +import org.apache.catalina.Service; + +/** + * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a> + * @version $Revision: 1.0 $ + */ +public class TC7LifecycleListener implements LifecycleListener +{ + + /** . */ + private TC7ServletContainerContext containerContext; + + public synchronized void lifecycleEvent(LifecycleEvent event) + { + Lifecycle lifecycle = event.getLifecycle(); + + // + if (lifecycle instanceof Server) + { + Server server = (Server)lifecycle; + + // + Engine engine = getEngine(server); + + // + if (engine != null) + { + if (Lifecycle.START_EVENT.equals(event.getType())) + { + containerContext = new TC7ServletContainerContext(engine); + containerContext.start(); + } + else if (Lifecycle.STOP_EVENT.equals(event.getType())) + { + if (containerContext != null) + { + containerContext.stop(); + } + } + } + } + } + + private Engine getEngine(Server server) + { + Service[] services = server.findServices(); + for (int i = 0; i < services.length; i++) + { + Service service = services[i]; + Engine engine = getEngine(service.getContainer()); + if (engine != null) + { + return engine; + } + } + return null; + } + + private Engine getEngine(Container container) + { + if (container instanceof Engine) + { + return (Engine)container; + } + return null; + } +} Added: components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java =================================================================== --- components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java (rev 0) +++ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,307 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.gatein.wci.tomcat; + +import org.apache.catalina.Container; +import org.apache.catalina.ContainerEvent; +import org.apache.catalina.ContainerListener; +import org.apache.catalina.Context; +import org.apache.catalina.Engine; +import org.apache.catalina.Host; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LifecycleState; +import org.apache.catalina.core.StandardContext; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; +import org.gatein.wci.RequestDispatchCallback; +import org.gatein.wci.command.CommandDispatcher; +import org.gatein.wci.impl.DefaultServletContainerFactory; +import org.gatein.wci.spi.ServletContainerContext; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + +/** + * An implementation of the <code>ServletContainerContext</code> for Tomcat 7. + * + * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a> + * @version $Revision: 1.0 $ + */ +public class TC7ServletContainerContext implements ServletContainerContext, ContainerListener, LifecycleListener +{ + private final static Logger log = LoggerFactory.getLogger(TC7ServletContainerContext.class); + + /** . */ + private final CommandDispatcher dispatcher = new CommandDispatcher("/tomcatgateinservlet"); + + /** The monitored hosts. */ + private final Set<String> monitoredHosts = new HashSet<String>(); + + /** The monitored contexts. */ + private final Set<String> monitoredContexts = new HashSet<String>(); + + /** . */ + private final Engine engine; + + /** . */ + private Registration registration; + + public TC7ServletContainerContext(Engine engine) + { + this.engine = engine; + } + + public Object include( + ServletContext targetServletContext, + HttpServletRequest request, + HttpServletResponse response, + RequestDispatchCallback callback, + Object handback) throws ServletException, IOException + { + return dispatcher.include(targetServletContext, request, response, callback, handback); + } + + public void setCallback(Registration registration) + { + this.registration = registration; + } + + public void unsetCallback(Registration registration) + { + this.registration = null; + } + + public synchronized void containerEvent(ContainerEvent event) + { + if (event.getData() instanceof Host) + { + Host host = (Host)event.getData(); + + // + if (Container.ADD_CHILD_EVENT.equals(event.getType())) + { + registerHost(host); + } + else if (Container.REMOVE_CHILD_EVENT.equals(event.getType())) + { + unregisterHost(host); + } + } + else if (event.getData() instanceof StandardContext) + { + StandardContext context = (StandardContext)event.getData(); + + // + if (Container.ADD_CHILD_EVENT.equals(event.getType())) + { + registerContext(context); + } + else if (Container.REMOVE_CHILD_EVENT.equals(event.getType())) + { + unregisterContext(context); + } + } + } + + public void lifecycleEvent(LifecycleEvent event) + { + if (event.getSource() instanceof Context) + { + Context context = (Context)event.getSource(); + + // + if (Lifecycle.AFTER_START_EVENT.equals(event.getType())) + { + start(context); + } + else if (Lifecycle.BEFORE_STOP_EVENT.equals(event.getType())) + { + stop(context); + } + } + } + + void start() + { + DefaultServletContainerFactory.registerContext(this); + + // + Container[] childrenContainers = engine.findChildren(); + for (Container childContainer : childrenContainers) + { + if (childContainer instanceof Host) + { + Host host = (Host)childContainer; + registerHost(host); + } + } + + // + engine.addContainerListener(this); + } + + void stop() + { + engine.removeContainerListener(this); + + // + Container[] childrenContainers = engine.findChildren(); + for (Container childContainer : childrenContainers) + { + if (childContainer instanceof Host) + { + Host host = (Host)childContainer; + unregisterHost(host); + } + } + + // + registration.cancel(); + registration = null; + } + + /** + * Register an host for registration which means that we fire events for all the contexts it contains and we + * subscribe for its life cycle events. If the host is already monitored nothing is done. + * + * @param host the host to register for monitoring + */ + private void registerHost(Host host) + { + if (!monitoredHosts.contains(host.getName())) + { + Container[] childrenContainers = host.findChildren(); + for (Container childContainer : childrenContainers) + { + if (childContainer instanceof StandardContext) + { + StandardContext context = (StandardContext)childContainer; + registerContext(context); + } + } + + // + host.addContainerListener(this); + + // + monitoredHosts.add(host.getName()); + } + } + + private void unregisterHost(Host host) + { + if (monitoredHosts.contains(host.getName())) + { + monitoredHosts.remove(host.getName()); + + // + host.removeContainerListener(this); + + // + Container[] childrenContainers = host.findChildren(); + for (Container childContainer : childrenContainers) + { + if (childContainer instanceof StandardContext) + { + StandardContext context = (StandardContext)childContainer; + unregisterContext(context); + } + } + } + } + + private void registerContext(StandardContext context) + { + if (!monitoredContexts.contains(context.getName())) + { + context.addLifecycleListener(this); + + // + if (LifecycleState.STARTED.equals(context.getState())) + { + start(context); + } + + // + monitoredContexts.add(context.getName()); + } + } + + private void unregisterContext(StandardContext context) + { + if (monitoredContexts.contains(context.getName())) + { + monitoredContexts.remove(context.getName()); + + // + if (LifecycleState.STARTED.equals(context.getState())) + { + stop(context); + } + + // + context.removeLifecycleListener(this); + } + } + + private void start(Context context) + { + try + { + log.debug("Context added " + context.getPath()); + TC7WebAppContext webAppContext = new TC7WebAppContext(context); + + // + if (registration != null) + { + registration.registerWebApp(webAppContext); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + private void stop(Context context) + { + try + { + if (registration != null) + { + registration.unregisterWebApp(context.getPath()); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } +} Added: components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java =================================================================== --- components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java (rev 0) +++ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,127 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.gatein.wci.tomcat; + +import org.apache.catalina.Context; +import org.apache.catalina.Wrapper; +import org.gatein.wci.command.CommandServlet; +import org.gatein.wci.spi.WebAppContext; +import org.w3c.dom.Document; + +import javax.servlet.ServletContext; +import java.io.IOException; +import java.io.InputStream; + +/** + * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a> + * @version $Revision: 1.0 $ + */ +public class TC7WebAppContext implements WebAppContext +{ + + /** . */ + private Document descriptor; + + /** . */ + private ServletContext servletContext; + + /** . */ + private ClassLoader loader; + + /** . */ + private String contextPath; + + /** . */ + private final Context context; + + /** . */ + private Wrapper commandServlet; + + TC7WebAppContext(Context context) throws Exception + { + this.context = context; + + // + servletContext = context.getServletContext(); + loader = context.getLoader().getClassLoader(); + contextPath = context.getPath(); + } + + public void start() throws Exception + { + try + { + commandServlet = context.createWrapper(); + commandServlet.setName("TomcatGateInServlet"); + commandServlet.setLoadOnStartup(0); + commandServlet.setServletClass(CommandServlet.class.getName()); + context.addChild(commandServlet); + context.addServletMapping("/tomcatgateinservlet", "TomcatGateInServlet"); + } + catch (Exception e) + { + cleanup(); + throw e; + } + } + + public void stop() + { + cleanup(); + } + + private void cleanup() + { + if (commandServlet != null) + { + try + { + context.removeServletMapping("tomcatgateinservlet"); + context.removeChild(commandServlet); + } + catch (Exception e) + { + } + } + } + + public ServletContext getServletContext() + { + return servletContext; + } + + public ClassLoader getClassLoader() + { + return loader; + } + + public String getContextPath() + { + return contextPath; + } + + public boolean importFile(String parentDirRelativePath, String name, InputStream source, boolean overwrite) throws IOException + { + return false; + } +}