geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r417849 - in /geronimo/sandbox/servlet-2.5: ./ applications/console/console-core/ applications/console/console-standard/ configs/activemq-broker/ configs/axis-deployer/ configs/client-corba/ configs/client-deployer/ configs/client-security/...
Date Wed, 28 Jun 2006 19:19:52 GMT
Author: janb
Date: Wed Jun 28 12:19:50 2006
New Revision: 417849

URL: http://svn.apache.org/viewvc?rev=417849&view=rev
Log:
Getting closer, still won't run; temporarily disabled compile (hopefully) of Tomcat related modules because they won't work with the newer servlet2.5 stuff

Added:
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyServletHandler.java   (with props)
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyThreadPool.java   (with props)
Removed:
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationHandler.java
Modified:
    geronimo/sandbox/servlet-2.5/applications/console/console-core/project.xml
    geronimo/sandbox/servlet-2.5/applications/console/console-standard/project.xml
    geronimo/sandbox/servlet-2.5/configs/activemq-broker/project.xml
    geronimo/sandbox/servlet-2.5/configs/axis-deployer/project.xml
    geronimo/sandbox/servlet-2.5/configs/client-corba/project.xml
    geronimo/sandbox/servlet-2.5/configs/client-deployer/project.xml
    geronimo/sandbox/servlet-2.5/configs/client-security/project.xml
    geronimo/sandbox/servlet-2.5/configs/client/project.xml
    geronimo/sandbox/servlet-2.5/configs/console-jetty/project.xml
    geronimo/sandbox/servlet-2.5/configs/daytrader-jetty/project.xml
    geronimo/sandbox/servlet-2.5/configs/directory/project.xml
    geronimo/sandbox/servlet-2.5/configs/hot-deployer/project.xml
    geronimo/sandbox/servlet-2.5/configs/j2ee-corba/project.xml
    geronimo/sandbox/servlet-2.5/configs/j2ee-deployer/project.xml
    geronimo/sandbox/servlet-2.5/configs/j2ee-security/project.xml
    geronimo/sandbox/servlet-2.5/configs/jetty-deployer/project.xml
    geronimo/sandbox/servlet-2.5/configs/jetty/project.xml
    geronimo/sandbox/servlet-2.5/configs/jsp-examples-jetty/project.xml
    geronimo/sandbox/servlet-2.5/configs/ldap-demo-jetty/project.xml
    geronimo/sandbox/servlet-2.5/configs/openejb-deployer/project.xml
    geronimo/sandbox/servlet-2.5/configs/rmi-naming/project.xml
    geronimo/sandbox/servlet-2.5/configs/servlets-examples-jetty/project.xml
    geronimo/sandbox/servlet-2.5/configs/system-database/project.xml
    geronimo/sandbox/servlet-2.5/configs/tomcat-deployer/project.xml
    geronimo/sandbox/servlet-2.5/configs/uddi-jetty/project.xml
    geronimo/sandbox/servlet-2.5/configs/uddi-tomcat/project.xml
    geronimo/sandbox/servlet-2.5/configs/welcome-jetty/project.xml
    geronimo/sandbox/servlet-2.5/maven.xml
    geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/sandbox/servlet-2.5/modules/jetty/project.xml
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
    geronimo/sandbox/servlet-2.5/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java

Modified: geronimo/sandbox/servlet-2.5/applications/console/console-core/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/applications/console/console-core/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/applications/console/console-core/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/applications/console/console-core/project.xml Wed Jun 28 12:19:50 2006
@@ -8,7 +8,7 @@
     <dependencies>
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
             <properties>
                 <repository>true</repository>
@@ -124,4 +124,4 @@
         </unitTest>
 
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: geronimo/sandbox/servlet-2.5/applications/console/console-standard/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/applications/console/console-standard/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/applications/console/console-standard/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/applications/console/console-standard/project.xml Wed Jun 28 12:19:50 2006
@@ -9,7 +9,7 @@
     <dependencies>
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
             <properties>
                 <repository>true</repository>

Modified: geronimo/sandbox/servlet-2.5/configs/activemq-broker/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/activemq-broker/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/activemq-broker/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/activemq-broker/project.xml Wed Jun 28 12:19:50 2006
@@ -226,7 +226,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/axis-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/axis-deployer/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/axis-deployer/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/axis-deployer/project.xml Wed Jun 28 12:19:50 2006
@@ -159,7 +159,7 @@
         </dependency>
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
 

Modified: geronimo/sandbox/servlet-2.5/configs/client-corba/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/client-corba/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/client-corba/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/client-corba/project.xml Wed Jun 28 12:19:50 2006
@@ -225,7 +225,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/client-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/client-deployer/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/client-deployer/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/client-deployer/project.xml Wed Jun 28 12:19:50 2006
@@ -232,7 +232,7 @@
         </dependency>
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
 

Modified: geronimo/sandbox/servlet-2.5/configs/client-security/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/client-security/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/client-security/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/client-security/project.xml Wed Jun 28 12:19:50 2006
@@ -207,7 +207,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/client/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/client/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/client/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/client/project.xml Wed Jun 28 12:19:50 2006
@@ -267,7 +267,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
        <dependency>

Modified: geronimo/sandbox/servlet-2.5/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/console-jetty/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/console-jetty/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/console-jetty/project.xml Wed Jun 28 12:19:50 2006
@@ -435,7 +435,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/daytrader-jetty/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/daytrader-jetty/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/daytrader-jetty/project.xml Wed Jun 28 12:19:50 2006
@@ -288,7 +288,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/directory/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/directory/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/directory/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/directory/project.xml Wed Jun 28 12:19:50 2006
@@ -214,7 +214,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/hot-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/hot-deployer/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/hot-deployer/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/hot-deployer/project.xml Wed Jun 28 12:19:50 2006
@@ -253,7 +253,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/j2ee-corba/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/j2ee-corba/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/j2ee-corba/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/j2ee-corba/project.xml Wed Jun 28 12:19:50 2006
@@ -241,7 +241,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/j2ee-deployer/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/j2ee-deployer/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/j2ee-deployer/project.xml Wed Jun 28 12:19:50 2006
@@ -228,7 +228,7 @@
         </dependency>
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
 

Modified: geronimo/sandbox/servlet-2.5/configs/j2ee-security/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/j2ee-security/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/j2ee-security/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/j2ee-security/project.xml Wed Jun 28 12:19:50 2006
@@ -224,7 +224,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/jetty-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/jetty-deployer/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/jetty-deployer/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/jetty-deployer/project.xml Wed Jun 28 12:19:50 2006
@@ -211,7 +211,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/jetty/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/jetty/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/jetty/project.xml Wed Jun 28 12:19:50 2006
@@ -210,7 +210,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/jsp-examples-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/jsp-examples-jetty/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/jsp-examples-jetty/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/jsp-examples-jetty/project.xml Wed Jun 28 12:19:50 2006
@@ -254,7 +254,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
 

Modified: geronimo/sandbox/servlet-2.5/configs/ldap-demo-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/ldap-demo-jetty/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/ldap-demo-jetty/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/ldap-demo-jetty/project.xml Wed Jun 28 12:19:50 2006
@@ -246,7 +246,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
 

Modified: geronimo/sandbox/servlet-2.5/configs/openejb-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/openejb-deployer/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/openejb-deployer/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/openejb-deployer/project.xml Wed Jun 28 12:19:50 2006
@@ -117,7 +117,7 @@
         </dependency>
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
 

Modified: geronimo/sandbox/servlet-2.5/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/rmi-naming/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/rmi-naming/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/rmi-naming/project.xml Wed Jun 28 12:19:50 2006
@@ -341,7 +341,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/servlets-examples-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/servlets-examples-jetty/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/servlets-examples-jetty/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/servlets-examples-jetty/project.xml Wed Jun 28 12:19:50 2006
@@ -243,7 +243,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
 

Modified: geronimo/sandbox/servlet-2.5/configs/system-database/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/system-database/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/system-database/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/system-database/project.xml Wed Jun 28 12:19:50 2006
@@ -267,7 +267,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/tomcat-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/tomcat-deployer/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/tomcat-deployer/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/tomcat-deployer/project.xml Wed Jun 28 12:19:50 2006
@@ -213,7 +213,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/uddi-jetty/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/uddi-jetty/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/uddi-jetty/project.xml Wed Jun 28 12:19:50 2006
@@ -296,7 +296,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/uddi-tomcat/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/uddi-tomcat/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/uddi-tomcat/project.xml Wed Jun 28 12:19:50 2006
@@ -311,7 +311,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/configs/welcome-jetty/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/configs/welcome-jetty/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/configs/welcome-jetty/project.xml Wed Jun 28 12:19:50 2006
@@ -243,7 +243,7 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/servlet-2.5/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/maven.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/maven.xml (original)
+++ geronimo/sandbox/servlet-2.5/maven.xml Wed Jun 28 12:19:50 2006
@@ -40,6 +40,7 @@
 
     <goal name="new1">
         <maven:reactor basedir="${basedir}" includes="modules/*/project.xml,plugins/*/project.xml"
+            excludes="modules/tomcat/project.xml,modules/tomcat-builder/project.xml"
             goals="multiproject:install-callback" banner="geronimo and geronimo-plugins" ignoreFailures="false" />
     </goal>
 
@@ -55,12 +56,12 @@
 
     <goal name="new4">
         <maven:reactor basedir="${basedir}" includes="configs/*/project.xml"
-            excludes="" goals="multiproject:install-callback" banner="configurations" ignoreFailures="false" />
+            excludes="configs/console-tomcat/project.xml,configs/daytrader-tomcat/project.xml,configs/jsp-examples-tomcat/project.xml,configs/ldap-demo-tomcat/project.xml,configs/remote-deploy-tomcat/project.xml,configs/servlets-examples-tomcat/project.xml,configs/uddi-tomcat/project.xml,configs/welcome-tomcat/project.xml" goals="multiproject:install-callback" banner="configurations" ignoreFailures="false" />
     </goal>
 
     <goal name="new5">
         <maven:reactor basedir="${basedir}" includes="assemblies/*/project.xml"
-            excludes="" goals="multiproject:install-callback" banner="assemblies" ignoreFailures="false" />
+            excludes="assemblies/j2ee-tomcat-server/project.xml,assemblies/minimal-tomcat-server/project.xml" goals="multiproject:install-callback" banner="assemblies" ignoreFailures="false" />
     </goal>
 
     <goal name="new">

Modified: geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Wed Jun 28 12:19:50 2006
@@ -108,6 +108,7 @@
 import org.apache.geronimo.xbeans.javaee.ServletMappingType;
 import org.apache.geronimo.xbeans.javaee.ServletType;
 import org.apache.geronimo.xbeans.javaee.TaglibType;
+import org.apache.geronimo.xbeans.javaee.UrlPatternType;
 import org.apache.geronimo.xbeans.javaee.WebAppDocument;
 import org.apache.geronimo.xbeans.javaee.WebAppType;
 import org.apache.geronimo.xbeans.javaee.WelcomeFileListType;
@@ -578,9 +579,9 @@
                         filterMappingGBeanData.setReferencePattern("Previous", previous);
                     }
                     filterMappingGBeanData.setReferencePattern("JettyServletRegistration", moduleName);
-                    String urlPatterns = {"/*"};
+                    String[] urlPatterns = {"/*"};
                     filterMappingGBeanData.setAttribute("urlPatterns", urlPatterns);
-                    AbstractName filterMappingName = earContext.getNaming().createChildName(defaultFilterAbstractName, urlPatterns, NameFactory.URL_WEB_FILTER_MAPPING);
+                    AbstractName filterMappingName = earContext.getNaming().createChildName(defaultFilterAbstractName, ObjectName.quote(arrayToString(urlPatterns)), NameFactory.URL_WEB_FILTER_MAPPING);
                     filterMappingGBeanData.setAbstractName(filterMappingName);
                     previous = filterMappingName;
 
@@ -640,18 +641,19 @@
                    }
 
                    filterMappingData.setAttribute("urlPatterns", urlPatterns);
-                   //filterMappingName = NameFactory.getWebFilterMappingName(null, null, null, null, filterName, null, urlPatterns, moduleJ2eeContext);
+                   filterMappingName = earContext.getNaming().createChildName(filterAbstractName, ObjectName.quote(arrayToString(urlPatterns)), NameFactory.URL_WEB_FILTER_MAPPING);
                 }
                 if (filterMappingType.sizeOfServletNameArray() > 0) {
                    Set servletNameSet = new HashSet();
-                   String[] servletNames = new String[filterMappingType.sizeOfUrlPatternArray()];
-                   for (int j=0; j < servletNames.length; j++) {
-                     servletNames[j] = filterMappingType.getServletNameArray(j).getStringValue().trim();
-                    //servletNameSet.add(NameFactory.getWebComponentName(null, null, null, null, servletNames[j], NameFactory.SERVLET, moduleJ2eeContext));
+                   for (int j=0; j < filterMappingType.sizeOfServletNameArray(); j++) {
+                     String servletName = filterMappingType.getServletNameArray(j).getStringValue().trim();
+                     AbstractName abstractServletName =  earContext.getNaming().createChildName(moduleName, servletName, NameFactory.SERVLET);
+                     servletNameSet.add(abstractServletName);
                    }
 
                    filterMappingData.setReferencePatterns("Servlets", servletNameSet);
-                   //filterMappingName = NameFactory.getWebFilterMappingName(null, null, null, null, filterName, servletNames, null, moduleJ2eeContext);
+                   filterMappingName = earContext.getNaming().createChildName(filterAbstractName, ObjectName.quote(arrayToString(servletNameSet.toArray())), NameFactory.SERVLET_WEB_FILTER_MAPPING);
+
                  }
 
                 filterMappingData.setAbstractName(filterMappingName);
@@ -936,6 +938,35 @@
                 jettyWebApp.getGbeanRefArray(),
                 cl);
     }
+
+
+    /**
+     * Build up a toString of an array of objects. Not a deep
+     * toString. Needs to be replaced by jdk1.5 Arrays.deepToString()
+     * when geronimo moves to 1.5
+     **/
+    private String arrayToString (Object[] objects) {
+      if (objects == null)
+        return "[]";
+
+      boolean first = true;
+      StringBuffer strbuff = new StringBuffer();
+      strbuff.append("[");
+      for (int i=0; i < objects.length; i++ ){
+        Object o = objects[i];
+        if (!first) {
+          strbuff.append(", ");
+        }
+
+        strbuff.append(o.toString());
+        first = false;
+      }
+      strbuff.append("]");
+
+      return strbuff.toString();
+    }
+
+
 
     public static final GBeanInfo GBEAN_INFO;
 

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/project.xml?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/project.xml Wed Jun 28 12:19:50 2006
@@ -145,7 +145,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>jetty</groupId>
             <artifactId>jetty</artifactId>
             <version>${jetty_version}</version>
             <properties>
@@ -153,7 +153,7 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>jetty</groupId>
             <artifactId>jetty-util</artifactId>
             <version>${jetty_version}</version>
             <properties>

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java Wed Jun 28 12:19:50 2006
@@ -157,7 +157,7 @@
     }
 
     public void removeContext(ContextHandler context) {
-        server.removeContext(context);
+        server.removeHandler(context);
     }
 
     public InternalJAASJettyRealm addRealm(String realmName) {

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java Wed Jun 28 12:19:50 2006
@@ -94,13 +94,10 @@
             setFilterName(filterName);
             setDispatches(dispatches);
             setPathSpecs(urlPatterns);
-
-            if (jettyServletHolders == null) {
-                (jettyServletRegistration.getServletHandler()).addFilterMapping(urlPatterns, filterName, dispatches);
-            } else {
+            if (jettyServletHolders != null)
                 setServletNames((String[])jettyServletHolders.toArray(new String[0]));
-                (jettyServletRegistration.getServletHandler()).addFilterMapping(this);
-            }
+
+            (jettyServletRegistration.getServletHandler()).addFilterMapping(this);
         }
     }
 

Added: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyServletHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyServletHandler.java?rev=417849&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyServletHandler.java (added)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyServletHandler.java Wed Jun 28 12:19:50 2006
@@ -0,0 +1,58 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.jetty;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.UnavailableException;
+import javax.security.auth.Subject;
+
+import org.mortbay.jetty.servlet.ServletHandler;
+import org.apache.geronimo.security.ContextManager;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JettyServletHandler extends ServletHandler {
+
+    /**
+     * Wrap the dispatch call to prevent leaking Subject back into the environemnt.
+     * 
+     * @param target
+     * @param request
+     * @param response
+     * @param type
+     * @throws ServletException
+     * @throws UnavailableException
+     * @throws IOException
+     */
+    public void handle(String target, HttpServletRequest request,HttpServletResponse response, int type)
+    throws IOException
+    {
+        Subject currentCaller = ContextManager.getCurrentCaller();
+        try {
+            super.handle(target, request, response, type);
+        } finally {
+            ContextManager.setCurrentCaller(currentCaller);
+        }
+
+    }
+}

Propchange: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyServletHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyServletHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyServletHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyThreadPool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyThreadPool.java?rev=417849&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyThreadPool.java (added)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyThreadPool.java Wed Jun 28 12:19:50 2006
@@ -0,0 +1,98 @@
+package org.apache.geronimo.jetty;
+
+import org.mortbay.thread.ThreadPool;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class JettyThreadPool extends org.apache.geronimo.pool.ThreadPool  implements ThreadPool{
+
+    private final static Log log = LogFactory.getLog(JettyThreadPool.class);
+    private final static long WAIT_TIME = 5000L;
+    private boolean isStarted = false;
+    private boolean isFailed = false;
+    private Object joinLock = new Object();
+    
+   
+    
+    public JettyThreadPool(int poolSize, String poolName, long keepAliveTime, ClassLoader classLoader, String objectName) {
+        super(poolSize, poolName, keepAliveTime, classLoader, objectName);
+    }
+
+    
+    public boolean dispatch(Runnable work) {
+        try {
+            execute(work);
+            return true;
+        }
+        catch (InterruptedException e) {
+            log.warn(e);
+            return false;
+        }
+    }
+
+    /**
+     * Jetty method. Caller wants to wait until the
+     * thread pool has stopped.
+     * 
+     * @see org.mortbay.thread.ThreadPool#join()
+     */
+    public void join() throws InterruptedException {
+        synchronized (joinLock)
+        {
+            while (isRunning())
+                joinLock.wait(WAIT_TIME);
+        }
+    }
+
+    public int getThreads() {
+        return getPoolSize();
+    }
+
+    public int getIdleThreads() {
+        //TODO: use geronimoPool.getStats() to statisfy this?
+        return 0;
+    }
+
+    public boolean isLowOnThreads() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public void start() throws Exception {
+        doStart();
+        isStarted = true;
+    }
+
+    public void stop() throws Exception {
+        doStop();
+        isStarted = false;
+    }
+
+    public boolean isRunning() {
+        return isStarted;
+    }
+
+    public boolean isStarted() {
+        return isStarted;
+    }
+
+    public boolean isStarting() {
+        // TODO:
+        return false;
+    }
+
+    public boolean isStopping() {
+        // TODO: 
+        return false;
+    }
+
+    public boolean isFailed() {
+        return isFailed;
+    }
+
+    public void doFail ()
+    {
+        super.doFail();
+        isFailed = true;
+    }
+}

Propchange: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyThreadPool.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyThreadPool.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyThreadPool.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java Wed Jun 28 12:19:50 2006
@@ -113,48 +113,6 @@
 
 
 
-    public class SessionManagerConfiguration implements Configuration {
-
-       private WebAppContext webAppContext;
-
-        public SessionManagerConfiguration() {
-        }
-
-
-
-        public void configureClassPath() throws Exception {
-        }
-
-        public void configureDefaults() throws Exception {
-        }
-
-
-        public void configureWebApp() throws Exception {
-          //setup a SessionManager
-          log.debug("About to configure a SessionManager");
-          String sessionManagerClassName = JettyWebAppContext.this.getSessionManager();
-          if (sessionManagerClassName != null && sessionManagerClassName.trim().length() != 0) {
-            Class clazz = Thread.currentThread().getContextClassLoader().loadClass(sessionManagerClassName);
-            SessionManager sm = (SessionManager)clazz.newInstance();
-            log.debug("Setting SessionManager type=" + clazz.getName() + " instance=" + sm);
-            getWebAppContext().getSessionHandler().setSessionManager(sm);
-          }
-       }
-
-      public void setWebAppContext(WebAppContext webAppContext) {
-        this.webAppContext = webAppContext;
-      }
-   
-      public WebAppContext getWebAppContext() {
-        return this.webAppContext;
-      }
-
-      public void configureClassLoader() throws Exception {
-      }
-
-      public void deconfigureWebApp() throws Exception {
-      }
-    }
 
     /**
      * @deprecated never use this... this is only here because Jetty WebApplicationContext is externalizable
@@ -173,6 +131,7 @@
         objectName = null;
         sessionManagerClassName = null;
         webAppContext = null;
+        configurationBaseURL = null;
     }
 
     public JettyWebAppContext(String objectName,
@@ -222,6 +181,7 @@
         assert jettyContainer != null;
         this.webAppContext = new WebAppContext(new JettySecurityHandler(), null, null, null);
         this.sessionManagerClassName = sessionManager;
+        //TODO: how to set up a session manager for jetty6
 
         this.server = server;
         this.application = application;
@@ -247,10 +207,7 @@
         }
 
         //use our wrapper to avoid leaking subject back to the caller
-        //TODO: this isn't right for jetty6, work out what the point is
-        //and replace with jetty6ism
-        //handler = new JettyWebApplicationHandler();
-        //addHandler(handler);
+        this.webAppContext.setServletHandler(new JettyServletHandler());
 
         userTransaction.setUp(transactionContextManager, trackedConnectionAssociator);
 
@@ -307,7 +264,6 @@
         chain = interceptor;
         contextLength = index;
 
-        configureSessionManager(sessionManager);
     }
 
 
@@ -536,17 +492,6 @@
     }
 
 
-    private void configureSessionManager(String sessionManagerClassName) {
-      if (this.webAppContext.isDistributable())
-        this.sessionManagerClassName = jettyContainer.getDistributableSessionManager();
-      else
-        this.sessionManagerClassName = jettyContainer.getLocalSessionManager();
-      log.debug("SessionManager classname=" + this.sessionManagerClassName);
-      if (this.sessionManagerClassName != null) {
-        addConfiguration(SessionManagerConfiguration.class.getName());
-      }
-
-    }
 
     private void addConfiguration(String configClassName) {
       String[] configClassNames = this.webAppContext.getConfigurationClasses();

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java Wed Jun 28 12:19:50 2006
@@ -25,7 +25,47 @@
  */
 public interface JettyWebConnector extends WebConnector {
 
-    public void setMaxIdleTime(long maxIdleTime);
-    
-    public long getMaxIdleTime();
+
+    /**
+     * Gets the minimum number of threads used to service connections from
+     * this connector.
+     */
+    //TODO: not relevant jetty6
+    public int getMinThreads();
+
+    /**
+     *  Sets the minimum number of threads used to service connections from
+     *  this connector.
+     */
+    //TODO: not relevant jetty6 - this method is on the threadpool object
+    public void setMinThreads(int threads);
+
+    //TODO: not relevant jetty6 - this method is on the threadpool object
+    public int getThreads();
+
+    //TODO: not relevant jetty6
+    public int getIdlethreads();
+
+    //TODO: not relevant jetty6
+    public String getDefaultScheme();
+
+    //TODO: is a long in jetty6
+    public void setMaxIdleTimeMs(int max);
+
+    //TODO: is a long in jetty6
+    public int getMaxIdleTimeMs();
+
+    //TODO: not relevant jetty6
+    public void setLowThreadsMaxIdleTimeMs(int max);
+
+    //TODO: not relevant jetty6
+    public int getLowThreadsMaxIdleTimeMs();
+
+    //TODO: not relevant jetty6
+    public void setLowThreads(int lowThreads);
+
+    //TODO: not relevant jetty6
+    public int getLowThreads();
+
+  
 }

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java Wed Jun 28 12:19:50 2006
@@ -83,6 +83,11 @@
 
     public abstract int getDefaultPort();
 
+    //TODO: what is it?
+    public String getDefaultScheme () {
+      return null;
+    }
+
     public String getConnectUrl() {
         if(connectHost == null) {
             String host = getHost();
@@ -105,10 +110,11 @@
         return getProtocol().toLowerCase()+"://"+connectHost+(getPort() == getDefaultPort() ? "" : ":"+getPort());
     }
 
-    public long getMaxIdleTimeMs () {
+    public int getMaxIdleTimeMs () {
         return ((AbstractConnector)listener).getMaxIdleTime();
     }
     
+
     public void setMaxIdleTimeMs (int idleTime) {
         ((AbstractConnector)listener).setMaxIdleTime(idleTime);
     }
@@ -142,6 +148,13 @@
        return 0;
      }
 
+     public int getMinThreads () {
+       //TODO: not supported in jetty6 - on thread pool instead
+       return 0;
+     }
+     public void setMinThreads (int i) {
+       //TODO: not supported in jetty6 - on thread pool instead
+     }
 
    
     public int getBufferSizeBytes() {

Modified: geronimo/sandbox/servlet-2.5/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java?rev=417849&r1=417848&r2=417849&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Wed Jun 28 12:19:50 2006
@@ -60,17 +60,16 @@
 import org.apache.geronimo.kernel.repository.ImportType;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
 import org.apache.geronimo.security.util.URLPattern;
-import org.apache.geronimo.xbeans.j2ee.FilterMappingType;
-import org.apache.geronimo.xbeans.j2ee.HttpMethodType;
-import org.apache.geronimo.xbeans.j2ee.RoleNameType;
-import org.apache.geronimo.xbeans.j2ee.SecurityConstraintType;
-import org.apache.geronimo.xbeans.j2ee.SecurityRoleRefType;
-import org.apache.geronimo.xbeans.j2ee.SecurityRoleType;
-import org.apache.geronimo.xbeans.j2ee.ServletMappingType;
-import org.apache.geronimo.xbeans.j2ee.ServletType;
-import org.apache.geronimo.xbeans.j2ee.UrlPatternType;
-import org.apache.geronimo.xbeans.j2ee.WebAppType;
-import org.apache.geronimo.xbeans.j2ee.WebResourceCollectionType;
+import org.apache.geronimo.xbeans.javaee.FilterMappingType;
+import org.apache.geronimo.xbeans.javaee.RoleNameType;
+import org.apache.geronimo.xbeans.javaee.SecurityConstraintType;
+import org.apache.geronimo.xbeans.javaee.SecurityRoleRefType;
+import org.apache.geronimo.xbeans.javaee.SecurityRoleType;
+import org.apache.geronimo.xbeans.javaee.ServletMappingType;
+import org.apache.geronimo.xbeans.javaee.ServletType;
+import org.apache.geronimo.xbeans.javaee.UrlPatternType;
+import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee.WebResourceCollectionType;
 
 /**
  * @version $Rev$ $Date$
@@ -135,7 +134,11 @@
         for (int j = 0; j < servletMappings.length; j++) {
             ServletMappingType servletMapping = servletMappings[j];
             String servletName = servletMapping.getServletName().getStringValue().trim();
-            map.put(servletName, contextRoot + servletMapping.getUrlPattern().getStringValue().trim());
+            UrlPatternType[] urlPatterns = servletMapping.getUrlPatternArray();
+
+            for (int i=0; urlPatterns != null && (i < urlPatterns.length); i++) {
+                map.put(servletName, contextRoot +urlPatterns[i].getStringValue().trim());
+            }
         }
         return map;
     }
@@ -298,17 +301,18 @@
                         allMap.put(url, allPattern);
                     }
 
-                    HttpMethodType[] httpMethodTypeArray = webResourceCollectionType.getHttpMethodArray();
+                    String[] httpMethodTypeArray = webResourceCollectionType.getHttpMethodArray();
                     if (httpMethodTypeArray.length == 0) {
                         pattern.addMethod("");
                         allPattern.addMethod("");
                     } else {
                         for (int l = 0; l < httpMethodTypeArray.length; l++) {
-                            HttpMethodType httpMethodType = httpMethodTypeArray[l];
                             //TODO is trim OK?
-                            String method = httpMethodType.getStringValue().trim();
-                            pattern.addMethod(method);
-                            allPattern.addMethod(method);
+                            String method = (httpMethodTypeArray[l]==null?null:httpMethodTypeArray[l].trim());
+                            if (method != null) {
+                                pattern.addMethod(method);
+                                allPattern.addMethod(method);
+                            }
                         }
                     }
                     if (currentPatterns == rolesPatterns) {
@@ -475,14 +479,18 @@
 
         FilterMappingType[] filterMappings = webApp.getFilterMappingArray();
         for (int i = 0; i < filterMappings.length; i++) {
-            if (filterMappings[i].isSetUrlPattern()) {
-                checkString(filterMappings[i].getUrlPattern().getStringValue().trim());
+             UrlPatternType[] urlPatterns = filterMappings[i].getUrlPatternArray();
+            for (int j=0; (urlPatterns != null) && (j < urlPatterns.length); j++) {
+                checkString(urlPatterns[j].getStringValue().trim());
             }
         }
 
         ServletMappingType[] servletMappings = webApp.getServletMappingArray();
         for (int i = 0; i < servletMappings.length; i++) {
-            checkString(servletMappings[i].getUrlPattern().getStringValue().trim());
+            UrlPatternType[] urlPatterns = servletMappings[i].getUrlPatternArray();
+            for (int j=0; (urlPatterns != null) && (j < urlPatterns.length); j++) {
+                checkString(urlPatterns[j].getStringValue().trim());
+            }
         }
 
         SecurityConstraintType[] constraints = webApp.getSecurityConstraintArray();



Mime
View raw message