[portal-commits] JBoss Portal SVN: r11083 - in modules/web/trunk: web and 23 other directories.

Author: mwringe Date: 2008-06-18 14:23:17 -0400 (Wed, 18 Jun 2008) New Revision: 11083 Added: modules/web/trunk/web/src/test/resources/config/jetty/ modules/web/trunk/web/src/test/resources/config/jetty/jetty.xml modules/web/trunk/web/src/test/resources/config/jetty/realm.properties modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/META-INF/ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/META-INF/context.xml modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/log4j.properties modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/logging.properties modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/context.xml modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/jboss-web.xml modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/META-INF/ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/META-INF/context.xml modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/jboss-web.xml modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/META-INF/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/META-INF/context.xml modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/log4j.properties modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/logging.properties modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/jetty-web.xml modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/web.xml modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/META-INF/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/META-INF/context.xml modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/log4j.properties modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/logging.properties modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml Modified: modules/web/trunk/build/pom.xml modules/web/trunk/web/pom.xml modules/web/trunk/web/src/test/build.xml modules/web/trunk/web/src/test/resources/config/servers.xml Log: Update to use Cargo 1.0-alpha-3. Add generic support for Jetty. Modified: modules/web/trunk/build/pom.xml =================================================================== --- modules/web/trunk/build/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) +++ modules/web/trunk/build/pom.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -28,16 +28,18 @@ <version.concurrent>1.3.4</version.concurrent> <version.sun.servlet>2.4</version.sun.servlet> <version.apache.tomcat>5.5.12</version.apache.tomcat> + <version.jetty>6.1.7</version.jetty> + <version.jboss-logging>2.0.4.GA</version.jboss-logging> <version.apache.log4j>1.2.14</version.apache.log4j> - <version.jboss-logging>2.0.4.GA</version.jboss-logging> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> - <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common> - <version.jboss.unit>1.2.0.Beta2</version.jboss.unit> + <version.jboss.portal.common>1.2.0</version.jboss.portal.common> + <version.jboss.unit>1.2.0-SNAPSHOT</version.jboss.unit> + <version.jboss-reflect>2.0.0.Beta12</version.jboss-reflect> <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer> - <version.cargo>0.9-portal</version.cargo> + <version.cargo>1.0-alpha-3</version.cargo> <version.junit>3.8.1</version.junit> <version.ant>1.7.0</version.ant> </properties> @@ -106,6 +108,16 @@ <version>${version.apache.tomcat}</version> </dependency> <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>${version.concurrent}</version> + </dependency> + <dependency> <groupId>apache-log4j</groupId> <artifactId>log4j</artifactId> <version>${version.apache.log4j}</version> @@ -160,6 +172,17 @@ </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <version>${version.jboss-reflect}</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-dependency</artifactId> + <version>${version.jboss.microcontainer}</version> + </dependency> + + <dependency> <groupId>concurrent</groupId> <artifactId>concurrent</artifactId> <version>${version.concurrent}</version> @@ -181,13 +204,29 @@ <version>${version.apache.commons-httpclient}</version> </dependency> <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.0-FCS</version> + </dependency> + <dependency> + <groupId>saxpath</groupId> + <artifactId>saxpath</artifactId> + <version>1.0-FCS</version> + </dependency> + <dependency> <groupId>cargo</groupId> <artifactId>cargo-manager</artifactId> <type>war</type> + <version>0.9-portal</version> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-jetty-deployer</artifactId> + <type>war</type> <version>${version.cargo}</version> </dependency> <dependency> - <groupId>cargo</groupId> + <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> </dependency> Modified: modules/web/trunk/web/pom.xml =================================================================== --- modules/web/trunk/web/pom.xml 2008-06-18 17:07:29 UTC (rev 11082) +++ modules/web/trunk/web/pom.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -37,11 +37,14 @@ <artifactId>catalina</artifactId> </dependency> <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </dependency> + <dependency> <groupId>apache-log4j</groupId> <artifactId>log4j</artifactId> </dependency> - <!-- SCOPE TEST --> <dependency> <groupId>concurrent</groupId> @@ -103,6 +106,16 @@ <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>commons-logging</groupId> <artifactId>commons-logging</artifactId> <scope>test</scope> @@ -113,11 +126,30 @@ <scope>test</scope> </dependency> <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + </dependency> + <dependency> + <groupId>saxpath</groupId> + <artifactId>saxpath</artifactId> + </dependency> + <dependency> <groupId>cargo</groupId> <artifactId>cargo-manager</artifactId> <type>war</type> <scope>test</scope> </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-jetty-deployer</artifactId> + <type>war</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + </dependency> </dependencies> <build> @@ -136,12 +168,18 @@ <!--stuff to run servers for tests--> <dependency> - <groupId>cargo</groupId> + <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>cargo</groupId> + <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> <scope>test</scope> @@ -197,6 +235,9 @@ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/> + <!-- Cargo Jetty deployer --> + <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/> + <ant antfile="${basedir}/src/test/build.xml"> <target name="tests"/> </ant> Modified: modules/web/trunk/web/src/test/build.xml =================================================================== --- modules/web/trunk/web/src/test/build.xml 2008-06-18 17:07:29 UTC (rev 11082) +++ modules/web/trunk/web/src/test/build.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -21,7 +21,9 @@ <target name="tests.call.all" unless="tests"> <antcall target="tests.jboss"/> +<!-- <antcall target="tests.jboss5"/> --> <antcall target="tests.tomcat"/> + <antcall target="tests.jetty"/> </target> <target name="tests.call.single" if="tests"> @@ -32,9 +34,15 @@ <target name="tests.jboss"> <antcall target="tests.jboss-4.2"/> </target> +<!-- <target name="tests.jboss5"> + <antcall target="tests.jboss-5.0"/> + </target> --> <target name="tests.tomcat"> <antcall target="tests.tomcat-6.0"/> </target> + <target name="tests.jetty"> + <antcall target="tests.jetty-6"/> + </target> <target name="prepare_env"> @@ -79,6 +87,14 @@ </not> </and> </condition> +<!-- <condition property="JBOSS_5_0_HOME" value="${env.JBOSS_5_0_HOME}"> + <and> + <isset property="env.JBOSS_5_0_HOME"/> + <not> + <isset property="JBOSS_5_0_HOME"/> + </not> + </and> + </condition> --> <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}"> <and> <isset property="env.TOMCAT_6_0_HOME"/> @@ -87,6 +103,14 @@ </not> </and> </condition> + <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}"> + <and> + <isset property="env.JETTY_6_1_HOME"/> + <not> + <isset property="JETTY_6_1_HOME"/> + </not> + </and> + </condition> <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME"> <condition> @@ -104,6 +128,16 @@ </condition> </fail> +<!-- <fail message="Please set the environment variable JBOSS_5_0_HOME"> + <condition> + <and> + <not> + <isset property="JBOSS_5_0_HOME"/> + </not> + </and> + </condition> + </fail> --> + <fail message="Please set the environment variable TOMCAT_6_0_HOME"> <condition> <and> @@ -114,6 +148,17 @@ </condition> </fail> + <fail message="Please set the environment variable JETTY_6_1_HOME"> + <condition> + <and> + <not> + <isset property="JETTY_6_1_HOME"/> + </not> + </and> + </condition> + </fail> + + </target> <target name="package-tests"> @@ -166,6 +211,12 @@ <path location="${target}/web-web-${project.version}.jar"/> </path> +<!-- <path id="jboss-5.0"> + <path refid="portal-common"/> + <path refid="jboss-unit"/> + <path refid="jboss-microcontainer"/> + </path> --> + <path id="tomcat-6.0"> <path refid="portal-common"/> <path refid="jboss-unit"/> @@ -186,6 +237,12 @@ <path location="${target}/web-web-${project.version}.jar"/> </path> + <path id="jetty-6.1"> + <path refid="portal-common"/> + <path refid="jboss-unit"/> + <path refid="jboss-microcontainer"/> + </path> + <!-- SPI Test case--> <mkdir dir="${test.temp.lib}"/> @@ -249,6 +306,36 @@ <fileset dir="${target}/test-classes/spi/generic/app-war"/> </jar> + <!-- **************************** --> + <!-- Jetty 6.1 container servlet --> + <!-- **************************** --> + + <copy todir="${test.support}/jetty-6.1-container-servlet/server-war/WEB-INF/lib" flatten="true"> + <path refid="jetty-6.1"/> + </copy> + <mkdir dir="${test.temp.lib}/jetty-6.1-container-servlet"/> + + <!-- **************************** --> + <!-- Jetty 6.1 lifecyle listener --> + <!-- **************************** --> + + + <copy todir="${test.support}/jetty-6.1-lifecycle-listener/server-war/WEB-INF/lib" flatten="true"> + <path refid="jetty-6.1"/> + </copy> + <mkdir dir="${test.temp.lib}/jetty-6.1-lifecycle-listener"/> + + <!-- ****************** --> + <!-- Jetty 6.1 generic --> + <!-- ****************** --> + + <!-- --> + <mkdir dir="${test.support}/jetty-6.1-generic/server-war/WEB-INF/lib"/> + <copy todir="${test.support}/jetty-6.1-generic/server-war/WEB-INF/lib" flatten="true"> + <path refid="jetty-6.1"/> + </copy> + <mkdir dir="${test.temp.lib}/jetty-6.1-generic"/> + <!-- *************************** --> <!-- JBoss 4.2 container servlet --> <!-- *************************** --> @@ -283,7 +370,7 @@ <fileset dir="${target}/test-classes/spi/generic/app-war"/> </jar> - <!--endpoint test case--> + <!--endpoint test case--> <jar jarfile="${test.temp.lib}/portal-test-endpoint-lib.jar"> <fileset dir="${target}/test-classes/"> @@ -295,6 +382,47 @@ <fileset dir="${target}/test-classes/portal-test-endpoint-jar"/> </jar> + <!-- *************************** --> + <!-- JBoss 5.0 container servlet --> + <!-- *************************** --> + + <!-- + <copy todir="${test.support}/jboss-5.0-container-servlet/server-war/WEB-INF/lib" flatten="true"> + <path refid="jboss-5.0"/> + </copy> + <mkdir dir="${test.temp.lib}/jboss-5.0-container-servlet"/> + --> + + <!-- ***************** --> + <!-- JBoss 5.0 generic --> + <!-- ***************** --> + + <!-- + <copy todir="${test.support}/jboss-5.0-generic/server-war/WEB-INF/lib" flatten="true"> + <path refid="jboss-5.0"/> + </copy> + <mkdir dir="${test.temp.lib}/jboss-5.0-generic"/> + + <war jarfile="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-server.war"> + <fileset dir="${test.support}/jboss-5.0-container-servlet/server-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/> + </war> + <jar jarfile="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-app.war"> + <fileset dir="${target}/test-classes/spi/app-war"/> + </jar> + <war jarfile="${test.temp.lib}/jboss-5.0-generic/test-spi-server.war"> + <fileset dir="${test.support}/jboss-5.0-generic/server-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/> + </war> + <jar jarfile="${test.temp.lib}/jboss-5.0-generic/test-spi-app.war"> + <fileset dir="${target}/test-classes/spi/generic/app-war"/> + </jar> + <war jarfile="${test.temp.lib}/jboss-5.0-container-servlet/test-request-server.war"> + <fileset dir="${test.support}/jboss-5.0-container-servlet/server-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-request-lib.jar"/> + </war> + --> + <!-- ********** --> <!-- Tomcat 6.0 --> <!-- ********** --> @@ -326,6 +454,31 @@ </war> <!-- ********* --> + <!-- JETTY 6.1 --> + <!-- ********* --> + <war jarfile="${test.temp.lib}/jetty-6.1-container-servlet/test-spi-server.war"> + <fileset dir="${test.support}/jetty-6.1-container-servlet/server-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/> + </war> + <jar jarfile="${test.temp.lib}/jetty-6.1-container-servlet/test-spi-app.war"> + <fileset dir="${target}/test-classes/spi/app-war"/> + </jar> + <jar jarfile="${test.temp.lib}/jetty-6.1-container-servlet/test-spi-app.war"> + <fileset dir="${target}/test-classes/spi/app-war"/> + </jar> + <war jarfile="${test.temp.lib}/jetty-6.1-generic/test-spi-server.war"> + <fileset dir="${test.support}/jetty-6.1-generic/server-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/> + </war> + <jar jarfile="${test.temp.lib}/jetty-6.1-generic/test-spi-app.war"> + <fileset dir="${target}/test-classes/spi/generic/app-war"/> + </jar> + <war jarfile="${test.temp.lib}/jetty-6.1-container-servlet/test-request-server.war"> + <fileset dir="${test.support}/jetty-6.1-container-servlet/server-war"/> + <lib dir="${test.temp.lib}" includes="portal-test-request-lib.jar"/> + </war> + + <!-- ********* --> <!-- JBoss 4.2 --> <!-- ********* --> @@ -338,7 +491,7 @@ <fileset dir="${test.support}/jboss-4.2-endpoint/default-servlet-mapping-war"/> <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/> </war> - + <copy todir="${test.support}/jboss-4.2-endpoint/path-mapping-war/WEB-INF/lib" flatten="true"> <path refid="jboss-4.2"/> </copy> @@ -392,6 +545,8 @@ </sharedClasspath> <configuration> + <property name="cargo.rmi.port" value="1299"/> + <property name="cargo.jboss.server.xml" value="/tmp/server.xml"/> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <deployable type="war" file="${cargo.war}"/> @@ -406,7 +561,7 @@ log="${cargo.log.dir}/cargo.${test.id}.startup.log" action="stop"> <configuration> - <property name="cargo.rmi.port" value="1099"/> + <property name="cargo.rmi.port" value="1299"/> </configuration> </cargo> </target> @@ -497,14 +652,100 @@ <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_2"/> <param name="test.jboss-4.2.home" value="${JBOSS_4_2_2_HOME}"/> </antcall> + </target> +<!-- <target name="cargo.jboss-5.0.start" depends="cargo.setup"> + <cargo + containerId="jboss5x" + home="${test.jboss-5.0.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + action="start" + wait="${cargo.wait}"> + <sharedClasspath> + <path location="${dependency.portal-common.jar}"/> + <path location="${dependency.jboss-unit.jar}"/> + <path location="${dependency.jboss-unit-remote.jar}"/> + <path location="${target}/web-web-${project.version}.jar"/> + + </sharedClasspath> + <configuration> + <property name="cargo.rmi.port" value="1299"/> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <deployable type="war" file="${test.spi.server.path}"/> + </configuration> + </cargo> </target> + <target name="cargo.jboss-5.0.stop" depends="cargo.setup"> + <cargo + containerId="jboss5x" + home="${test.jboss-5.0.home}" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" + action="stop"> + <configuration> + <property name="cargo.rmi.port" value="1299"/> + </configuration> + </cargo> + </target> + <target name="tests.jboss-5.0.container-servlet" if="${test.jboss-5.0.home.variable-name}"> + <echo message="Starting JBoss 5.0 container-servlet tests with ${test.jboss-5.0.home}"/> + <antcall target="cargo.jboss-5.0.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${test.archive.path}"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.remote.server.name" value="${test.jboss-5.0.name}"/> + <param name="test.remote.archive.path" value="${test.archive.path}"/> + </antcall> + <antcall target="cargo.jboss-5.0.stop"> + </antcall> + </target> + + <target name="tests.jboss-5.0.generic" if="${test.jboss-5.0.home.variable-name}"> + <echo message="Starting JBoss 5.0 generic tests with ${test.jboss-5.0.home}"/> + <antcall target="cargo.jboss-5.0.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${test.archive.path}"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.remote.server.name" value="${test.jboss-5.0.name}"/> + <param name="test.remote.archive.path" value="${test.archive.path}"/> + </antcall> + <antcall target="cargo.jboss-5.0.stop"> + </antcall> + </target> + + <target name="tests.jboss-5.0"> + <antcall target="tests.jboss-5.0.container-servlet"> + <param name="test.id" value="JBoss-5_0-spi-container-servlet"/> + <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/> + <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/> + <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/> + <param name="test.archive.path" value="jboss-5.0-container-servlet/test-spi-server.war"/> + </antcall> + <antcall target="tests.jboss-5.0.generic"> + <param name="test.id" value="JBoss-5_0-spi-generic"/> + <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/> + <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/> + <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/> + <param name="test.archive.path" value="jboss-5.0-generic/test-spi-server.war"/> + </antcall> + <antcall target="tests.jboss-5.0.container-servlet"> + <param name="test.id" value="JBoss-5_0-request-container-servlet"/> + <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/> + <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/> + <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/> + <param name="test.archive.path" value="jboss-5.0-container-servlet/test-request-server.war"/> + </antcall> + </target> --> + <target name="cargo.tomcat-6.0.start" depends="cargo.setup"> <cargo - containerId="tomcat5x" + containerId="tomcat6x" home="${test.tomcat-6.0.home}" output="${cargo.log.dir}/cargo.${test.id}.server.log" log="${cargo.log.dir}/cargo.${test.id}.start.log" @@ -518,7 +759,9 @@ <configuration> <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=n,address=8222"/> <!--<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"/> <deployable type="war" file="${cargo.war}"/> </configuration> @@ -527,7 +770,7 @@ <target name="cargo.tomcat-6.0.stop" depends="cargo.setup"> <cargo - containerId="tomcat5x" + containerId="tomcat6x" home="${test.tomcat-6.0.home}" log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="stop"> @@ -591,10 +834,114 @@ </antcall> </target> + <target name="cargo.jetty-6.start" depends="cargo.setup"> + <cargo + containerId="jetty6x" + home="${test.jetty-6.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.start.log" + action="start" + wait="${cargo.wait}"> + <extraClasspath> + <path location="${dependency.portal-common-common.jar}"/> + <path location="${dependency.jboss-unit.jar}"/> + <path location="${dependency.jboss-unit-remote.jar}"/> + <path location="${target}/web-web-${project.version}.jar"/> + + <path location="${dependency.log4j.jar}"/> + <path location="${dependency.concurrent.jar}"/> + <path location="${dependency.portal-common.jar}"/> + <path location="${dependency.activation.jar}"/> + <path location="${dependency.junit.jar}"/> + <path location="${dependency.jboss-logging-spi.jar}"/> + + <path location="${target}/web-web-${project.version}.jar"/> + + </extraClasspath> + <configuration> + <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=n,address=8222"/> + <!-- overwrite these files to give jetty the propery security setup --> + <configfile file="${basedir}/src/test/resources/config/jetty/jetty.xml" todir="etc"/> + <configfile file="${basedir}/src/test/resources/config/jetty/realm.properties" todir="etc"/> + <deployable type="war" file="${cargo.war}"/> + <deployable type="war" file="${dependency.cargo.jetty-deployer}"> + <property name="context" value="cargo-jetty-deployer"/> + </deployable> + </configuration> + </cargo> + </target> + + <target name="cargo.jetty-6.stop" depends="cargo.setup"> + <cargo + containerId="jetty6x" + home="${test.jetty-6.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + action="stop"> + <configuration> + </configuration> + </cargo> + </target> + + <target name="tests.jetty-6.container-servlet" if="${test.jetty-6.home.variable-name}"> + <echo message="Starting Jetty 6 container-servlet tests with ${test.jetty-6.home}"/> + <antcall target="cargo.jetty-6.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${test.archive.path}"/> + <param name="cargo.war" value="${test.war}"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.remote.server.name" value="${test.jetty-6.name}"/> + <param name="test.remote.archive.path" value="${test.archive.path}"/> + </antcall> + <antcall target="cargo.jetty-6.stop"> + </antcall> + </target> + + + <target name="tests.jetty-6.generic" if="${test.jetty-6.home.variable-name}"> + <fail unless="test.jetty-6.home" message="Please set the environment variable JETTY_6_1_HOME"/> + <echo message="Starting Jetty 6 generic tests with ${test.jetty-6.home}"/> + <antcall target="cargo.jetty-6.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.jetty-6.name}"/> + <param name="test.remote.archive.path" value="${test.archive.path}"/> + </antcall> + <antcall target="cargo.jetty-6.stop"> + </antcall> + </target> + + <target name="tests.jetty-6"> +<!-- <antcall target="tests.jetty-6.container-servlet"> + <param name="test.id" value="Jetty-6_1-spi-container-servlet"/> + <param name="test.jetty-6.name" value="RemoteJetty_6_1"/> + <param name="test.jetty-6.home" value="${JETTY_6_1_HOME}"/> + <param name="test.jetty-6.home.variable-name" value="JETTY_6_1_HOME"/> + <param name="test.archive.path" value="${test.temp.lib}/jetty-6.1-container-servlet/test-spi-server.war"/> + </antcall> --> + <antcall target="tests.jetty-6.generic"> + <param name="test.id" value="Jetty-6_1-spi-generic"/> + <param name="test.jetty-6.name" value="RemoteJetty_6_1"/> + <param name="test.jetty-6.home" value="${JETTY_6_1_HOME}"/> + <param name="test.jetty-6.home.variable-name" value="JETTY_6_1_HOME"/> + <param name="test.war" value="${test.temp.lib}/jetty-6.1-generic/test-spi-server.war"/> + <param name="test.archive.path" value="jetty-6.1-generic"/> + </antcall> +<!-- <antcall target="tests.jetty-6.container-servlet"> + <param name="test.id" value="Jetty-6_0-request-container-servlet"/> + <param name="test.jetty-6.name" value="RemoteJetty_6_1"/> + <param name="test.jetty-6.home" value="${JETTY_6_1_HOME}"/> + <param name="test.jetty-6.home.variable-name" value="JETTY_6_1_HOME"/> + <param name="test.archive.path" value="jetty-6.1-container-servlet/test-request-server.war"/> + </antcall> --> + </target> + <target name="tests.tomcat-6.0"> - <!-- spi tests --> - <antcall target="tests.tomcat-6.0.spi"> <param name="test.tomcat-6.0.name" value="RemoteTomcat_6_0"/> <param name="test.tomcat-6.0.home" value="${TOMCAT_6_0_HOME}"/> @@ -637,6 +984,8 @@ <target name="tests.remote"> + <echo message="test.temp.lib : ${test.temp.lib}"/> + <echo message="test.remote.archive.path : ${test.remote.archive.path}"/> <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/> Added: modules/web/trunk/web/src/test/resources/config/jetty/jetty.xml =================================================================== --- modules/web/trunk/web/src/test/resources/config/jetty/jetty.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/config/jetty/jetty.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,195 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> + +<!-- =============================================================== --> +<!-- Configure the Jetty Server --> +<!-- --> +<!-- Documentation of this file format can be found at: --> +<!-- http://docs.codehaus.org/display/JETTY/jetty.xml --> +<!-- --> +<!-- =============================================================== --> + +<Configure id="Server" class="org.mortbay.jetty.Server"> + + <!-- =========================================================== --> + <!-- Server Thread Pool --> + <!-- =========================================================== --> + <Set name="ThreadPool"> + <!-- Default bounded blocking threadpool + --> + <New class="org.mortbay.thread.BoundedThreadPool"> + <Set name="minThreads">10</Set> + <Set name="lowThreads">50</Set> + <Set name="maxThreads">250</Set> + </New> + + <!-- Optional Java 5 bounded threadpool with job queue + <New class="org.mortbay.thread.concurrent.ThreadPool"> + <Arg type="int">0</Arg> + <Set name="corePoolSize">10</Set> + <Set name="maximumPoolSize">250</Set> + </New> + --> + </Set> + + <!-- =========================================================== --> + <!-- Set connectors --> + <!-- =========================================================== --> + <!-- One of each type! --> + <!-- =========================================================== --> + + <!-- Use this connector for many frequently idle connections + and for threadless continuations. + --> + <Call name="addConnector"> + <Arg> + <New class="org.mortbay.jetty.nio.SelectChannelConnector"> + <Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set> + <Set name="maxIdleTime">30000</Set> + <Set name="Acceptors">2</Set> + <Set name="confidentialPort">8443</Set> + </New> + </Arg> + </Call> + + <!-- Use this connector if NIO is not available. + <Call name="addConnector"> + <Arg> + <New class="org.mortbay.jetty.bio.SocketConnector"> + <Set name="port">8081</Set> + <Set name="maxIdleTime">50000</Set> + <Set name="lowResourceMaxIdleTime">1500</Set> + </New> + </Arg> + </Call> + --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- To add a HTTPS SSL listener --> + <!-- see jetty-ssl.xml to add an ssl connector. use --> + <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <!-- =========================================================== --> + <!-- Set up global session ID manager --> + <!-- =========================================================== --> + <!-- + <Set name="sessionIdManager"> + <New class="org.mortbay.jetty.servlet.HashSessionIdManager"> + <Set name="workerName">node1</Set> + </New> + </Set> + --> + + <!-- =========================================================== --> + <!-- Set handler Collection Structure --> + <!-- =========================================================== --> + <Set name="handler"> + <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection"> + <Set name="handlers"> + <Array type="org.mortbay.jetty.Handler"> + <Item> + <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/> + </Item> + <Item> + <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/> + </Item> + <Item> + <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/> + </Item> + </Array> + </Set> + </New> + </Set> + + <!-- =========================================================== --> + <!-- Configure the context deployer --> + <!-- A context deployer will deploy contexts described in --> + <!-- configuration files discovered in a directory. --> + <!-- The configuration directory can be scanned for hot --> + <!-- deployments at the configured scanInterval. --> + <!-- --> + <!-- This deployer is configured to deploy contexts configured --> + <!-- in the $JETTY_HOME/contexts directory --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.ContextDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="configurationDir"><SystemProperty name="config.home" default="."/>/contexts</Set> + <Set name="scanInterval">1</Set> + </New> + </Arg> + </Call> + + <!-- =========================================================== --> + <!-- Configure the webapp deployer. --> + <!-- A webapp deployer will deploy standard webapps discovered --> + <!-- in a directory at startup, without the need for additional --> + <!-- configuration files. It does not support hot deploy or --> + <!-- non standard contexts (see ContextDeployer above). --> + <!-- --> + <!-- This deployer is configured to deploy webapps from the --> + <!-- $JETTY_HOME/webapps directory --> + <!-- --> + <!-- Normally only one type of deployer need be used. --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.WebAppDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="webAppDir"><SystemProperty name="config.home" default="."/>/webapps</Set> + <Set name="parentLoaderPriority">false</Set> + <Set name="extract">true</Set> + <Set name="allowDuplicates">false</Set> + <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set> + </New> + </Arg> + </Call> + + <!-- =========================================================== --> + <!-- Configure Authentication Realms --> + <!-- Realms may be configured for the entire server here, or --> + <!-- they can be configured for a specific web app in a context --> + <!-- configuration (see $(jetty.home)/contexts/test.xml for an --> + <!-- example). --> + <!-- =========================================================== --> + <Set name="UserRealms"> + <Array type="org.mortbay.jetty.security.UserRealm"> + <Item> + <New class="org.mortbay.jetty.security.HashUserRealm"> + <Set name="name">Test Realm</Set> + <Set name="config"><SystemProperty name="config.home" default="."/>/etc/realm.properties</Set> + </New> + </Item> + </Array> + </Set> + + <!-- =========================================================== --> + <!-- Configure Request Log --> + <!-- Request logs may be configured for the entire server here, --> + <!-- or they can be configured for a specific web app in a --> + <!-- contexts configuration (see $(jetty.home)/contexts/test.xml --> + <!-- for an example). --> + <!-- =========================================================== --> + <Ref id="RequestLog"> + <Set name="requestLog"> + <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog"> + <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Arg> + <Set name="retainDays">90</Set> + <Set name="append">true</Set> + <Set name="extended">false</Set> + <Set name="LogTimeZone">GMT</Set> + </New> + </Set> + </Ref> + + <!-- =========================================================== --> + <!-- extra options --> + <!-- =========================================================== --> + <Set name="stopAtShutdown">true</Set> + <!-- ensure/prevent Server: header being sent to browsers --> + <Set name="sendServerVersion">true</Set> + +</Configure> Added: modules/web/trunk/web/src/test/resources/config/jetty/realm.properties =================================================================== --- modules/web/trunk/web/src/test/resources/config/jetty/realm.properties (rev 0) +++ modules/web/trunk/web/src/test/resources/config/jetty/realm.properties 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,23 @@ +# +# This file defines users passwords and roles for a HashUserRealm +# +# The format is +# <username>: <password>[,<rolename> ...] +# +# Passwords may be clear text, obfuscated or checksummed. The class +# org.mortbay.util.Password should be used to generate obfuscated +# passwords or password checksums +# +# If DIGEST Authentication is used, the password must be in a recoverable +# format, either plain text or OBF:. +# +jetty: MD5:164c88b302622e17050af52c89945d44,user +admin: CRYPT:ad1ks..kc.1Ug,server-administrator,content-administrator,admin +other: OBF:1xmk1w261u9r1w1c1xmq +plain: plain +user: password + +admin: admin,manager + +# This entry is for digest auth. The credential is a MD5 hash of username:realmname:password +digest: MD5:6e120743ad67abfbc385bc2bb754e297 Modified: modules/web/trunk/web/src/test/resources/config/servers.xml =================================================================== --- modules/web/trunk/web/src/test/resources/config/servers.xml 2008-06-18 17:07:29 UTC (rev 11082) +++ modules/web/trunk/web/src/test/resources/config/servers.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -10,7 +10,7 @@ </service> <deployer> <remote> - <name>tomcat5x</name> + <name>tomcat6x</name> <host>localhost</host> <port>8080</port> </remote> @@ -22,6 +22,28 @@ </node> </server> <server> + <server-name>RemoteJetty_6_1</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>jetty6x</name> + <host>localhost</host> + <port>8080</port> + </remote> + <authentication> + <username>admin</username> + <password>admin</password> + </authentication> + </deployer> + </node> + </server> + <server> <server-name>RemoteJBoss_4_2_0</server-name> <node> <node-id>default</node-id> @@ -75,4 +97,22 @@ </deployer> </node> </server> + <server> + <server-name>RemoteJBoss_5_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>jboss5x</name> + <host>localhost</host> + <port>8080</port> + </remote> + </deployer> + </node> + </server> </servers> Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/META-INF/context.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/META-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/META-INF/context.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/log4j.properties 2008-06-18 18:23:17 UTC (rev 11083) @@ -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: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/logging.properties =================================================================== --- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/logging.properties 2008-06-18 18:23:17 UTC (rev 11083) @@ -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: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/context.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/context.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,2 @@ +<Context privileged="true"> <!-- crossContext="true" --> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/jboss-web.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/jboss-web.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/jboss-web.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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 jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,54 @@ +<?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/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.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> +</web-app> Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/META-INF/context.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/META-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/META-INF/context.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/jboss-web.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/jboss-web.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/jboss-web.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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 jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -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/jboss/portal/test/web/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.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>BootstrapServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.generic.PortletContainerBootstrapServlet</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>BootstrapServlet</servlet-name> + <url-pattern>/jbossportlet</url-pattern> + </servlet-mapping> +</web-app> Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/META-INF/context.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/META-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/META-INF/context.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/log4j.properties 2008-06-18 18:23:17 UTC (rev 11083) @@ -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: modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/logging.properties =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/logging.properties 2008-06-18 18:23:17 UTC (rev 11083) @@ -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: modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/jetty-web.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/jetty-web.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/jetty-web.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> +<Configure class="org.mortbay.jetty.webapp.WebAppContext"> + + <Set name="Handler"> + <New id="Jetty6Handler" class="org.jboss.portal.web.impl.jetty.Jetty6Handler"> + </New> + </Set> +</Configure> + + Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/web.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,54 @@ +<?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/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.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.jetty.Jetty6ContainerServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>SPITestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>SPITestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> +</web-app> Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/META-INF/context.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/META-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/META-INF/context.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/log4j.properties 2008-06-18 18:23:17 UTC (rev 11083) @@ -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: modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/logging.properties =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/logging.properties 2008-06-18 18:23:17 UTC (rev 11083) @@ -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: modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml 2008-06-18 18:23:17 UTC (rev 11083) @@ -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/jboss/portal/test/web/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.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>BootstrapServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.generic.PortletContainerBootstrapServlet</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>BootstrapServlet</servlet-name> + <url-pattern>/jbossportlet</url-pattern> + </servlet-mapping> +</web-app>