Author: julien(a)jboss.com Date: 2007-09-16 09:44:20 -0400 (Sun, 16 Sep 2007) New Revision: 8295 Added: modules/web/trunk/web/src/resources/test/spi/generic/ modules/web/trunk/web/src/resources/test/spi/generic/app-war/ modules/web/trunk/web/src/resources/test/spi/generic/app-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/generic/app-war/WEB-INF/web.xml modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/WEB-INF/web.xml modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/META-INF/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/META-INF/context.xml modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/log4j.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/logging.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/web.xml Modified: modules/web/trunk/web/build.xml modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/GenericServletContainerContext.java modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/PortletContainerBootstrapServlet.java modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml Log: - added testing of generic integration with jboss 4.2 and tomcat 6.0 Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-15 23:44:37 UTC (rev 8294) +++ modules/web/trunk/web/build.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -195,6 +195,10 @@ <fileset dir="${build.resources}/portal-web-test-jar"/> </jar> + <!-- **************************** --> + <!-- Tomcat 6.0 container servlet --> + <!-- **************************** --> + <!-- --> <copy todir="${build.resources}/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> @@ -214,6 +218,63 @@ </jar> <!-- --> + <jar jarfile="${build.lib}/tomcat-6.0-container-servlet/test-spi-app.war"> + <fileset dir="${build.resources}/test/spi/app-war"/> + </jar> + + <!-- **************************** --> + <!-- Tomcat 6.0 lifecyle listener --> + <!-- **************************** --> + + <!-- --> + <copy todir="${build.resources}/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/lib"> + <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-mc-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar,portal-test-generic-lib.jar"/> + </copy> + <mkdir dir="${build.lib}/tomcat-6.0-lifecycle-listener"/> + <jar jarfile="${build.lib}/tomcat-6.0-lifecycle-listener/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/tomcat-6.0-lifecycle-listener/server-war"/> + </jar> + + <!-- --> + <jar jarfile="${build.lib}/tomcat-6.0-container-servlet/test-spi-app.war"> + <fileset dir="${build.resources}/test/spi/app-war"/> + </jar> + + <!-- ****************** --> + <!-- Tomcat 6.0 generic --> + <!-- ****************** --> + + <!-- --> + <mkdir dir="${build.resources}/test/spi/tomcat-6.0-generic/server-war/WEB-INF/lib"/> + <copy todir="${build.resources}/test/spi/tomcat-6.0-generic/server-war/WEB-INF/lib"> + <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-mc-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar,portal-test-generic-lib.jar"/> + <fileset dir="${jboss.microcontainer.lib}" includes="jboss-container.jar,jboss-dependency.jar,jboss-microcontainer.jar"/> + <fileset dir="${jboss.common.lib}" includes="jboss-common.jar"/> + <fileset dir="${oswego.concurrent.lib}" includes="concurrent.jar"/> + <fileset dir="${jboss.remoting.lib}" includes="jboss-remoting.jar"/> + <fileset dir="${jboss.jbossxb.lib}" includes="jboss-xml-binding.jar"/> + <fileset dir="${apache.log4j.lib}" includes="log4j.jar"/> + <fileset dir="${apache.xerces.lib}" includes="xercesImpl.jar"/> + </copy> + <mkdir dir="${build.lib}/tomcat-6.0-generic"/> + <jar jarfile="${build.lib}/tomcat-6.0-generic/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/tomcat-6.0-generic/server-war"/> + </jar> + + <!-- --> + <jar jarfile="${build.lib}/tomcat-6.0-generic/test-spi-app.war"> + <fileset dir="${build.resources}/test/spi/generic/app-war"/> + </jar> + + <!-- *************************** --> + <!-- JBoss 4.2 container servlet --> + <!-- *************************** --> + + <!-- --> <copy todir="${build.resources}/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-mc-lib.jar"/> @@ -225,19 +286,28 @@ </jar> <!-- --> - <copy todir="${build.resources}/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/lib"> + <jar jarfile="${build.lib}/jboss-4.2-container-servlet/test-spi-app.war"> + <fileset dir="${build.resources}/test/spi/app-war"/> + </jar> + + <!-- ***************** --> + <!-- JBoss 4.2 generic --> + <!-- ***************** --> + + <!-- --> + <copy todir="${build.resources}/test/spi/jboss-4.2-generic/server-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> - <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-mc-lib.jar"/> - <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar,portal-test-generic-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-mc-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> </copy> - <mkdir dir="${build.lib}/tomcat-6.0-lifecycle-listener"/> - <jar jarfile="${build.lib}/tomcat-6.0-lifecycle-listener/test-spi-server.war"> - <fileset dir="${build.resources}/test/spi/tomcat-6.0-lifecycle-listener/server-war"/> + <mkdir dir="${build.lib}/jboss-4.2-generic"/> + <jar jarfile="${build.lib}/jboss-4.2-generic/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/jboss-4.2-generic/server-war"/> </jar> <!-- --> - <jar jarfile="${build.lib}/test-spi-app.war"> - <fileset dir="${build.resources}/test/spi/app-war"/> + <jar jarfile="${build.lib}/jboss-4.2-generic/test-spi-app.war"> + <fileset dir="${build.resources}/test/spi/generic/app-war"/> </jar> </target> @@ -275,7 +345,7 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> - <deployable type="war" file="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> + <deployable type="war" file="${test.spi.server.path}"/> </configuration> </cargo> </target> @@ -311,8 +381,11 @@ <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=y,address=8000"/>--> + <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/> - <deployable type="war" file="${build.lib}/tomcat-6.0-container-servlet/test-spi-server.war"/> + <deployable type="war" file="${test.spi.server.path}"/> </configuration> </cargo> </target> @@ -328,36 +401,84 @@ </cargo> </target> + <target name="tests" depends="init"> + <antcall target="tests.local"/> + <antcall target="tests.jboss.container-servlet"/> + <antcall target="tests.jboss.generic"/> + <antcall target="tests.tomcat.container-servlet"/> + <antcall target="tests.tomcat.generic"/> + </target> + <target name="tests.jboss" depends="init"> + <antcall target="tests.jboss.container-servlet"/> + </target> + + <target name="tests.jboss.container-servlet" depends="init"> <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> <antcall target="cargo.jboss.start"> <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteJBoss_4_2"/> + <param name="test.server.name" value="RemoteJBoss_4_2"/> + <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-container-servlet"/> + <param name="test.type" value="container-servlet"/> </antcall> <antcall target="cargo.jboss.stop"> </antcall> </target> + <target name="tests.jboss.generic" depends="init"> + <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> + <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> + <antcall target="cargo.jboss.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-generic/test-spi-server.war"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="RemoteJBoss_4_2"/> + <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-generic"/> + <param name="test.type" value="generic"/> + </antcall> + <antcall target="cargo.jboss.stop"> + </antcall> + </target> + <target name="tests.tomcat" depends="init"> + <antcall target="tests.tomcat.container-servlet"/> + </target> + + <target name="tests.tomcat.container-servlet" depends="init"> <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> <antcall target="cargo.tomcat.start"> <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/tomcat-6.0-container-servlet/test-spi-server.war"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteTomcat_6_0"/> + <param name="test.server.name" value="RemoteTomcat_6_0"/> + <param name="test.deploy.dir" value="${build.lib}/tomcat-6.0-container-servlet"/> + <param name="test.type" value="container-servlet"/> </antcall> <antcall target="cargo.tomcat.stop"> </antcall> </target> - <target name="tests" depends="init"> - <antcall target="tests.local"/> - <antcall target="tests.jboss"/> - <antcall target="tests.tomcat"/> + <target name="tests.tomcat.generic" depends="init"> + <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> + <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> + <antcall target="cargo.tomcat.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/tomcat-6.0-generic/test-spi-server.war"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="RemoteTomcat_6_0"/> + <param name="test.deploy.dir" value="${build.lib}/tomcat-6.0-generic"/> + <param name="test.type" value="generic"/> + </antcall> + <antcall target="cargo.tomcat.stop"> + </antcall> </target> <target name="tests.local" depends="init"> @@ -405,13 +526,13 @@ <zest todir="${test.reports}" name="org.jboss.portal.test.web.spi.SPITestCase" - outfile="TEST-${server.name}.org.jboss.portal.test.web.spi.SPITestCase" - id="org.jboss.portal.test.web.spi.SPITestCase,serverName=${server.name}"> - <parameter name="serverName" value="${server.name}"/> + outfile="TEST-${test.server.name}-${test.type}.org.jboss.portal.test.web.spi.SPITestCase" + id="org.jboss.portal.test.web.spi.SPITestCase,serverName=${test.server.name},type=${test.type}"> + <parameter name="serverName" value="${test.server.name}"/> </zest> </x-test> <x-sysproperty> - <sysproperty key="test.root" value="${build.lib}"/> + <sysproperty key="test.root" value="${test.deploy.dir}"/> <!-- <jvmarg value="-Xdebug"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> @@ -420,7 +541,10 @@ <x-classpath> <pathelement location="${build.lib}/portal-web-lib.jar"/> <pathelement location="${build.lib}/portal-web-test-lib.jar"/> + + <!-- The server config --> <pathelement location="${build.resources}/test/config"/> + <path refid="oswego.concurrent.classpath"/> <path refid="jboss.remoting.classpath"/> @@ -433,9 +557,6 @@ <path refid="apache.httpclient.classpath"/> <path refid="apache.logging.classpath"/> <path refid="apache.codec.classpath"/> - <pathelement location="${build.resources}/test"/> - <pathelement location="${source.java}"/> - <pathelement location="${jboss.portal-portlet.root}/classes"/> <pathelement location="${jboss.portal/modules/test.lib}/portal-test-generic-lib.jar"/> <path refid="codehaus.cargo.classpath"/> <path refid="library.classpath"/> Modified: modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/GenericServletContainerContext.java =================================================================== --- modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/GenericServletContainerContext.java 2007-09-15 23:44:37 UTC (rev 8294) +++ modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/GenericServletContainerContext.java 2007-09-16 13:44:20 UTC (rev 8295) @@ -41,7 +41,7 @@ { /** . */ - private static final GenericServletContainerContext instance = new GenericServletContainerContext(); + static final GenericServletContainerContext instance = new GenericServletContainerContext(); /** . */ private Registration registration; @@ -51,19 +51,19 @@ DefaultServletContainerFactory.registerContext(instance); } - static void register(GenericWebAppContext webAppContext) + void register(GenericWebAppContext webAppContext) { - if (instance.registration != null) + if (registration != null) { - instance.registration.registerWebApp(webAppContext); + registration.registerWebApp(webAppContext); } } - static void unregister(String webAppId) + void unregister(String webAppId) { - if (instance.registration != null) + if (registration != null) { - instance.registration.unregisterWebApp(webAppId); + registration.unregisterWebApp(webAppId); } } Modified: modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/PortletContainerBootstrapServlet.java =================================================================== --- modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/PortletContainerBootstrapServlet.java 2007-09-15 23:44:37 UTC (rev 8294) +++ modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/PortletContainerBootstrapServlet.java 2007-09-16 13:44:20 UTC (rev 8295) @@ -51,7 +51,7 @@ GenericWebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader); // - GenericServletContainerContext.register(webAppContext); + GenericServletContainerContext.instance.register(webAppContext); this.contextPath = contextPath; } catch (Exception e) @@ -64,7 +64,7 @@ { if (contextPath != null) { - GenericServletContainerContext.unregister(contextPath); + GenericServletContainerContext.instance.unregister(contextPath); } } } Added: modules/web/trunk/web/src/resources/test/spi/generic/app-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/generic/app-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/generic/app-war/WEB-INF/web.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -0,0 +1,38 @@ +<?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> + <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>BootstrapServlet</servlet-name> + <url-pattern>/jbossportlet</url-pattern> + </servlet-mapping> +</web-app> Modified: modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml 2007-09-15 23:44:37 UTC (rev 8294) +++ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -1,2 +1,2 @@ -<Context privileged="true" crossContext="true"> +<Context privileged="true"> <!-- crossContext="true" --> </Context> \ No newline at end of file Added: modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/WEB-INF/web.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -0,0 +1,49 @@ +<?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/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>SPITestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.spi.SPITestServlet</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/resources/test/spi/tomcat-6.0-generic/server-war/META-INF/context.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/META-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/META-INF/context.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/log4j.properties 2007-09-16 13:44:20 UTC (rev 8295) @@ -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/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/logging.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/logging.properties 2007-09-16 13:44:20 UTC (rev 8295) @@ -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/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/web.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -0,0 +1,49 @@ +<?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/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>SPITestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.spi.SPITestServlet</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>