Author: julien(a)jboss.com Date: 2007-09-15 19:44:37 -0400 (Sat, 15 Sep 2007) New Revision: 8294 Added: modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/ 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/web.xml modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/META-INF/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/META-INF/context.xml modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/log4j.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/logging.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/log4j.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/logging.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/web.xml Removed: modules/web/trunk/web/src/resources/test/spi/jboss-container-servlet-4.2/ modules/web/trunk/web/src/resources/test/spi/tomcat-container-servlet-6.0/ modules/web/trunk/web/src/resources/test/spi/tomcat-lifecycle-listener-6.0/ Modified: modules/web/trunk/web/build.xml Log: rename top directories containing the war files to test Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-15 23:30:10 UTC (rev 8293) +++ modules/web/trunk/web/build.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -196,7 +196,7 @@ </jar> <!-- --> - <copy todir="${build.resources}/test/spi/tomcat-container-servlet-6.0/server-war/WEB-INF/lib"> + <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"/> <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"/> @@ -208,31 +208,31 @@ <fileset dir="${apache.log4j.lib}" includes="log4j.jar"/> <fileset dir="${apache.xerces.lib}" includes="xercesImpl.jar"/> </copy> - <mkdir dir="${build.lib}/tomcat-container-servlet-6.0"/> - <jar jarfile="${build.lib}/tomcat-container-servlet-6.0/test-spi-server.war"> - <fileset dir="${build.resources}/test/spi/tomcat-container-servlet-6.0/server-war"/> + <mkdir dir="${build.lib}/tomcat-6.0-container-servlet"/> + <jar jarfile="${build.lib}/tomcat-6.0-container-servlet/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/tomcat-6.0-container-servlet/server-war"/> </jar> <!-- --> - <copy todir="${build.resources}/test/spi/jboss-container-servlet-4.2/server-war/WEB-INF/lib"> + <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"/> <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> </copy> - <mkdir dir="${build.lib}/jboss-container-servlet-4.2"/> - <jar jarfile="${build.lib}/jboss-container-servlet-4.2/test-spi-server.war"> - <fileset dir="${build.resources}/test/spi/jboss-container-servlet-4.2/server-war"/> + <mkdir dir="${build.lib}/jboss-4.2-container-servlet"/> + <jar jarfile="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/jboss-4.2-container-servlet/server-war"/> </jar> <!-- --> - <copy todir="${build.resources}/test/spi/tomcat-lifecycle-listener-6.0/server-war/WEB-INF/lib"> + <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-lifecycle-listener-6.0"/> - <jar jarfile="${build.lib}/tomcat-lifecycle-listener-6.0/test-spi-server.war"> - <fileset dir="${build.resources}/test/spi/tomcat-lifecycle-listener-6.0/server-war"/> + <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> <!-- --> @@ -275,7 +275,7 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> - <deployable type="war" file="${build.lib}/jboss-container-servlet-4.2/test-spi-server.war"/> + <deployable type="war" file="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> </configuration> </cargo> </target> @@ -312,7 +312,7 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/> - <deployable type="war" file="${build.lib}/tomcat-container-servlet-6.0/test-spi-server.war"/> + <deployable type="war" file="${build.lib}/tomcat-6.0-container-servlet/test-spi-server.war"/> </configuration> </cargo> </target> Added: 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 (rev 0) +++ 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) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -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/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>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>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-container-servlet/server-war/META-INF/context.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/META-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/META-INF/context.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/log4j.properties 2007-09-15 23:44:37 UTC (rev 8294) @@ -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-container-servlet/server-war/WEB-INF/classes/logging.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/logging.properties 2007-09-15 23:44:37 UTC (rev 8294) @@ -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-container-servlet/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -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/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>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>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-lifecycle-listener/server-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/log4j.properties 2007-09-15 23:44:37 UTC (rev 8294) @@ -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-lifecycle-listener/server-war/WEB-INF/classes/logging.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/logging.properties 2007-09-15 23:44:37 UTC (rev 8294) @@ -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-lifecycle-listener/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/web.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -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>