geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r789622 [2/2] - in /geronimo/server/trunk/plugins/jetty7: geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/ geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/ ge...
Date Tue, 30 Jun 2009 08:51:32 GMT
Copied: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoWebAppContext.java
(from r788556, geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoWebAppContext.java?p2=geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoWebAppContext.java&p1=geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java&r1=788556&r2=789622&rev=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoWebAppContext.java
Tue Jun 30 08:51:31 2009
@@ -25,35 +25,28 @@
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.naming.Context;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.resource.ResourceException;
 
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.DispatcherType;
 import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.servlet.ServletHandler;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.util.component.LifeCycle;
-import org.apache.geronimo.naming.java.RootContext;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
 import org.apache.geronimo.connector.outbound.connectiontracking.SharedConnectorInstanceContext;
 
 /**
  * @version $Rev$ $Date$
  */
-public class TwistyWebAppContext extends WebAppContext {
+public class GeronimoWebAppContext extends WebAppContext {
 
     private Handler handler;
     protected final IntegrationContext integrationContext;
 
 
-    public TwistyWebAppContext(SecurityHandler securityHandler, SessionHandler sessionHandler,
ServletHandler servletHandler, ErrorHandler errorHandler, IntegrationContext integrationContext,
ClassLoader classLoader) {
+    public GeronimoWebAppContext(SecurityHandler securityHandler, SessionHandler sessionHandler,
ServletHandler servletHandler, ErrorHandler errorHandler, IntegrationContext integrationContext,
ClassLoader classLoader) {
         super(sessionHandler, securityHandler, servletHandler, errorHandler);
         this.integrationContext = integrationContext;
         setClassLoader(classLoader);
@@ -130,51 +123,51 @@
     private class TwistyHandler implements Handler {
 
         public void handle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
-            TwistyWebAppContext.super.doHandle(target, baseRequest, request, response);
+            GeronimoWebAppContext.super.doHandle(target, baseRequest, request, response);
         }
 
         public void setServer(Server server) {
-             TwistyWebAppContext.super.setServer(server);
+             GeronimoWebAppContext.super.setServer(server);
         }
 
         public Server getServer() {
-            return TwistyWebAppContext.super.getServer();
+            return GeronimoWebAppContext.super.getServer();
         }
 
         public void destroy() {
-            TwistyWebAppContext.super.destroy();
+            GeronimoWebAppContext.super.destroy();
         }
 
         public void start() throws Exception {
-            TwistyWebAppContext.super.start();
+            GeronimoWebAppContext.super.start();
         }
 
         public void stop() throws Exception {
-            TwistyWebAppContext.super.stop();
+            GeronimoWebAppContext.super.stop();
         }
 
         public boolean isRunning() {
-            return TwistyWebAppContext.super.isRunning();
+            return GeronimoWebAppContext.super.isRunning();
         }
 
         public boolean isStarted() {
-            return TwistyWebAppContext.super.isStarted();
+            return GeronimoWebAppContext.super.isStarted();
         }
 
         public boolean isStarting() {
-            return TwistyWebAppContext.super.isStarting();
+            return GeronimoWebAppContext.super.isStarting();
         }
 
         public boolean isStopping() {
-            return TwistyWebAppContext.super.isStopping();
+            return GeronimoWebAppContext.super.isStopping();
         }
 
         public boolean isStopped() {
-            return TwistyWebAppContext.super.isStopped();
+            return GeronimoWebAppContext.super.isStopped();
         }
 
         public boolean isFailed() {
-            return TwistyWebAppContext.super.isFailed();
+            return GeronimoWebAppContext.super.isFailed();
         }
 
         public void addLifeCycleListener(Listener listener) {

Propchange: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoWebAppContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoWebAppContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoWebAppContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InjectionServletHandler.java
(from r788556, geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InjectionServletHandler.java?p2=geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InjectionServletHandler.java&p1=geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java&r1=788556&r2=789622&rev=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InjectionServletHandler.java
Tue Jun 30 08:51:31 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty7;
+package org.apache.geronimo.jetty7.handler;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

Copied: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JaccSecurityHandler.java
(from r788556, geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JaccSecurityHandler.java?p2=geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JaccSecurityHandler.java&p1=geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java&r1=788556&r2=789622&rev=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JaccSecurityHandler.java
Tue Jun 30 08:51:31 2009
@@ -38,13 +38,13 @@
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.UserIdentity;
 
-public class JettySecurityHandler extends SecurityHandler {
+public class JaccSecurityHandler extends SecurityHandler {
 
     private final String policyContextID;
 
     private final AccessControlContext defaultAcc;
 
-    public JettySecurityHandler(
+    public JaccSecurityHandler(
             String policyContextID,
             Authenticator authenticator,
             final LoginService loginService,

Propchange: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JaccSecurityHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JaccSecurityHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JaccSecurityHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java?rev=789622&r1=789621&r2=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java
Tue Jun 30 08:51:31 2009
@@ -34,7 +34,7 @@
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamReference;
-import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
+import org.apache.geronimo.jetty7.handler.JaccSecurityHandler;
 import org.apache.geronimo.jetty7.security.auth.JAASLoginService;
 import org.apache.geronimo.security.jacc.RunAsSource;
 import org.apache.geronimo.security.ContextManager;
@@ -42,6 +42,7 @@
 import org.eclipse.jetty.security.Authenticator;
 import org.eclipse.jetty.security.LoginService;
 import org.eclipse.jetty.security.IdentityService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.jaspi.JaspiAuthenticator;
 import org.eclipse.jetty.security.jaspi.ServletCallbackHandler;
 
@@ -87,7 +88,7 @@
 
     }
 
-    public JettySecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject,
RunAsSource runAsSource) {
+    public SecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject,
RunAsSource runAsSource) {
         if (defaultSubject == null) {
             defaultSubject = ContextManager.EMPTY;
         }
@@ -96,7 +97,7 @@
         authConfigProperties.put(POLICY_CONTEXT_ID_KEY, policyContextID);
         Authenticator authenticator = new JaspiAuthenticator(serverAuthConfig, authConfigProperties,
servletCallbackHandler, serviceSubject, allowLazyAuthentication, identityService);
         //login service functionality is already inside the servletCallbackHandler
-        return new JettySecurityHandler(policyContextID, authenticator, loginService, identityService,
defaultAcc);
+        return new JaccSecurityHandler(policyContextID, authenticator, loginService, identityService,
defaultAcc);
     }
 
 }
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java?rev=789622&r1=789621&r2=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
Tue Jun 30 08:51:31 2009
@@ -21,13 +21,15 @@
 package org.apache.geronimo.jetty7.security;
 
 import java.security.AccessControlContext;
+import java.security.Permission;
 
 import javax.security.auth.Subject;
 
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamReference;
-import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
+import org.apache.geronimo.jetty7.handler.JaccSecurityHandler;
+import org.apache.geronimo.jetty7.handler.EJBWebServiceSecurityHandler;
 import org.apache.geronimo.jetty7.security.auth.JAASLoginService;
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.jaas.ConfigurationFactory;
@@ -35,6 +37,7 @@
 import org.eclipse.jetty.security.Authenticator;
 import org.eclipse.jetty.security.IdentityService;
 import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.authentication.BasicAuthenticator;
 import org.eclipse.jetty.security.authentication.ClientCertAuthenticator;
 import org.eclipse.jetty.security.authentication.DigestAuthenticator;
@@ -53,10 +56,10 @@
     private final String realmName;
     private final ConfigurationFactory configurationFactory;
 
-    public JettySecurityHandlerFactory(@ParamAttribute(name = "authMethod")BuiltInAuthMethod
authMethod,
-                                       @ParamAttribute(name = "loginPage")String loginPage,
-                                       @ParamAttribute(name = "errorPage")String errorPage,
-                                       @ParamAttribute(name = "realmName")String realmName,
+    public JettySecurityHandlerFactory(@ParamAttribute(name = "authMethod") BuiltInAuthMethod
authMethod,
+                                       @ParamAttribute(name = "loginPage") String loginPage,
+                                       @ParamAttribute(name = "errorPage") String errorPage,
+                                       @ParamAttribute(name = "realmName") String realmName,
                                        @ParamReference(name = "ConfigurationFactory") ConfigurationFactory
configurationFactory) {
         if (authMethod == null) {
             throw new NullPointerException("authMethod required");
@@ -71,8 +74,26 @@
         this.configurationFactory = configurationFactory;
     }
 
-    public JettySecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject,
RunAsSource runAsSource) {
+    public SecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject,
RunAsSource runAsSource) {
         final LoginService loginService = new JAASLoginService(configurationFactory, realmName);
+        Authenticator authenticator = buildAuthenticator();
+        if (defaultSubject == null) {
+            defaultSubject = ContextManager.EMPTY;
+        }
+        AccessControlContext defaultAcc = ContextManager.registerSubjectShort(defaultSubject,
null, null);
+        IdentityService identityService = new JettyIdentityService(defaultAcc, runAsSource);
+        return new JaccSecurityHandler(policyContextID, authenticator, loginService, identityService,
defaultAcc);
+    }
+
+    public SecurityHandler buildEJBSecurityHandler(Permission permission) {
+        final LoginService loginService = new JAASLoginService(configurationFactory, realmName);
+        Authenticator authenticator = buildAuthenticator();
+        AccessControlContext defaultAcc = ContextManager.registerSubjectShort(ContextManager.EMPTY,
null, null);
+        IdentityService identityService = new JettyIdentityService(defaultAcc, null);
+        return new EJBWebServiceSecurityHandler(authenticator, loginService, identityService,
permission);
+    }
+
+    private Authenticator buildAuthenticator() {
         Authenticator authenticator;
         if (authMethod == BuiltInAuthMethod.BASIC) {
             authenticator = new BasicAuthenticator();
@@ -85,11 +106,6 @@
         } else {
             throw new IllegalStateException("someone added a new BuiltInAuthMethod without
telling us");
         }
-        if (defaultSubject == null) {
-            defaultSubject = ContextManager.EMPTY;
-        }
-        AccessControlContext defaultAcc = ContextManager.registerSubjectShort(defaultSubject,
null, null);
-        IdentityService identityService = new JettyIdentityService(defaultAcc, runAsSource);
-        return new JettySecurityHandler(policyContextID, authenticator, loginService, identityService,
defaultAcc);
+        return authenticator;
     }
 }

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/SecurityHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/SecurityHandlerFactory.java?rev=789622&r1=789621&r2=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/SecurityHandlerFactory.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/SecurityHandlerFactory.java
Tue Jun 30 08:51:31 2009
@@ -22,14 +22,14 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
 import org.apache.geronimo.security.jacc.RunAsSource;
+import org.eclipse.jetty.security.SecurityHandler;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public interface SecurityHandlerFactory {
 
-    JettySecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject,
RunAsSource runAsSource);
+    SecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject,
RunAsSource runAsSource);
 
 }

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java?rev=789622&r1=789621&r2=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
Tue Jun 30 08:51:31 2009
@@ -91,7 +91,7 @@
         staticContentServletInitParams.put("redirectWelcome", "false");
         staticContentServletInitParams.put("minGzipLength", "8192");
 
-        new JettyServletHolder("test:name=staticservlet",
+        new ServletHolderWrapper("test:name=staticservlet",
                 "default",
                 "org.eclipse.jetty.servlet.DefaultServlet",
                 null,
@@ -103,7 +103,7 @@
 
     }
 
-    protected JettyWebAppContext setUpAppContext(String securityRealmName, SecurityHandlerFactory
securityHandlerFactory, String policyContextId, RunAsSource runAsSource, String uriString)
throws Exception {
+    protected WebAppContextWrapper setUpAppContext(String securityRealmName, SecurityHandlerFactory
securityHandlerFactory, String policyContextId, RunAsSource runAsSource, String uriString)
throws Exception {
 
         if (securityHandlerFactory == null) {
             Permissions unchecked = new Permissions();
@@ -134,7 +134,7 @@
             }, loginService, false);
         }
         String contextPath = "/test";
-        JettyWebAppContext app = new JettyWebAppContext(null,
+        WebAppContextWrapper app = new WebAppContextWrapper(null,
                 contextPath,
                 null,
                 Collections.<String, Object>emptyMap(),
@@ -171,7 +171,7 @@
         return app;
     }
 
-    protected JettyWebAppContext setUpSecureAppContext(String securityRealmName, Map<String,
SubjectInfo> roleDesignates, Map<Principal, Set<String>> principalRoleMap,
ComponentPermissions componentPermissions, SubjectInfo defaultSubjectInfo, PermissionCollection
checked, Set securityRoles) throws Exception {
+    protected WebAppContextWrapper setUpSecureAppContext(String securityRealmName, Map<String,
SubjectInfo> roleDesignates, Map<Principal, Set<String>> principalRoleMap,
ComponentPermissions componentPermissions, SubjectInfo defaultSubjectInfo, PermissionCollection
checked, Set securityRoles) throws Exception {
         String policyContextId = "TEST";
         ApplicationPolicyConfigurationManager jacc = setUpJACC(roleDesignates, principalRoleMap,
componentPermissions, policyContextId);
         LoginService loginService = newLoginService();

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ApplicationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ApplicationTest.java?rev=789622&r1=789621&r2=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ApplicationTest.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ApplicationTest.java
Tue Jun 30 08:51:31 2009
@@ -37,7 +37,7 @@
 public class ApplicationTest extends AbstractWebModuleTest {
 
     public void testApplication() throws Exception {
-        JettyWebAppContext app = setUpAppContext(null, null, "policyContextID", null, "war1/");
+        WebAppContextWrapper app = setUpAppContext(null, null, "policyContextID", null, "war1/");
 
         setUpStaticContentServlet(app);
 
@@ -51,7 +51,7 @@
     public void testApplicationWithSessionHandler() throws Exception {
         preHandlerFactory = new MockPreHandlerFactory();
         sessionHandlerFactory = new MockSessionHandlerFactory();
-        JettyWebAppContext app = setUpAppContext(null, null, "policyContextID", null, "war1/");
+        WebAppContextWrapper app = setUpAppContext(null, null, "policyContextID", null, "war1/");
 
         setUpStaticContentServlet(app);
 

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/GBeanInfoTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/GBeanInfoTest.java?rev=789622&r1=789621&r2=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/GBeanInfoTest.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/GBeanInfoTest.java
Tue Jun 30 08:51:31 2009
@@ -29,8 +29,8 @@
 public class GBeanInfoTest extends TestCase {
 
     public void testJettyPOJOWebServiceHolder() throws Exception {
-        new AnnotationGBeanInfoFactory().getGBeanInfo(JettyPOJOWebServiceHolder.class);
-//        new JettyPOJOWebServiceHolder();
+        new AnnotationGBeanInfoFactory().getGBeanInfo(POJOWebServiceHolderWrapper.class);
+//        new POJOWebServiceHolderWrapper();
     }
 
     public void testJettyContainerImpl() throws Exception {

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java?rev=789622&r1=789621&r2=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java
Tue Jun 30 08:51:31 2009
@@ -154,7 +154,7 @@
     }
 
     protected void startWebApp(Map<String, SubjectInfo> roleDesignates, Map<Principal,
Set<String>> principalRoleMap, ComponentPermissions componentPermissions, SubjectInfo
defaultSubjectInfo, PermissionCollection checked, Set securityRoles) throws Exception {
-        JettyWebAppContext app = setUpSecureAppContext(securityRealmName, roleDesignates,
principalRoleMap, componentPermissions, defaultSubjectInfo, checked, securityRoles);
+        WebAppContextWrapper app = setUpSecureAppContext(securityRealmName, roleDesignates,
principalRoleMap, componentPermissions, defaultSubjectInfo, checked, securityRoles);
         setUpStaticContentServlet(app);
 //        start(appName, app);
     }

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java?rev=789622&r1=789621&r2=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java
Tue Jun 30 08:51:31 2009
@@ -83,7 +83,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        JettyWebAppContext app;
+        WebAppContextWrapper app;
         app = setUpAppContext(null, null, "policyContextID", null, "war1/");
         setUpStaticContentServlet(app);
     }

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java?rev=789622&r1=789621&r2=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java
Tue Jun 30 08:51:31 2009
@@ -26,12 +26,13 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
+import org.apache.geronimo.jetty7.handler.JaccSecurityHandler;
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.jacc.RunAsSource;
 import org.eclipse.jetty.security.Authenticator;
 import org.eclipse.jetty.security.IdentityService;
 import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.authentication.DeferredAuthenticator;
 
 /**
@@ -55,13 +56,13 @@
         this.loginService = loginService;
     }
 
-    public JettySecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject,
RunAsSource runAsSource) {
+    public SecurityHandler buildSecurityHandler(String policyContextID, Subject defaultSubject,
RunAsSource runAsSource) {
         if (defaultSubject == null) {
             defaultSubject = ContextManager.EMPTY;
         }
         AccessControlContext defaultAcc = ContextManager.registerSubjectShort(defaultSubject,
null, null);
         IdentityService identityService = new JettyIdentityService(defaultAcc, runAsSource);
-        return new JettySecurityHandler(policyContextID, authenticator, loginService, identityService,
defaultAcc);
+        return new JaccSecurityHandler(policyContextID, authenticator, loginService, identityService,
defaultAcc);
     }
 
 }
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/plan/plan.xml?rev=789622&r1=789621&r2=789622&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7-deployer/src/main/plan/plan.xml Tue Jun 30
08:51:31 2009
@@ -149,7 +149,7 @@
         </xml-attribute>
     </gbean>
 
-    <gbean name="StaticContent" class="org.apache.geronimo.jetty7.JettyDefaultServletHolder">
+    <gbean name="StaticContent" class="org.apache.geronimo.jetty7.DefaultServletHolderWrapper">
         <attribute name="servletName">default</attribute>
         <attribute name="servletClass">org.eclipse.jetty.servlet.DefaultServlet</attribute>
         <attribute name="loadOnStartup">0</attribute>
@@ -164,7 +164,7 @@
         <attribute name="servletMappings">/</attribute>
     </gbean>
 
-    <gbean name="JSPServlet" class="org.apache.geronimo.jetty7.JettyJspServletHolder">
+    <gbean name="JSPServlet" class="org.apache.geronimo.jetty7.JspServletHolderWrapper">
         <attribute name="servletName">jsp</attribute>
         <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
         <attribute name="loadOnStartup">0</attribute>
@@ -178,7 +178,7 @@
         <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
     </gbean>
 
-    <gbean name="POJOTemplate" class="org.apache.geronimo.jetty7.JettyPOJOWebServiceHolder">
+    <gbean name="POJOTemplate" class="org.apache.geronimo.jetty7.POJOWebServiceHolderWrapper">
         <attribute name="servletName">dummy</attribute>
     </gbean>
 



Mime
View raw message