geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r751587 [1/2] - in /geronimo/sandbox/djencks/jetty7: ./ geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/ geronimo-jetty7...
Date Mon, 09 Mar 2009 05:34:00 GMT
Author: djencks
Date: Mon Mar  9 05:33:57 2009
New Revision: 751587

URL: http://svn.apache.org/viewvc?rev=751587&view=rev
Log:
update to latest jetty7 state.

Added:
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java   (with props)
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java   (with props)
Removed:
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthenticationManagerWrapper.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/BaseAuthModule.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/BasicAuthModule.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/ClientCertAuthModule.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/DigestAuthModule.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/FormAuthModule.java
Modified:
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/AbstractClusteredPreHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandlerFactory.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/WADIClusteredPreHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/AbstractPreHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJettyServletHolder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainer.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyEJBWebServiceContext.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterHolder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyPOJOWebServiceHolder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletHolder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/SessionHandlerFactory.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSelectChannelSSLListener.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSocketSSLListener.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPBlockingConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSelectChannelConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSocketConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSelectChannelConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSocketConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyThreadPool.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/AbstractImmutableHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ComponentContextHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoRunAsToken.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentity.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ThreadClassloaderHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/NCSARequestLog.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthConfigGBean.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ApplicationTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java
    geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml
    geronimo/sandbox/djencks/jetty7/jetty7/pom.xml
    geronimo/sandbox/djencks/jetty7/pom.xml

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/AbstractClusteredPreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/AbstractClusteredPreHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/AbstractClusteredPreHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/AbstractClusteredPreHandler.java Mon Mar  9 05:33:57 2009
@@ -25,8 +25,7 @@
 import org.apache.geronimo.clustering.ClusteredInvocation;
 import org.apache.geronimo.clustering.ClusteredInvocationException;
 import org.apache.geronimo.jetty7.AbstractPreHandler;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.HttpException;
+import org.mortbay.jetty.io.HttpException;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java Mon Mar  9 05:33:57 2009
@@ -24,8 +24,7 @@
 
 import org.apache.geronimo.jetty7.AbstractPreHandler;
 import org.apache.geronimo.jetty7.PreHandler;
-//import org.mortbay.jetty.Request;
-import org.mortbay.jetty.servlet.SessionHandler;
+import org.mortbay.jetty.server.session.SessionHandler;
 
 /**
  *

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandlerFactory.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandlerFactory.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandlerFactory.java Mon Mar  9 05:33:57 2009
@@ -20,7 +20,7 @@
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.jetty7.PreHandler;
 import org.apache.geronimo.jetty7.SessionHandlerFactory;
-import org.mortbay.jetty.servlet.SessionHandler;
+import org.mortbay.jetty.server.session.SessionHandler;
 
 /**
  *

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java Mon Mar  9 05:33:57 2009
@@ -25,8 +25,8 @@
 import org.apache.geronimo.clustering.SessionAlreadyExistException;
 import org.apache.geronimo.clustering.SessionListener;
 import org.apache.geronimo.clustering.SessionManager;
-import org.mortbay.jetty.servlet.AbstractSessionManager;
-import org.mortbay.jetty.servlet.HashSessionIdManager;
+import org.mortbay.jetty.server.session.AbstractSessionManager;
+import org.mortbay.jetty.server.session.HashSessionIdManager;
 
 
 /**

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/WADIClusteredPreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/WADIClusteredPreHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/WADIClusteredPreHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/WADIClusteredPreHandler.java Mon Mar  9 05:33:57 2009
@@ -31,7 +31,6 @@
 import org.codehaus.wadi.core.contextualiser.InvocationException;
 import org.codehaus.wadi.core.manager.Manager;
 import org.codehaus.wadi.web.impl.WebInvocation;
-import org.mortbay.jetty.Request;
 
 
 /**

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml Mon Mar  9 05:33:57 2009
@@ -52,9 +52,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
 
         <dependency>
@@ -92,37 +93,41 @@
             <!--<scope>provided</scope>-->
         <!--</dependency>-->
          
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<artifactId>jetty-server</artifactId>-->
+        <!--</dependency>-->
         
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-ajp</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-ssl</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<artifactId>jetty-ssl</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<artifactId>jetty-util</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-webapp</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-plus</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<artifactId>jetty-security</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<artifactId>jetty-servlet</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<artifactId>jetty-plus</artifactId>-->
+        <!--</dependency>-->
 
         <!--<dependency>-->
             <!--<groupId>xerces</groupId>-->

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/AbstractPreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/AbstractPreHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/AbstractPreHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/AbstractPreHandler.java Mon Mar  9 05:33:57 2009
@@ -17,9 +17,9 @@
 
 package org.apache.geronimo.jetty7;
 
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.component.LifeCycle;
+import org.mortbay.jetty.server.Handler;
+import org.mortbay.jetty.server.Server;
+import org.mortbay.jetty.util.component.LifeCycle;
 
 /**
  * @version $Rev: 449059 $ $Date: 2006-09-23 05:23:09 +1000 (Sat, 23 Sep 2006) $
@@ -39,10 +39,10 @@
         throw new UnsupportedOperationException();
     }
 
-    public void addLifeCycleListener(Listener listener) {
+    public void addLifeCycleListener(LifeCycle.Listener listener) {
     }
 
-    public void removeLifeCycleListener(Listener listener) {
+    public void removeLifeCycleListener(LifeCycle.Listener listener) {
     }
 
     public final boolean isRunning() {

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java Mon Mar  9 05:33:57 2009
@@ -26,7 +26,7 @@
 import javax.naming.InitialContext;
 import javax.servlet.Servlet;
 
-import org.mortbay.jetty.servlet.ServletHandler;
+import org.mortbay.jetty.server.servlet.ServletHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.geronimo.j2ee.annotation.Injection;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJettyServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJettyServletHolder.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJettyServletHolder.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJettyServletHolder.java Mon Mar  9 05:33:57 2009
@@ -30,8 +30,8 @@
 import org.apache.geronimo.jetty7.handler.LifecycleCommand;
 import org.apache.geronimo.security.Callers;
 import org.apache.geronimo.security.ContextManager;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.mortbay.jetty.server.Request;
+import org.mortbay.jetty.server.servlet.ServletHolder;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainer.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainer.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainer.java Mon Mar  9 05:33:57 2009
@@ -20,10 +20,9 @@
 import java.io.File;
 
 import org.apache.geronimo.management.geronimo.WebContainer;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.RequestLog;
-import org.mortbay.jetty.security.ServletCallbackHandler;
-import org.mortbay.jetty.handler.AbstractHandlerContainer;
+import org.mortbay.jetty.server.Connector;
+import org.mortbay.jetty.server.RequestLog;
+import org.mortbay.jetty.server.Handler;
 
 /**
  * @version $Rev$ $Date$
@@ -33,9 +32,9 @@
 
     void removeListener(Connector listener);
 
-    void addContext(AbstractHandlerContainer context);
+    void addContext(Handler context);
 
-    void removeContext(AbstractHandlerContainer context);
+    void removeContext(Handler context);
 
     void resetStats();
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java Mon Mar  9 05:33:57 2009
@@ -33,16 +33,15 @@
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.webservices.SoapHandler;
 import org.apache.geronimo.webservices.WebServiceContainer;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.RequestLog;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ContextHandlerCollection;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.handler.RequestLogHandler;
-import org.mortbay.jetty.handler.StatisticsHandler;
-import org.mortbay.jetty.handler.AbstractHandlerContainer;
+import org.mortbay.jetty.server.Connector;
+import org.mortbay.jetty.server.Handler;
+import org.mortbay.jetty.server.handler.StatisticsHandler;
+import org.mortbay.jetty.server.handler.HandlerCollection;
+import org.mortbay.jetty.server.handler.ContextHandlerCollection;
+import org.mortbay.jetty.server.handler.DefaultHandler;
+import org.mortbay.jetty.server.handler.RequestLogHandler;
+import org.mortbay.jetty.server.RequestLog;
+import org.mortbay.jetty.server.Server;
 
 /**
  * @version $Rev$ $Date$
@@ -63,7 +62,7 @@
     private JettyWebContainerStatsImpl stats;
 //    private final Map realms = new HashMap();
     // list of handlers
-    private StatisticsHandler statsHandler = new StatisticsHandler();  
+    private StatisticsHandler statsHandler = new StatisticsHandler();
     private HandlerCollection handlerCollection = new HandlerCollection();
     private ContextHandlerCollection contextHandlerCollection = new ContextHandlerCollection();
     private DefaultHandler defaultHandler = new DefaultHandler();
@@ -200,11 +199,11 @@
         server.removeConnector(listener);
     }
 
-    public void addContext(AbstractHandlerContainer context) {
+    public void addContext(Handler context) {
         contextHandlerCollection.addHandler(context);
     }
 
-    public void removeContext(AbstractHandlerContainer context) {
+    public void removeContext(Handler context) {
         contextHandlerCollection.removeHandler(context);
     }
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyEJBWebServiceContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyEJBWebServiceContext.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyEJBWebServiceContext.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyEJBWebServiceContext.java Mon Mar  9 05:33:57 2009
@@ -29,10 +29,10 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.geronimo.webservices.WebServiceContainer;
-import org.mortbay.jetty.HttpException;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.Response;
-import org.mortbay.jetty.handler.ContextHandler;
+import org.mortbay.jetty.server.Request;
+import org.mortbay.jetty.server.Response;
+import org.mortbay.jetty.server.handler.ContextHandler;
+import org.mortbay.jetty.io.HttpException;
 
 /**
  * Delegates requests to a WebServiceContainer which is presumably for an EJB WebService.

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterHolder.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterHolder.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterHolder.java Mon Mar  9 05:33:57 2009
@@ -23,7 +23,7 @@
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.jetty7.handler.LifecycleCommand;
-import org.mortbay.jetty.servlet.FilterHolder;
+import org.mortbay.jetty.server.servlet.FilterHolder;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java Mon Mar  9 05:33:57 2009
@@ -27,9 +27,8 @@
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
 import org.apache.geronimo.gbean.ReferenceCollectionListener;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.servlet.FilterMapping;
-import org.mortbay.jetty.servlet.ServletHandler;
+import org.mortbay.jetty.server.servlet.FilterMapping;
+import org.mortbay.jetty.server.servlet.ServletHandler;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyPOJOWebServiceHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyPOJOWebServiceHolder.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyPOJOWebServiceHolder.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyPOJOWebServiceHolder.java Mon Mar  9 05:33:57 2009
@@ -37,8 +37,8 @@
 import org.apache.geronimo.webservices.WebServiceContainer;
 import org.apache.geronimo.webservices.WebServiceContainerInvoker;
 import org.apache.geronimo.webservices.WebServiceContainerFactory;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.mortbay.jetty.server.Request;
+import org.mortbay.jetty.server.servlet.ServletHolder;
 
 
 /**

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletHolder.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletHolder.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletHolder.java Mon Mar  9 05:33:57 2009
@@ -18,6 +18,8 @@
 
 import java.util.Map;
 import java.util.Set;
+import java.util.Enumeration;
+import java.net.URL;
 
 import javax.security.auth.Subject;
 
@@ -26,7 +28,7 @@
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.management.Servlet;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.mortbay.jetty.server.servlet.ServletHolder;
 
 
 /**

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java Mon Mar  9 05:33:57 2009
@@ -21,8 +21,8 @@
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginException;
 
-import org.mortbay.jetty.servlet.ServletHandler;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.mortbay.jetty.server.servlet.ServletHandler;
+import org.mortbay.jetty.server.servlet.ServletHolder;
 import org.apache.geronimo.jetty7.handler.AbstractImmutableHandler;
 
 /**

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java Mon Mar  9 05:33:57 2009
@@ -63,15 +63,14 @@
 import org.apache.geronimo.naming.enc.EnterpriseNamingContext;
 import org.apache.geronimo.security.jacc.RunAsSource;
 import org.apache.geronimo.transaction.GeronimoUserTransaction;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.MimeTypes;
-import org.mortbay.jetty.security.NoSecurityHandler;
-import org.mortbay.jetty.handler.SecurityHandler;
-import org.mortbay.jetty.servlet.ErrorPageErrorHandler;
-import org.mortbay.jetty.servlet.ServletHandler;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.servlet.ServletMapping;
-import org.mortbay.jetty.servlet.SessionHandler;
+import org.mortbay.jetty.server.Handler;
+import org.mortbay.jetty.security.SecurityHandler;
+import org.mortbay.jetty.server.servlet.ErrorPageErrorHandler;
+import org.mortbay.jetty.server.servlet.ServletHandler;
+import org.mortbay.jetty.server.servlet.ServletHolder;
+import org.mortbay.jetty.server.servlet.ServletMapping;
+import org.mortbay.jetty.server.session.SessionHandler;
+import org.mortbay.jetty.http.MimeTypes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -282,7 +281,8 @@
             Subject defaultSubject =  this.runAsSource.getDefaultSubject();
             securityHandler = securityHandlerFactory.buildSecurityHandler(policyContextID, defaultSubject, runAsSource);
         } else {
-            securityHandler = new NoSecurityHandler();
+            //TODO may need to turn off security with Context._options.
+//            securityHandler = new NoSecurityHandler();
         }
 //        }
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandler.java Mon Mar  9 05:33:57 2009
@@ -17,7 +17,7 @@
 
 package org.apache.geronimo.jetty7;
 
-import org.mortbay.jetty.Handler;
+import org.mortbay.jetty.server.Handler;
 
 /**
  * @version $Rev: 449059 $ $Date: 2006-09-23 05:23:09 +1000 (Sat, 23 Sep 2006) $

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/SessionHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/SessionHandlerFactory.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/SessionHandlerFactory.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/SessionHandlerFactory.java Mon Mar  9 05:33:57 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.geronimo.jetty7;
 
-import org.mortbay.jetty.servlet.SessionHandler;
+import org.mortbay.jetty.server.session.SessionHandler;
 
 /**
  *

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSelectChannelSSLListener.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSelectChannelSSLListener.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSelectChannelSSLListener.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSelectChannelSSLListener.java Mon Mar  9 05:33:57 2009
@@ -22,8 +22,8 @@
 
 import javax.net.ssl.SSLContext;
 
-import org.mortbay.jetty.ssl.SslSelectChannelConnector;
-import org.mortbay.jetty.ssl.SslSocketConnector;
+import org.mortbay.jetty.server.ssl.SslSelectChannelConnector;
+import org.mortbay.jetty.server.ssl.SslSocketConnector;
 import org.apache.geronimo.management.geronimo.KeystoreManager;
 
 /**

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSocketSSLListener.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSocketSSLListener.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSocketSSLListener.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSocketSSLListener.java Mon Mar  9 05:33:57 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.geronimo.jetty7.connector;
 
-import org.mortbay.jetty.ssl.SslSocketConnector;
+import org.mortbay.jetty.server.ssl.SslSocketConnector;
 import org.apache.geronimo.management.geronimo.KeystoreManager;
 
 import javax.net.ssl.SSLServerSocketFactory;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPBlockingConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPBlockingConnector.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPBlockingConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPBlockingConnector.java Mon Mar  9 05:33:57 2009
@@ -25,7 +25,7 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.nio.BlockingChannelConnector;
+import org.mortbay.jetty.server.nio.BlockingChannelConnector;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSelectChannelConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSelectChannelConnector.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSelectChannelConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSelectChannelConnector.java Mon Mar  9 05:33:57 2009
@@ -29,7 +29,7 @@
 import org.apache.geronimo.management.geronimo.KeystoreManager;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.mortbay.jetty.server.nio.SelectChannelConnector;
 
 /**
  * Implementation of a HTTPS connector based on Jetty's SslConnector (which uses pure JSSE).

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSocketConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSocketConnector.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSocketConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSocketConnector.java Mon Mar  9 05:33:57 2009
@@ -26,7 +26,7 @@
 import org.apache.geronimo.management.geronimo.KeystoreManager;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.bio.SocketConnector;
+import org.mortbay.jetty.server.bio.SocketConnector;
 
 /**
  * Implementation of a HTTPS connector based on Jetty's SslConnector (which uses pure JSSE).

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSelectChannelConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSelectChannelConnector.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSelectChannelConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSelectChannelConnector.java Mon Mar  9 05:33:57 2009
@@ -25,7 +25,7 @@
 import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.mortbay.jetty.server.nio.SelectChannelConnector;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSocketConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSocketConnector.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSocketConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSocketConnector.java Mon Mar  9 05:33:57 2009
@@ -22,7 +22,7 @@
 import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.bio.SocketConnector;
+import org.mortbay.jetty.server.bio.SocketConnector;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java Mon Mar  9 05:33:57 2009
@@ -31,7 +31,7 @@
 import org.apache.geronimo.management.LazyStatisticsProvider;
 import org.apache.geronimo.management.geronimo.stats.JettyWebConnectorStatsImpl;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.AbstractConnector;
+import org.mortbay.jetty.server.AbstractConnector;
 
 /**
  * Base class for GBeans for Jetty network connectors (HTTP, HTTPS, AJP, etc.).

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyThreadPool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyThreadPool.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyThreadPool.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyThreadPool.java Mon Mar  9 05:33:57 2009
@@ -30,7 +30,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class JettyThreadPool implements org.mortbay.thread.ThreadPool {
+public class JettyThreadPool implements org.mortbay.jetty.util.thread.ThreadPool {
 
     private static final Logger log = LoggerFactory.getLogger(JettyThreadPool.class);
     private final ThreadPool executor;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/AbstractImmutableHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/AbstractImmutableHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/AbstractImmutableHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/AbstractImmutableHandler.java Mon Mar  9 05:33:57 2009
@@ -18,9 +18,9 @@
 
 package org.apache.geronimo.jetty7.handler;
 
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.HandlerContainer;
-import org.mortbay.jetty.Server;
+import org.mortbay.jetty.server.Handler;
+import org.mortbay.jetty.server.HandlerContainer;
+import org.mortbay.jetty.server.Server;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ComponentContextHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ComponentContextHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ComponentContextHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ComponentContextHandler.java Mon Mar  9 05:33:57 2009
@@ -26,8 +26,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.geronimo.naming.java.RootContext;
-import org.mortbay.jetty.Handler;
-import org.mortbay.component.LifeCycle;
+import org.mortbay.jetty.server.Handler;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoRunAsToken.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoRunAsToken.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoRunAsToken.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoRunAsToken.java Mon Mar  9 05:33:57 2009
@@ -22,8 +22,7 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.geronimo.security.ContextManager;
-import org.mortbay.jetty.RunAsToken;
+import org.mortbay.jetty.security.RunAsToken;
 
 /**
  * @version $Rev$ $Date$
@@ -36,13 +35,8 @@
         this.runAsSubject = runAsSubject;
     }
 
-    //TODO remove??
     public Subject getRunAsSubject() {
         return runAsSubject;
     }
 
-    //TODO   should be setNextCaller() or pushNextCaller?
-    public void setRunAsRole() {
-        ContextManager.setNextCaller(runAsSubject);
-    }
 }

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentity.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentity.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentity.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentity.java Mon Mar  9 05:33:57 2009
@@ -25,65 +25,45 @@
 import java.security.Principal;
 
 import javax.security.jacc.WebRoleRefPermission;
+import javax.security.auth.Subject;
 
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.UserIdentity;
-import org.mortbay.jetty.RunAsToken;
-import org.mortbay.jetty.security.ServerAuthResult;
+import org.mortbay.jetty.server.servlet.ServletHolder;
+import org.mortbay.jetty.server.UserIdentity;
+import org.mortbay.jetty.security.RunAsToken;
 
 /**
  * @version $Rev$ $Date$
  */
 public class GeronimoUserIdentity implements UserIdentity {
 
-    private final ServerAuthResult serverAuthResult;
+    private final Subject subject;
+    private final Principal userPrincipal;
     private final AccessControlContext acc;
     private RunAsToken runAsToken;
     private ServletHolder servletHolder;
 
-    public GeronimoUserIdentity(ServerAuthResult serverAuthResult, AccessControlContext acc) {
-        this.serverAuthResult = serverAuthResult;
+    public GeronimoUserIdentity(Subject subject, Principal userPrincipal, AccessControlContext acc) {
+        this.subject = subject;
+        this.userPrincipal = userPrincipal;
         this.acc = acc;
     }
 
+    public Subject getSubject() {
+        return subject;
+    }
+
     public Principal getUserPrincipal() {
-        return serverAuthResult.getUserPrincipal();
-    }/* ------------------------------------------------------------ */
+        return userPrincipal;
+    }
 
-    public String getAuthMethod() {
-        return serverAuthResult.getAuthMethod();
+    public String[] getRoles() {
+        throw new RuntimeException("Not implemented");
     }
 
-    //jaspi called from Request.isUserInRole and ConstraintSecurityHandler.check
     public boolean isUserInRole(String role) {
-        // JACC v1.0 secion B.19
-        String servletName = servletHolder.getName();
-        if (servletName == null || servletName.equals("jsp")) {
-            servletName = "";
-        }
-        try {
-            acc.checkPermission(new WebRoleRefPermission(servletName, role));
-            return true;
-        } catch (AccessControlException e) {
-            return false;
-        }
-    }/* ------------------------------------------------------------ */
-
-    //jaspi called from ServletHolder.handle, initServlet, doStop and tests
-    public RunAsToken setRunAsRole(RunAsToken newRunAsRole) {
-        RunAsToken oldRunAsToken = runAsToken;
-        ((GeronimoRunAsToken)newRunAsRole).setRunAsRole();
-        runAsToken = newRunAsRole;
-        return oldRunAsToken;
-    }
-
-    public ServletHolder setServletHolder(ServletHolder newServletHolder) {
-        ServletHolder oldServletHolder = servletHolder;
-        this.servletHolder = newServletHolder;
-        return oldServletHolder;
+        throw new RuntimeException("Not implemented");
     }
 
-
     //jaspi called from FormAuthenticator.valueUnbound (when session is unbound)
     //TODO usable???
     public void logout(Principal user) {
@@ -92,4 +72,48 @@
     public AccessControlContext getAccessControlContext() {
         return acc;
     }
+
+//    public RunAsToken getOldRunAsToken() {
+//        throw new RuntimeException("Not implemented");
+//    }
+//
+//    public void setOldRunAsToken(RunAsToken oldRunAsToken) {
+//        throw new RuntimeException("Not implemented");
+//    }
+//
+//    private static class NamedUserIdentity extends GeronimoUserIdentity {
+//        private final String servletName;
+//        private RunAsToken oldRunAsToken;
+//
+//        private NamedUserIdentity(GeronimoUserIdentity gui, String servletName) {
+//            super(gui.subject, gui.userPrincipal, gui.acc);
+//            // JACC v1.0 section B.19
+//            if (servletName == null || servletName.equals("jsp")) {
+//                servletName = "";
+//            }
+//            this.servletName = servletName;
+//        }
+//
+//        public boolean isUserInRole(String role) {
+//            if (servletName == null || servletName.equals("jsp")) {
+//                servletName = "";
+//            }
+//            try {
+//                getAccessControlContext().checkPermission(new WebRoleRefPermission(servletName, role));
+//                return true;
+//            } catch (AccessControlException e) {
+//                return false;
+//            }
+//        }
+//
+//        public RunAsToken getOldRunAsToken() {
+//            return oldRunAsToken;
+//        }
+//
+//        public void setOldRunAsToken(RunAsToken oldRunAsToken) {
+//            this.oldRunAsToken = oldRunAsToken;
+//        }
+//    }
+
+
 }

Added: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java?rev=751587&view=auto
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java (added)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java Mon Mar  9 05:33:57 2009
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.jetty7.handler;
+
+import java.security.AccessControlException;
+import java.security.Principal;
+
+import javax.security.auth.Subject;
+import javax.security.jacc.WebRoleRefPermission;
+
+import org.mortbay.jetty.server.UserIdentity;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class GeronimoUserIdentityWrapper implements UserIdentity {
+
+    private final UserIdentity delegate;
+    private final UserIdentity.Scope scope;
+
+    public GeronimoUserIdentityWrapper(UserIdentity delegate, Scope scope) {
+        this.delegate = delegate;
+        this.scope = scope;
+    }
+
+    public Scope getScope() {
+        return scope;
+    }
+
+    public Subject getSubject() {
+        return delegate.getSubject();
+    }
+
+    public Principal getUserPrincipal() {
+        return delegate.getUserPrincipal();
+    }
+
+    public String[] getRoles() {
+        return delegate.getRoles();
+    }
+
+    public boolean isUserInRole(String role) {
+        if (delegate instanceof GeronimoUserIdentity) {
+            String servletName = scope.getName();
+            if (servletName == null || servletName.equals("jsp")) {
+                servletName = "";
+            }
+            try {
+                ((GeronimoUserIdentity) delegate).getAccessControlContext().checkPermission(new WebRoleRefPermission(servletName, role));
+                return true;
+            } catch (AccessControlException e) {
+                return false;
+            }
+        }
+        //not right... should use default_acc
+        return false;
+    }
+
+    public GeronimoUserIdentityWrapper newWrapper(Scope oldContext) {
+        return new GeronimoUserIdentityWrapper(delegate, oldContext);
+    }
+
+}

Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java Mon Mar  9 05:33:57 2009
@@ -31,7 +31,7 @@
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
 import org.apache.geronimo.connector.outbound.connectiontracking.SharedConnectorInstanceContext;
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
-import org.mortbay.jetty.Handler;
+import org.mortbay.jetty.server.Handler;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java Mon Mar  9 05:33:57 2009
@@ -19,60 +19,84 @@
 import java.io.IOException;
 import java.security.AccessControlContext;
 import java.security.AccessControlException;
-import java.security.Principal;
-import java.util.Map;
+import java.util.Set;
 
-import javax.security.auth.Subject;
-import javax.security.auth.message.config.ServerAuthConfig;
-import javax.security.auth.message.callback.CallerPrincipalCallback;
 import javax.security.jacc.PolicyContext;
 import javax.security.jacc.WebResourcePermission;
 import javax.security.jacc.WebUserDataPermission;
+import javax.security.auth.Subject;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.geronimo.jetty7.JettyContainer;
+import org.apache.geronimo.jetty7.security.JettyIdentityService;
 import org.apache.geronimo.security.Callers;
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.jacc.RunAsSource;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.Response;
-import org.mortbay.jetty.UserIdentity;
-import org.mortbay.jetty.RunAsToken;
-import org.mortbay.jetty.AuthenticationManager;
-import org.mortbay.jetty.security.AbstractSecurityHandler;
-import org.mortbay.jetty.security.ServletCallbackHandler;
-import org.mortbay.jetty.security.SimpleAuthResult;
-import org.mortbay.jetty.security.ServerAuthentication;
-import org.mortbay.jetty.security.ServerAuthResult;
+import org.mortbay.jetty.security.Authenticator;
+import org.mortbay.jetty.security.SecurityHandler;
+import org.mortbay.jetty.security.IdentityService;
+import org.mortbay.jetty.security.LoginService;
+import org.mortbay.jetty.server.Request;
+import org.mortbay.jetty.server.Response;
+import org.mortbay.jetty.server.UserIdentity;
 
-public class JettySecurityHandler extends AbstractSecurityHandler {
+public class JettySecurityHandler extends SecurityHandler {
 
     private final String policyContextID;
-    private final RunAsSource runAsSource;
 
-    //wrong
     private final AccessControlContext default_acc;
 
     public JettySecurityHandler(
             String policyContextID,
             Subject defaultSubject,
             RunAsSource runAsSource,
-            AuthenticationManager serverAuthentication) {
-        setAuthenticationManager(serverAuthentication);
+            Authenticator authenticator,
+            final LoginService loginService) {
+        setAuthenticator(authenticator);
         this.policyContextID = policyContextID;
-        this.runAsSource = runAsSource;
 
-        /**
-         * Register our default principal with the ContextManager
-         */
         if (defaultSubject == null) {
             defaultSubject = ContextManager.EMPTY;
         }
         default_acc = ContextManager.registerSubjectShort(defaultSubject, null, null);
-//        this.defaultPrincipal = generateDefaultPrincipal(defaultSubject);
-
+        final IdentityService identityService = new JettyIdentityService(default_acc, runAsSource);
+//        Authenticator.Configuration configuration = new Authenticator.Configuration() {
+//
+//            public String getAuthMethod() {
+//                //TODO fixme
+//                return null;
+//            }
+//
+//            public String getRealmName() {
+//                //TODO fixme
+//                return null;
+//            }
+//
+//            public boolean isLazy() {
+//                return false;
+//            }
+//
+//            public String getInitParameter(String key) {
+//                return null;
+//            }
+//
+//            public Set<String> getInitParameterNames() {
+//                return null;
+//            }
+//
+//            public LoginService getLoginService() {
+//                return loginService;
+//            }
+//
+//            public IdentityService getIdentityService() {
+//                return identityService;
+//            }
+//        };
+//        authenticator.setConfiguration(configuration);
+        setLoginService(loginService);
+        setIdentityService(identityService);
     }
 
 
@@ -81,6 +105,7 @@
             super.doStop();
         }
         finally {
+            //ignore
         }
     }
 
@@ -107,24 +132,14 @@
         }
     }
 
-    protected UserIdentity newUserIdentity(ServerAuthResult serverAuthResult) {
-        Subject clientSubject = serverAuthResult.getClientSubject();
-        if (clientSubject != null) {
-            AccessControlContext acc = ContextManager.registerSubjectShort(clientSubject, serverAuthResult.getUserPrincipal(), serverAuthResult.getGroups());
-            ContextManager.setCallers(clientSubject, clientSubject);
-            return new GeronimoUserIdentity(serverAuthResult, acc);
-        }
-        return new GeronimoUserIdentity(serverAuthResult, default_acc);
-    }
-
-    protected UserIdentity newSystemUserIdentity() {
-        return new GeronimoUserIdentity(SimpleAuthResult.SUCCESS_UNAUTH_RESULTS, default_acc);
-    }
+//    protected UserIdentity newSystemUserIdentity() {
+//        return new GeronimoUserIdentity(null, null, default_acc);
+//    }
 
-    public RunAsToken newRunAsToken(String runAsRole) {
-        Subject runAsSubject = runAsSource.getSubjectForRole(runAsRole);
-        return new GeronimoRunAsToken(runAsSubject);
-    }
+//    public RunAsToken newRunAsToken(String runAsRole) {
+//        Subject runAsSubject = runAsSource.getSubjectForRole(runAsRole);
+//        return new GeronimoRunAsToken(runAsSubject);
+//    }
 
     protected Object prepareConstraintInfo(String pathInContext, Request request) {
         return null;
@@ -163,6 +178,10 @@
     }
 
     protected boolean checkWebResourcePermissions(String pathInContext, Request request, Response response, Object constraintInfo, UserIdentity userIdentity) throws IOException {
+        if (!(userIdentity instanceof GeronimoUserIdentity) && !(userIdentity instanceof GeronimoUserIdentityWrapper)){
+            //we already checked against default_acc and got false
+            return false;
+        }
         AccessControlContext acc = ((GeronimoUserIdentity)userIdentity).getAccessControlContext();
         return checkWebResourcePermission(request, acc);
     }

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ThreadClassloaderHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ThreadClassloaderHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ThreadClassloaderHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ThreadClassloaderHandler.java Mon Mar  9 05:33:57 2009
@@ -24,7 +24,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mortbay.jetty.Handler;
+import org.mortbay.jetty.server.Handler;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java Mon Mar  9 05:33:57 2009
@@ -26,14 +26,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ErrorHandler;
-import org.mortbay.jetty.handler.SecurityHandler;
-import org.mortbay.jetty.servlet.ServletHandler;
-import org.mortbay.jetty.servlet.SessionHandler;
+import org.mortbay.jetty.server.Handler;
+import org.mortbay.jetty.server.Server;
+import org.mortbay.jetty.server.handler.ErrorHandler;
+import org.mortbay.jetty.security.SecurityHandler;
+import org.mortbay.jetty.server.servlet.ServletHandler;
+import org.mortbay.jetty.server.session.SessionHandler;
 import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.component.LifeCycle;
+import org.mortbay.jetty.util.component.LifeCycle;
 
 /**
  * @version $Rev$ $Date$
@@ -44,7 +44,7 @@
 
 
     public TwistyWebAppContext(SecurityHandler securityHandler, SessionHandler sessionHandler, ServletHandler servletHandler, ErrorHandler errorHandler) {
-        super(securityHandler, sessionHandler, servletHandler, errorHandler);
+        super(sessionHandler, securityHandler, servletHandler, errorHandler);
     }
 
     public void setTwistyHandler(Handler handler) {

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java Mon Mar  9 05:33:57 2009
@@ -30,7 +30,7 @@
 import javax.transaction.SystemException;
 import javax.transaction.UserTransaction;
 
-import org.mortbay.jetty.Handler;
+import org.mortbay.jetty.server.Handler;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/NCSARequestLog.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/NCSARequestLog.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/NCSARequestLog.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/NCSARequestLog.java Mon Mar  9 05:33:57 2009
@@ -21,7 +21,6 @@
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.mortbay.jetty.RequestLog;
 
 /**
  * @version $Rev$ $Date$
@@ -29,14 +28,14 @@
 public class NCSARequestLog implements GBeanLifecycle, JettyRequestLog {
     private final JettyContainer container;
     private final ServerInfo serverInfo;
-    private final RequestLog requestLog;
+    private final org.mortbay.jetty.server.NCSARequestLog requestLog;
     private boolean preferProxiedForAddress;
     private String filename;
 
     public NCSARequestLog(JettyContainer container, ServerInfo serverInfo) {
         this.container = container;
         this.serverInfo = serverInfo;
-        requestLog = new org.mortbay.jetty.NCSARequestLog();
+        requestLog = new org.mortbay.jetty.server.NCSARequestLog();
     }
 
     public void setFilename(String filename) {
@@ -48,56 +47,56 @@
     }
 
     public void setLogDateFormat(String format) {
-        ((org.mortbay.jetty.NCSARequestLog)requestLog).setLogDateFormat(format);
+        requestLog.setLogDateFormat(format);
     }
 
     public String getLogDateFormat() {
-        return ((org.mortbay.jetty.NCSARequestLog)requestLog).getLogDateFormat();
+        return requestLog.getLogDateFormat();
     }
 
     public void setLogTimeZone(String tz) {
-        ((org.mortbay.jetty.NCSARequestLog)requestLog).setLogTimeZone(tz);
+        requestLog.setLogTimeZone(tz);
     }
 
     public String getLogTimeZone() {
-        return ((org.mortbay.jetty.NCSARequestLog)requestLog).getLogTimeZone();
+        return requestLog.getLogTimeZone();
     }
 
     public int getRetainDays() {
-        return ((org.mortbay.jetty.NCSARequestLog)requestLog).getRetainDays();
+        return requestLog.getRetainDays();
     }
 
     public void setRetainDays(int retainDays) {
-        ((org.mortbay.jetty.NCSARequestLog)requestLog).setRetainDays(retainDays);
+        requestLog.setRetainDays(retainDays);
     }
 
     public boolean isExtended() {
-        return ((org.mortbay.jetty.NCSARequestLog)requestLog).isExtended();
+        return requestLog.isExtended();
     }
 
     public void setExtended(boolean e) {
-        ((org.mortbay.jetty.NCSARequestLog)requestLog).setExtended(e);
+        requestLog.setExtended(e);
     }
 
     public boolean isAppend() {
-        return ((org.mortbay.jetty.NCSARequestLog)requestLog).isAppend();
+        return requestLog.isAppend();
     }
 
     public void setAppend(boolean a) {
-        ((org.mortbay.jetty.NCSARequestLog)requestLog).setAppend(a);
+        requestLog.setAppend(a);
     }
 
     public void setIgnorePaths(String[] ignorePaths) {
-        ((org.mortbay.jetty.NCSARequestLog)requestLog).setIgnorePaths(ignorePaths);
+        requestLog.setIgnorePaths(ignorePaths);
     }
 
     public String[] getIgnorePaths() {
-        return ((org.mortbay.jetty.NCSARequestLog)requestLog).getIgnorePaths();
+        return requestLog.getIgnorePaths();
     }
 
     public void setPreferProxiedForAddress(boolean value) {
         this.preferProxiedForAddress = value;
-        ((org.mortbay.jetty.NCSARequestLog)requestLog).setPreferProxiedForAddress(value);
+        requestLog.setPreferProxiedForAddress(value);
     }
 
     public boolean isPreferProxiedForAddress() {
@@ -105,11 +104,11 @@
     }
 
     public String getAbsoluteFilePath() {
-        return requestLog == null ? null : ((org.mortbay.jetty.NCSARequestLog)requestLog).getDatedFilename();
+        return requestLog == null ? null : requestLog.getDatedFilename();
     }
 
     public void doStart() throws Exception {
-        ((org.mortbay.jetty.NCSARequestLog)requestLog).setFilename(serverInfo.resolveServerPath(filename));
+        requestLog.setFilename(serverInfo.resolveServerPath(filename));
         container.setRequestLog(requestLog);
         requestLog.start();
     }

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java Mon Mar  9 05:33:57 2009
@@ -33,13 +33,12 @@
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
+import org.apache.geronimo.jetty7.security.auth.JAASLoginService;
 import org.apache.geronimo.security.jacc.RunAsSource;
-import org.mortbay.jetty.plus.jaas.JAASLoginService;
-import org.mortbay.jetty.security.ServletCallbackHandler;
-import org.mortbay.jetty.security.ServerAuthentication;
+import org.mortbay.jetty.security.Authenticator;
 import org.mortbay.jetty.security.LoginService;
-import org.mortbay.jetty.security.jaspi.JaspiServerAuthentication;
-import org.mortbay.jetty.AuthenticationManager;
+import org.mortbay.jetty.security.jaspi.JaspiAuthenticator;
+import org.mortbay.jetty.security.jaspi.ServletCallbackHandler;
 
 /**
  * Fetches a ServerAuthConfig out of the AuthConfigFactory
@@ -52,7 +51,7 @@
 
     private final Map authConfigProperties = new HashMap<Object, Object>();
     private final Subject serviceSubject = null;
-    private final AuthenticationManager serverAuthentication;
+    private final Authenticator authenticator;
 
 
     public AuthConfigProviderHandlerFactory(@ParamAttribute(name = "messageLayer")String messageLayer,
@@ -67,16 +66,17 @@
             }
         };
         AuthConfigProvider authConfigProvider = authConfigFactory.getConfigProvider(messageLayer, appContext, listener);
-        LoginService loginService = new JAASLoginService(securityRealm);
+        LoginService loginService = new JAASLoginService(securityRealm, null);
         ServletCallbackHandler servletCallbackHandler = new ServletCallbackHandler(loginService);
         ServerAuthConfig serverAuthConfig = authConfigProvider.getServerAuthConfig(messageLayer, appContext, servletCallbackHandler);
         //TODO appContext is supposed to be server-name<space>context-root
-        this.serverAuthentication = new AuthenticationManagerWrapper(new JaspiServerAuthentication(appContext, serverAuthConfig, authConfigProperties, servletCallbackHandler, serviceSubject, allowLazyAuthentication));
+        this.authenticator = new JaspiAuthenticator(appContext, serverAuthConfig, authConfigProperties, servletCallbackHandler, serviceSubject, allowLazyAuthentication);
 
     }
 
     public JettySecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject, RunAsSource runAsSource) {
-        return new JettySecurityHandler(policyContextID, defaultSubject, runAsSource, serverAuthentication);
+        //login service functionality is already inside the servletCallbackHandler
+        return new JettySecurityHandler(policyContextID, defaultSubject, runAsSource, authenticator, null);
     }
 
 }
\ No newline at end of file

Added: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java?rev=751587&view=auto
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java (added)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java Mon Mar  9 05:33:57 2009
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.jetty7.security;
+
+import java.security.Principal;
+import java.security.AccessControlContext;
+import java.util.Arrays;
+
+import javax.security.auth.Subject;
+
+import org.mortbay.jetty.security.IdentityService;
+import org.mortbay.jetty.security.RunAsToken;
+import org.mortbay.jetty.server.UserIdentity;
+import org.apache.geronimo.jetty7.handler.GeronimoUserIdentity;
+import org.apache.geronimo.jetty7.handler.GeronimoRunAsToken;
+import org.apache.geronimo.jetty7.handler.GeronimoUserIdentityWrapper;
+import org.apache.geronimo.security.ContextManager;
+import org.apache.geronimo.security.Callers;
+import org.apache.geronimo.security.jacc.RunAsSource;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JettyIdentityService implements IdentityService<GeronimoUserIdentityWrapper, Callers> {
+
+    private final AccessControlContext defaultAcc;
+    private final RunAsSource runAsSource;
+
+    public JettyIdentityService(AccessControlContext defaultAcc, RunAsSource runAsSource) {
+        this.defaultAcc = defaultAcc;
+        this.runAsSource = runAsSource;
+    }
+
+    public GeronimoUserIdentityWrapper associate(UserIdentity user, UserIdentity.Scope context) {
+        if (user instanceof GeronimoUserIdentityWrapper) {
+            return ((GeronimoUserIdentityWrapper) user).newWrapper(context);
+        } else {
+            return new GeronimoUserIdentityWrapper(user, context);
+        }
+    }
+
+    public void disassociate(GeronimoUserIdentityWrapper source) {
+    }
+
+    public Callers associateRunAs(RunAsToken token) {
+        GeronimoRunAsToken geronimoRunAsToken = (GeronimoRunAsToken) token;
+        Subject runAsSubject = geronimoRunAsToken.getRunAsSubject();
+        return ContextManager.pushNextCaller(runAsSubject);
+    }
+
+    public void disassociateRunAs(Callers previousToken) {
+        ContextManager.popCallers(previousToken);
+    }
+
+    public UserIdentity newUserIdentity(Subject subject, Principal userPrincipal, String[] roles) {
+        if (subject != null) {
+            AccessControlContext acc = ContextManager.registerSubjectShort(subject, userPrincipal, roles == null? null: Arrays.asList(roles));
+            ContextManager.setCallers(subject, subject);
+            return new GeronimoUserIdentity(subject, userPrincipal, acc);
+        }
+        return new GeronimoUserIdentity(null, null, defaultAcc);
+    }
+
+    public RunAsToken newRunAsToken(String runAsName) {
+        Subject runAsSubject = runAsSource.getSubjectForRole(runAsName);
+        return new GeronimoRunAsToken(runAsSubject);
+    }
+
+    public UserIdentity newSystemUserIdentity() {
+        return new GeronimoUserIdentity(null, null, defaultAcc);
+    }
+}

Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java Mon Mar  9 05:33:57 2009
@@ -28,15 +28,15 @@
 import org.apache.geronimo.jetty7.security.auth.JAASLoginService;
 import org.apache.geronimo.security.jacc.RunAsSource;
 import org.mortbay.jetty.security.LoginService;
-import org.mortbay.jetty.security.ServerAuthentication;
-import org.mortbay.jetty.security.authentication.BasicServerAuthentication;
-import org.mortbay.jetty.security.authentication.ClientCertServerAuthentication;
-import org.mortbay.jetty.security.authentication.DigestServerAuthentication;
-import org.mortbay.jetty.security.authentication.FormServerAuthentication;
-import org.mortbay.jetty.security.authentication.SessionCachingServerAuthentication;
+import org.mortbay.jetty.security.Authenticator;
+import org.mortbay.jetty.security.authentication.BasicAuthenticator;
+import org.mortbay.jetty.security.authentication.ClientCertAuthenticator;
+import org.mortbay.jetty.security.authentication.DigestAuthenticator;
+import org.mortbay.jetty.security.authentication.FormAuthenticator;
+import org.mortbay.jetty.security.authentication.SessionCachingAuthenticator;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 @GBean
 public class JettySecurityHandlerFactory implements SecurityHandlerFactory {
@@ -66,20 +66,19 @@
     }
 
     public JettySecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject, RunAsSource runAsSource) {
-        LoginService loginService = new JAASLoginService(securityRealm);
-        ServerAuthentication serverAuthentication;
+        final LoginService loginService = new JAASLoginService(securityRealm, realmName);
+        Authenticator authenticator;
         if (authMethod == BuiltInAuthMethod.BASIC) {
-            serverAuthentication = new BasicServerAuthentication(loginService, realmName);
+            authenticator = new BasicAuthenticator();
         } else if (authMethod == BuiltInAuthMethod.DIGEST) {
-            serverAuthentication = new DigestServerAuthentication(loginService, realmName);
+            authenticator = new DigestAuthenticator();
         } else if (authMethod == BuiltInAuthMethod.CLIENTCERT) {
-            serverAuthentication = new ClientCertServerAuthentication(loginService);
+            authenticator = new ClientCertAuthenticator();
         } else if (authMethod == BuiltInAuthMethod.FORM) {
-            serverAuthentication = new SessionCachingServerAuthentication(new FormServerAuthentication(loginPage, errorPage, loginService));
+            authenticator = new SessionCachingAuthenticator(new FormAuthenticator(loginPage, errorPage));
         } else {
             throw new IllegalStateException("someone added a new BuiltInAuthMethod without telling us");
         }
-
-        return new JettySecurityHandler(policyContextID, defaultSubject, runAsSource, new AuthenticationManagerWrapper(serverAuthentication));
+        return new JettySecurityHandler(policyContextID, defaultSubject, runAsSource, authenticator, loginService);
     }
 }

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthConfigGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthConfigGBean.java?rev=751587&r1=751586&r2=751587&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthConfigGBean.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthConfigGBean.java Mon Mar  9 05:33:57 2009
@@ -29,10 +29,10 @@
 
 import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
 import org.apache.geronimo.security.jacc.RunAsSource;
-import org.mortbay.jetty.security.ServletCallbackHandler;
-import org.mortbay.jetty.security.jaspi.JaspiServerAuthentication;
+import org.mortbay.jetty.security.jaspi.ServletCallbackHandler;
+import org.mortbay.jetty.security.jaspi.JaspiAuthenticator;
 import org.mortbay.jetty.security.jaspi.SimpleAuthConfig;
-import org.mortbay.jetty.AuthenticationManager;
+import org.mortbay.jetty.security.Authenticator;
 
 /**
  * Wraps a supplied ServerAuthContext in a ServerAuthConfig instance.  Mostly for testing...
@@ -43,17 +43,18 @@
 
     private Map authConfigProperties = new HashMap<Object, Object>();
     private Subject serviceSubject = null;
-    private final AuthenticationManager serverAuthentication;
+    private final Authenticator serverAuthentication;
 
 
     public ServerAuthConfigGBean(ServletCallbackHandler servletCallbackHandler, ServerAuthContext serverAuthContext, String appContext, boolean allowLazyAuthentication) {
         ServerAuthConfig serverAuthConfig = new SimpleAuthConfig(null, serverAuthContext);
         //TODO appContext is supposed to be server-name<space>context-root
-        this.serverAuthentication = new AuthenticationManagerWrapper(new JaspiServerAuthentication(appContext, serverAuthConfig, authConfigProperties, servletCallbackHandler, serviceSubject, allowLazyAuthentication));
+        this.serverAuthentication = new JaspiAuthenticator(appContext, serverAuthConfig, authConfigProperties, servletCallbackHandler, serviceSubject, allowLazyAuthentication);
     }
 
     public JettySecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject, RunAsSource runAsSource) {
-        return new JettySecurityHandler(policyContextID, defaultSubject, runAsSource, serverAuthentication);
+        //login service functionality is already inside the servletCallbackHandler
+        return new JettySecurityHandler(policyContextID, defaultSubject, runAsSource, serverAuthentication, null);
     }
 
 }



Mime
View raw message