Author: mwringe Date: 2008-06-27 16:15:44 -0400 (Fri, 27 Jun 2008) New Revision: 11176 Modified: modules/web/trunk/.classpath modules/web/trunk/build/pom.xml modules/web/trunk/web/src/test/build.xml modules/web/trunk/web/src/test/resources/spi/generic/app-war/WEB-INF/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/server-war/WEB-INF/web.xml modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/jetty-web.xml Log: Add JBoss AS 5 tests (currently tested against beta 4). Note: load-on-startup will have to be set at 1 until JBAS-5684 is fixed Modified: modules/web/trunk/.classpath =================================================================== --- modules/web/trunk/.classpath 2008-06-27 16:04:10 UTC (rev 11175) +++ modules/web/trunk/.classpath 2008-06-27 20:15:44 UTC (rev 11176) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="web/src/main/java"/> + <classpathentry kind="src" path="web/src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> <classpathentry kind="output" path="bin"/> Modified: modules/web/trunk/build/pom.xml =================================================================== --- modules/web/trunk/build/pom.xml 2008-06-27 16:04:10 UTC (rev 11175) +++ modules/web/trunk/build/pom.xml 2008-06-27 20:15:44 UTC (rev 11176) @@ -39,7 +39,7 @@ <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>1.0-alpha-3</version.cargo> + <version.cargo>1.0-alpha-4</version.cargo> <version.junit>3.8.1</version.junit> <version.ant>1.7.0</version.ant> </properties> Modified: modules/web/trunk/web/src/test/build.xml =================================================================== --- modules/web/trunk/web/src/test/build.xml 2008-06-27 16:04:10 UTC (rev 11175) +++ modules/web/trunk/web/src/test/build.xml 2008-06-27 20:15:44 UTC (rev 11176) @@ -20,8 +20,8 @@ </target> <target name="tests.call.all" unless="tests"> + <antcall target="tests.jboss5"/> <antcall target="tests.jboss"/> -<!-- <antcall target="tests.jboss5"/> --> <antcall target="tests.tomcat"/> <antcall target="tests.jetty"/> </target> @@ -34,9 +34,9 @@ <target name="tests.jboss"> <antcall target="tests.jboss-4.2"/> </target> -<!-- <target name="tests.jboss5"> + <target name="tests.jboss5"> <antcall target="tests.jboss-5.0"/> - </target> --> + </target> <target name="tests.tomcat"> <antcall target="tests.tomcat-6.0"/> </target> @@ -87,14 +87,14 @@ </not> </and> </condition> -<!-- <condition property="JBOSS_5_0_HOME" value="${env.JBOSS_5_0_HOME}"> + <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> <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}"> <and> <isset property="env.TOMCAT_6_0_HOME"/> @@ -128,7 +128,7 @@ </condition> </fail> -<!-- <fail message="Please set the environment variable JBOSS_5_0_HOME"> + <fail message="Please set the environment variable JBOSS_5_0_HOME"> <condition> <and> <not> @@ -136,7 +136,7 @@ </not> </and> </condition> - </fail> --> + </fail> <fail message="Please set the environment variable TOMCAT_6_0_HOME"> <condition> @@ -211,12 +211,17 @@ <path location="${target}/web-web-${project.version}.jar"/> </path> -<!-- <path id="jboss-5.0"> + <path id="jboss-5.0"> <path refid="portal-common"/> <path refid="jboss-unit"/> <path refid="jboss-microcontainer"/> - </path> --> + </path> + <path id="jboss-5.0-shared"> + <path refid="portal-common-shared"/> + <path location="${target}/web-web-${project.version}.jar"/> + </path> + <path id="tomcat-6.0"> <path refid="portal-common"/> <path refid="jboss-unit"/> @@ -386,43 +391,53 @@ <!-- 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"/> - --> + <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"> + <exclude name="**/jboss-kernel*.jar"/> + </fileset> + <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> <!-- ***************** --> <!-- 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"/> + <fileset dir="${test.support}/jboss-5.0-generic/server-war"> + <exclude name="**/jboss-kernel*.jar"/> + </fileset> <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"/> + <fileset dir="${target}/test-classes/spi/generic/app-war"> + <exclude name="**/jboss-kernel*.jar"/> + </fileset> </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> - --> + <!--endpoint test case--> + + <jar jarfile="${test.temp.lib}/portal-test-endpoint-lib.jar"> + <fileset dir="${target}/test-classes/"> + <include name="org/jboss/portal/test/web/endpoint/**"/> + <include name="org/jboss/portal/test/web/ServletTestCase.class"/> + <include name="org/jboss/portal/test/web/TestServlet.class"/> + <include name="org/jboss/portal/test/web/WebAppRegistry.class"/> + </fileset> + <fileset dir="${target}/test-classes/portal-test-endpoint-jar"/> + </jar> + <!-- ********** --> <!-- Tomcat 6.0 --> <!-- ********** --> @@ -508,9 +523,46 @@ <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/> </war> + <!-- ********* --> + <!-- JBoss 5.0 --> + <!-- ********* --> + + <mkdir dir="${test.temp.lib}/jboss-5.0"/> + + <copy todir="${test.support}/jboss-5.0-endpoint/default-servlet-mapping-war/WEB-INF/lib" flatten="true"> + <path refid="jboss-5.0"/> + </copy> + <war jarfile="${test.temp.lib}/jboss-5.0/default-servlet-mapping.war"> + <fileset dir="${test.support}/jboss-5.0-endpoint/default-servlet-mapping-war"> + <exclude name="**/jboss-kernel*.jar"/> + </fileset> + <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/> + </war> + + <copy todir="${test.support}/jboss-5.0-endpoint/path-mapping-war/WEB-INF/lib" flatten="true"> + <path refid="jboss-5.0"/> + </copy> + <war jarfile="${test.temp.lib}/jboss-5.0/path-mapping.war"> + <fileset dir="${test.support}/jboss-5.0-endpoint/path-mapping-war"> + <exclude name="**/jboss-kernel*.jar"/> + </fileset> + <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/> + </war> + + <copy todir="${test.support}/jboss-5.0-endpoint/root-path-mapping-war/WEB-INF/lib" flatten="true"> + <path refid="jboss-5.0"/> + </copy> + <war jarfile="${test.temp.lib}/jboss-5.0/root-path-mapping.war"> + <fileset dir="${test.support}/jboss-5.0-endpoint/root-path-mapping-war"> + <exclude name="**/jboss-kernel*.jar"/> + </fileset> + <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/> + </war> + <!--Strip cargo manager war filename--> <copy file="${dependency.cargo-manager.war}" tofile="${test.temp.lib}/manager.war"/> + </target> <target name="cargo.setup"> @@ -550,6 +602,7 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <deployable type="war" file="${cargo.war}"/> +<!-- <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8222"/> --> </configuration> </cargo> </target> @@ -653,8 +706,15 @@ <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"> + <!-- The lib portal-test-lib.jar must be loaded at the shared level rather than in the war file + otherwise it is somehow inspected and produce a NoClassDefFoundError in the web service integration + layer on the class org/jboss/portal/test/framework/driver/remote/RemoteTestDriver for some unknown + reason, the class initiating the loading of the RemoteTestDriver class is + org.jboss.ws.integration.jboss42.DeployerInterceptorJSE.isWebserviceDeployment(DeployerInterceptorJSE.java:84) + --> -<!-- <target name="cargo.jboss-5.0.start" depends="cargo.setup"> <cargo containerId="jboss5x" home="${test.jboss-5.0.home}" @@ -663,17 +723,16 @@ 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"/> + <path refid="jboss-5.0-shared"/> + </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}"/> + <deployable type="war" file="${cargo.war}"/> +<!-- <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8222"/> --> </configuration> </cargo> </target> @@ -690,11 +749,11 @@ </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}"/> + <target name="tests.jboss-5.0.execute" unless="tests.jboss-5.0.execute.skip"> + <echo message="Starting JBoss 5.0 ${test.jboss-5.0.name} with ${test.jboss-5.0.home} to execute ${test.id} tests"/> <antcall target="cargo.jboss-5.0.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.jboss-5.0.name}"/> @@ -704,43 +763,61 @@ </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}"/> + <target name="tests.jboss-5.0.spi"> + <condition property="tests.jboss-5.0.execute.skip"> + <not> + <available file="${test.jboss-5.0.home}" type="dir"/> + </not> + </condition> + <antcall target="tests.jboss-5.0.execute"> + <param name="test.id" value="${test.jboss-5.0.name}-spi-container-servlet"/> + <param name="test.war" value="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-server.war"/> + <param name="test.archive.path" value="jboss-5.0-container-servlet"/> </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 target="tests.jboss-5.0.execute"> + <param name="test.id" value="${test.jboss-5.0.name}-spi-generic"/> + <param name="test.war" value="${test.temp.lib}/jboss-5.0-generic/test-spi-server.war"/> + <param name="test.archive.path" value="jboss-5.0-generic"/> </antcall> - <antcall target="cargo.jboss-5.0.stop"> + </target> + + <target name="tests.jboss-5.0.endpoint"> + <condition property="tests.jboss-5.0.execute.skip"> + <not> + <available file="${test.jboss-5.0.home}" type="dir"/> + </not> + </condition> + <antcall target="tests.jboss-5.0.execute"> + <param name="test.id" value="${test.jboss-5.0.name}-endpoint-default-servlet-mapping"/> + <param name="test.war" value="${test.temp.lib}/jboss-5.0/default-servlet-mapping.war"/> + <param name="test.archive.path" value=""/> </antcall> + <antcall target="tests.jboss-5.0.execute"> + <param name="test.id" value="${test.jboss-5.0.name}-endpoint-path-mapping"/> + <param name="test.war" value="${test.temp.lib}/jboss-5.0/path-mapping.war"/> + <param name="test.archive.path" value=""/> + </antcall> + <antcall target="tests.jboss-5.0.execute"> + <param name="test.id" value="${test.jboss-5.0.name}-endpoint-root-path-mapping"/> + <param name="test.war" value="${test.temp.lib}/jboss-5.0/root-path-mapping.war"/> + <param name="test.archive.path" value=""/> + </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"/> + + <!-- spi tests --> + <antcall target="tests.jboss-5.0.spi"> <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"/> + + <!-- endpoint tests --> + <antcall target="tests.jboss-5.0.endpoint"> <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> <target name="cargo.tomcat-6.0.start" depends="cargo.setup"> Modified: modules/web/trunk/web/src/test/resources/spi/generic/app-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/test/resources/spi/generic/app-war/WEB-INF/web.xml 2008-06-27 16:04:10 UTC (rev 11175) +++ modules/web/trunk/web/src/test/resources/spi/generic/app-war/WEB-INF/web.xml 2008-06-27 20:15:44 UTC (rev 11176) @@ -29,7 +29,7 @@ <servlet> <servlet-name>BootstrapServlet</servlet-name> <servlet-class>org.jboss.portal.web.impl.generic.GenericBootstrapServlet</servlet-class> - <load-on-startup>0</load-on-startup> + <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> <servlet-name>BootstrapServlet</servlet-name> Modified: 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 2008-06-27 16:04:10 UTC (rev 11175) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml 2008-06-27 20:15:44 UTC (rev 11176) @@ -40,12 +40,12 @@ <servlet> <servlet-name>ContainerServlet</servlet-name> <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class> - <load-on-startup>0</load-on-startup> + <load-on-startup>1</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> + <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> <servlet-name>TestServlet</servlet-name> Modified: 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 2008-06-27 16:04:10 UTC (rev 11175) +++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml 2008-06-27 20:15:44 UTC (rev 11176) @@ -40,12 +40,12 @@ <servlet> <servlet-name>TestServlet</servlet-name> <servlet-class>org.jboss.portal.test.web.TestServlet</servlet-class> - <load-on-startup>0</load-on-startup> + <load-on-startup>1</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> + <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> <servlet-name>TestServlet</servlet-name> Modified: 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 2008-06-27 16:04:10 UTC (rev 11175) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/jetty-web.xml 2008-06-27 20:15:44 UTC (rev 11176) @@ -1,11 +1,23 @@ <?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"> + + <Get id="serverObject" name="server"/> + + <New id="deployerservlet" class="org.jboss.portal.web.impl.jetty.J6ContainerServlet"> + <Arg><Ref id="serverObject"/></Arg> + </New> + + <New id="servletholder" class="org.mortbay.jetty.servlet.ServletHolder"> + <Arg><Ref id="deployerservlet"/></Arg> + </New> + + <Call name="addServlet"> + <Arg><Ref id="servletholder"/></Arg> + <Arg>ContainerServlet</Arg> + </Call> + - <Set name="Handler"> - <New id="Jetty6Handler" class="org.jboss.portal.web.impl.jetty.Jetty6Handler"> - </New> - </Set> </Configure>