geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r447933 [1/4] - in /geronimo/sandbox/javaee5: ./ assemblies-jee5/ assemblies-jee5/geronimo-jetty6-jee5/ assemblies-jee5/geronimo-jetty6-jee5/src/ assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/ configs-jee5/ configs-jee5/jetty6-de...
Date Tue, 19 Sep 2006 19:17:15 GMT
Author: djencks
Date: Tue Sep 19 12:17:10 2006
New Revision: 447933

URL: http://svn.apache.org/viewvc?view=rev&rev=447933
Log:
Get closer to a working jetty6 integration.  I can get apps to deploy but not yet work.  Requires GERONIMO-2398, GERONIMO-2415, and maybe GERONIMO-2416

Added:
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/
      - copied from r447147, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/LICENSE.txt
      - copied unchanged from r447903, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/LICENSE.txt
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/NOTICE.txt
      - copied unchanged from r447903, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/NOTICE.txt
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
      - copied, changed from r447903, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/
      - copied from r447903, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/
    geronimo/sandbox/javaee5/configs-jee5/jetty6/
      - copied from r446966, geronimo/server/trunk/configs/jetty/
    geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/
      - copied from r446966, geronimo/server/trunk/configs/jetty-deployer/
    geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/LICENSE.txt
      - copied unchanged from r447903, geronimo/server/trunk/configs/jetty-deployer/LICENSE.txt
    geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/NOTICE.txt
      - copied unchanged from r447903, geronimo/server/trunk/configs/jetty-deployer/NOTICE.txt
    geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/pom.xml
      - copied, changed from r447903, geronimo/server/trunk/configs/jetty-deployer/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/
      - copied from r447903, geronimo/server/trunk/configs/jetty-deployer/src/
    geronimo/sandbox/javaee5/configs-jee5/jetty6/LICENSE.txt
      - copied unchanged from r447903, geronimo/server/trunk/configs/jetty/LICENSE.txt
    geronimo/sandbox/javaee5/configs-jee5/jetty6/NOTICE.txt
      - copied unchanged from r447903, geronimo/server/trunk/configs/jetty/NOTICE.txt
    geronimo/sandbox/javaee5/configs-jee5/jetty6/pom.xml
      - copied, changed from r447903, geronimo/server/trunk/configs/jetty/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/jetty6/src/
      - copied from r447903, geronimo/server/trunk/configs/jetty/src/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/
      - copied from r446966, geronimo/server/trunk/modules/geronimo-jetty-builder/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/LICENSE.txt
      - copied unchanged from r447903, geronimo/server/trunk/modules/geronimo-jetty-builder/LICENSE.txt
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/NOTICE.txt
      - copied unchanged from r447903, geronimo/server/trunk/modules/geronimo-jetty-builder/NOTICE.txt
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/pom.xml
      - copied, changed from r447903, geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/
      - copied from r447903, geronimo/server/trunk/modules/geronimo-jetty-builder/src/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter1.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter2.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet1.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet2.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/StartupOrderComparatorTest.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/
      - copied from r447147, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/Host.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/Host.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JAASJettyPrincipal.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JAASJettyPrincipal.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JAASJettyRealm.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JAASJettyRealm.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainer.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyContainer.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyContainerImpl.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyDefaultServletHolder.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyEJBWebServiceContext.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyEJBWebServiceContext.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyFilterHolder.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyFilterHolder.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyFilterMapping.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyFilterMapping.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyManagerImpl.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettySecureConnector.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettySecureConnector.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettySecurityHandler.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettySecurityHandler.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServer.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyServer.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyServletHolder.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletRegistration.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyServletRegistration.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyThreadPool.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyThreadPool.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyWebAppContext.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebConnector.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyWebConnector.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebContainerStats.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyWebContainerStats.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebContainerStatsImpl.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/JettyWebContainerStatsImpl.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/NonAuthenticator.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/NonAuthenticator.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/SessionHandlerFactory.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/SessionHandlerFactory.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/
      - copied from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/cluster/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/
      - copied from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/connector/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/interceptor/
      - copied from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/interceptor/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/
      - copied from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/requestlog/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/
      - copied from r447147, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty/ApplicationTest.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ClassLoaderTest.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ContainerTest.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty/ContainerTest.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/SecurityTest.java
      - copied, changed from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty/SecurityTest.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/app/
      - copied from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty/app/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/connector/
      - copied from r447903, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty/connector/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/pom.xml
      - copied, changed from r446966, geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/
      - copied from r446782, geronimo/sandbox/servlet-2.5/modules/web-builder/src/java/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/
      - copied from r447903, geronimo/sandbox/servlet-2.5/modules/web-builder/src/java/org/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/java/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/java/org/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/java/org/apache/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/
      - copied from r446782, geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/
      - copied from r447903, geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_2dtd/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/
      - copied from r447903, geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/
      - copied from r447903, geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_4schema/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/
      - copied from r447903, geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/
Removed:
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/DefaultSessionHandlerFactory.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfiguration.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfigurer.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/geronimo/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/ejb-1-11.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/ejb-1-21.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/DescriptionGroupTestExpected.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/DescriptionGroupTestSource.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestExpected.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestSource.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/application-13.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/application-14.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/application-client-13.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/application-client-14.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/ejb-jar-21.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/ejb-jar.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-20-GERONIMO-1649.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-20.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-21.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/ra-10.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/ra-15.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/tmp.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/application-14.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/ejb-jar.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/application-5.xml
Modified:
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/artifact_aliases.properties
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml
    geronimo/sandbox/javaee5/assemblies-jee5/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml
    geronimo/sandbox/javaee5/configs-jee5/jetty6/src/plan/plan.xml
    geronimo/sandbox/javaee5/configs-jee5/pom.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/resources/deployables/war4/WEB-INF/web.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/test/resources/services/local.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/pom.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredHandleInterceptor.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionHandler.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionHandlerFactory.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionManager.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/AJP13Connector.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/GeronimoSSLListener.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/HTTPConnector.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/HTTPSConnector.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/interceptor/BeforeAfter.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/interceptor/ComponentContextBeforeAfter.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/interceptor/InstanceContextBeforeAfter.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/interceptor/ThreadClassloaderBeforeAfter.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManager.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyRequestLog.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/NCSARequestLog.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/app/MockWebServiceContainer.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/connector/HTTPConnectorTest.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/resources/services/local.xml
    geronimo/sandbox/javaee5/modules-jee5/pom.xml
    geronimo/sandbox/javaee5/pom.xml

Copied: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml (from r447903, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml?view=diff&rev=447933&p1=geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml&r1=447903&p2=geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml&r2=447933
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml Tue Sep 19 12:17:10 2006
@@ -28,8 +28,8 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-jetty5-jee5</artifactId>
-    <name>Geronimo Assemblies :: JEE5 + Jetty5</name>
+    <artifactId>geronimo-jetty6-jee5</artifactId>
+    <name>Geronimo Assemblies :: JEE5 + Jetty6</name>
     <!--
     HACK: See build/resources below...
     <packaging>pom</packaging>
@@ -100,7 +100,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
+            <artifactId>jetty6</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
@@ -219,11 +219,11 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty-deployer</artifactId>
+            <artifactId>jetty6-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-
+<!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>welcome-jetty</artifactId>
@@ -252,7 +252,7 @@
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-
+-->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/artifact_aliases.properties?view=diff&rev=447933&r1=447903&r2=447933
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/artifact_aliases.properties (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/artifact_aliases.properties Tue Sep 19 12:17:10 2006
@@ -1 +1,3 @@
-org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction-jta11/1.2-SNAPSHOT/car
\ No newline at end of file
+org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction-jta11/1.2-SNAPSHOT/car
+org.apache.geronimo.configs/jetty//car=org.apache.geronimo.configs/jetty6/1.2-SNAPSHOT/car
+org.apache.geronimo.configs/jetty-deployer//car=org.apache.geronimo.configs/jetty6-deployer/1.2-SNAPSHOT/car

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=447933&r1=447903&r2=447933
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml Tue Sep 19 12:17:10 2006
@@ -77,7 +77,7 @@
     
     <module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>
     
-    <module name="org.apache.geronimo.configs/jetty/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/jetty6/${pom.version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -87,10 +87,11 @@
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
-        <gbean name="JettyAJP13Connector">
+<!--        <gbean name="JettyAJP13Connector">
             <attribute name="host">0.0.0.0</attribute>
             <attribute name="port">8009</attribute>
         </gbean>
+-->
     </module>
     
     <!--
@@ -131,8 +132,8 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/jetty-deployer/${pom.version}/car"/>
-    
+    <module name="org.apache.geronimo.configs/jetty6-deployer/${pom.version}/car"/>
+<!--    
     <module name="org.apache.geronimo.configs/welcome-jetty/${pom.version}/car"/>
     
     <module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>
@@ -140,7 +141,7 @@
     <module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car"/>
     
     <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
-    
+-->    
     <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
     
 </attributes>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/pom.xml?view=diff&rev=447933&r1=447932&r2=447933
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/pom.xml Tue Sep 19 12:17:10 2006
@@ -64,8 +64,9 @@
     <modules>
         <module>geronimo-boilerplate-jee5</module>
         <module>geronimo-jetty5-jee5</module>
+        <module>geronimo-jetty6-jee5</module>  
 <!--
-        <module>geronimo-jetty-minimal</module>
+        <module>geronimo-jetty6-minimal</module>
         <module>geronimo-tomcat-j2ee</module>
         <module>geronimo-tomcat-minimal</module>
 -->

Copied: geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/pom.xml (from r447903, geronimo/server/trunk/configs/jetty-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/pom.xml?view=diff&rev=447933&p1=geronimo/server/trunk/configs/jetty-deployer/pom.xml&r1=447903&p2=geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/pom.xml&r2=447933
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/pom.xml Tue Sep 19 12:17:10 2006
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <artifactId>configs-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>jetty-deployer</artifactId>
+    <artifactId>jetty6-deployer</artifactId>
     <name>Geronimo Configs :: Jetty Deployer</name>
     <packaging>car</packaging>
     
@@ -44,7 +44,7 @@
         <!-- similar thing not needed in tomcat !!! -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
+            <artifactId>jetty6</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
             <scope>compile</scope>
@@ -52,10 +52,21 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty-builder</artifactId>
+            <artifactId>geronimo-jetty6-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-2.5-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-jee_5</artifactId>
+        </dependency>
+
     </dependencies>
     
 </project>

Modified: geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml?view=diff&rev=447933&r1=447903&r2=447933
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml Tue Sep 19 12:17:10 2006
@@ -19,7 +19,7 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
-    <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
+    <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty6.deployment.JettyModuleBuilder">
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">?name=JettyWebContainer</attribute>
@@ -57,11 +57,11 @@
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>
-                    <dependency>
-                        <groupId>${pom.groupId}</groupId>
-                        <artifactId>j2ee-server</artifactId>
-                        <type>car</type>
-                    </dependency>
+                    <!--<dependency>-->
+                        <!--<groupId>${pom.groupId}</groupId>-->
+                        <!--<artifactId>j2ee-server</artifactId>-->
+                        <!--<type>car</type>-->
+                    <!--</dependency>-->
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>jetty</artifactId>
@@ -84,9 +84,9 @@
         </xml-attribute>
     </gbean>
 
-    <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyDefaultServletHolder">
+    <gbean name="StaticContent" class="org.apache.geronimo.jetty6.JettyDefaultServletHolder">
         <attribute name="servletName">default</attribute>
-        <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
+        <attribute name="servletClass">org.mortbay.jetty.servlet.DefaultServlet</attribute>
         <attribute name="loadOnStartup">0</attribute>
         <attribute name="initParams">
             acceptRanges=true
@@ -99,7 +99,7 @@
         <attribute name="servletMappings">/</attribute>
     </gbean>
 
-    <gbean name="JSPServlet" class="org.apache.geronimo.jetty.JettyDefaultServletHolder">
+    <gbean name="JSPServlet" class="org.apache.geronimo.jetty6.JettyDefaultServletHolder">
         <attribute name="servletName">jsp</attribute>
         <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
         <attribute name="loadOnStartup">0</attribute>
@@ -112,7 +112,7 @@
         <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
     </gbean>
 
-    <gbean name="POJOTemplate" class="org.apache.geronimo.jetty.JettyPOJOWebServiceHolder">
+    <gbean name="POJOTemplate" class="org.apache.geronimo.jetty6.JettyPOJOWebServiceHolder">
         <attribute name="servletName">dummy</attribute>
     </gbean>
 

Copied: geronimo/sandbox/javaee5/configs-jee5/jetty6/pom.xml (from r447903, geronimo/server/trunk/configs/jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/jetty6/pom.xml?view=diff&rev=447933&p1=geronimo/server/trunk/configs/jetty/pom.xml&r1=447903&p2=geronimo/sandbox/javaee5/configs-jee5/jetty6/pom.xml&r2=447933
==============================================================================
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/jetty6/pom.xml Tue Sep 19 12:17:10 2006
@@ -23,43 +23,51 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <artifactId>configs-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>jetty</artifactId>
-    <name>Geronimo Configs :: Jetty</name>
+    <artifactId>jetty6</artifactId>
+    <name>Geronimo Configs :: Jetty 6</name>
     <packaging>car</packaging>
     
     <dependencies>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction-jta11</artifactId>
             <version>${pom.version}</version>
+            <type>car</type>
         </dependency>
 
         <!-- This dependency should be retrieved by transitivity -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering</artifactId>
+            <artifactId>geronimo-jetty6</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
+            <artifactId>geronimo-clustering</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
     </dependencies>
     
 </project>

Modified: geronimo/sandbox/javaee5/configs-jee5/jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/jetty6/src/plan/plan.xml?view=diff&rev=447933&r1=447903&r2=447933
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/jetty6/src/plan/plan.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/jetty6/src/plan/plan.xml Tue Sep 19 12:17:10 2006
@@ -23,9 +23,9 @@
          plan and thinks they might belong in the console plan.  Aaron thinks
          they definitely don't belong in the console plan, but could go into
          a management layer plan. -->
-    <gbean name="JettyWebManager" class="org.apache.geronimo.jetty.JettyManagerImpl"/>
+    <gbean name="JettyWebManager" class="org.apache.geronimo.jetty6.JettyManagerImpl"/>
 
-    <gbean name="JettyAccessLogManager" class="org.apache.geronimo.jetty.requestlog.JettyLogManagerImpl">
+    <gbean name="JettyAccessLogManager" class="org.apache.geronimo.jetty6.requestlog.JettyLogManagerImpl">
         <references name="LogGBeans">
             <pattern>
                 <!-- This is lame and should be replaced by an interface reference -->
@@ -39,13 +39,13 @@
 
 
     <!-- default WAR container using Jetty -->
-    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
+    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty6.JettyContainerImpl">
       <reference name="WebManager">
         <name>JettyWebManager</name>
       </reference>
     </gbean>
 
-    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
+    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
         <reference name="JettyContainer">
             <name>JettyWebContainer</name>
         </reference>
@@ -57,30 +57,30 @@
         <attribute name="logTimeZone">GMT</attribute>
     </gbean>
 
-    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
+    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty6.connector.HTTPConnector">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPPort}</attribute>
         <reference name="JettyContainer">
             <name>JettyWebContainer</name>
         </reference>
-        <attribute name="maxThreads">150</attribute>
-        <attribute name="minThreads">25</attribute>
-        <attribute name="lowThreads">25</attribute>
-        <attribute name="maxIdleTimeMs">30000</attribute>
-        <attribute name="lowThreadsMaxIdleTimeMs">800</attribute>
-    </gbean>
-
-    <gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty.connector.AJP13Connector">
-        <attribute name="host">${PlanServerHostname}</attribute>
-        <attribute name="port">${PlanAJPPort2}</attribute>
-        <reference name="JettyContainer">
-            <name>JettyWebContainer</name>
-        </reference>
         <attribute name="maxThreads">50</attribute>
-        <attribute name="minThreads">10</attribute>
+        <!--<attribute name="minThreads">25</attribute>-->
+        <!--<attribute name="lowThreads">25</attribute>-->
+        <!--<attribute name="maxIdleTimeMs">30000</attribute>-->
+        <!--<attribute name="lowThreadsMaxIdleTimeMs">800</attribute>-->
     </gbean>
 
-    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
+    <!--<gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty.connector.AJP13Connector">-->
+        <!--<attribute name="host">${PlanServerHostname}</attribute>-->
+        <!--<attribute name="port">${PlanAJPPort2}</attribute>-->
+        <!--<reference name="JettyContainer">-->
+            <!--<name>JettyWebContainer</name>-->
+        <!--</reference>-->
+        <!--<attribute name="maxThreads">50</attribute>-->
+        <!--<attribute name="minThreads">10</attribute>-->
+    <!--</gbean>-->
+
+    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty6.connector.HTTPSConnector">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPSPort}</attribute>
         <attribute name="keyStore">geronimo-default</attribute>
@@ -89,8 +89,8 @@
         <attribute name="clientAuthRequired">false</attribute>
         <attribute name="algorithm">Default</attribute>
         <attribute name="secureProtocol">TLS</attribute>
-        <attribute name="maxThreads">150</attribute>
-        <attribute name="minThreads">25</attribute>
+        <attribute name="maxThreads">50</attribute>
+        <!--<attribute name="minThreads">25</attribute>-->
         <reference name="JettyContainer">
             <name>JettyWebContainer</name>
         </reference>

Modified: geronimo/sandbox/javaee5/configs-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/pom.xml?view=diff&rev=447933&r1=447932&r2=447933
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/pom.xml Tue Sep 19 12:17:10 2006
@@ -114,6 +114,8 @@
     <modules>
         <module>client-transaction-jta11</module>
         <module>transaction-jta11</module>
+        <module>jetty6</module>
+        <module>jetty6-deployer</module>
     </modules>
     
 </project>

Copied: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/pom.xml (from r447903, geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/pom.xml?view=diff&rev=447933&p1=geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml&r1=447903&p2=geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/pom.xml&r2=447933
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/pom.xml Tue Sep 19 12:17:10 2006
@@ -23,25 +23,25 @@
     
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules</artifactId>
+        <artifactId>modules-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-jetty-builder</artifactId>
-    <name>Geronimo :: Jetty :: Builder</name>
+    <artifactId>geronimo-jetty6-builder</artifactId>
+    <name>Geronimo :: Jetty 6 :: Builder</name>
     
     <dependencies>
         
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-web-builder</artifactId>
+            <artifactId>geronimo-web-2.5-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
         
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-jetty</artifactId>
+            <artifactId>geronimo-jetty6</artifactId>
             <version>${pom.version}</version>
         </dependency>
         



Mime
View raw message