Author: mwringe Date: 2008-08-20 11:04:41 -0400 (Wed, 20 Aug 2008) New Revision: 11719 Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/META-INF/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/META-INF/context.xml modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/classes/ modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/classes/log4j.properties modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/classes/logging.properties modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/jetty-web.xml modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/web.xml Log: Add missing files from last commit. Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/META-INF/context.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/META-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/META-INF/context.xml 2008-08-20 15:04:41 UTC (rev 11719) @@ -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-handler/server-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/classes/log4j.properties 2008-08-20 15:04:41 UTC (rev 11719) @@ -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-handler/server-war/WEB-INF/classes/logging.properties =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/classes/logging.properties 2008-08-20 15:04:41 UTC (rev 11719) @@ -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-handler/server-war/WEB-INF/jetty-web.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/jetty-web.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/jetty-web.xml 2008-08-20 15:04:41 UTC (rev 11719) @@ -0,0 +1,22 @@ +<?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="jettySetup" class="org.jboss.portal.web.impl.jetty.Jetty6Handler"> + <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> --> + +</Configure> + + Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-handler/server-war/WEB-INF/web.xml 2008-08-20 15:04:41 UTC (rev 11719) @@ -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.Jetty6Handler</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>