geronimo-scm mailing list archives

Author: djencks
Date: Mon Aug  3 18:44:24 2009
New Revision: 800490

URL: http://svn.apache.org/viewvc?rev=800490&view=rev
Log:
Update to jetty7 api changes

Modified:
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java

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=800490&r1=800489&r2=800490&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
Mon Aug  3 18:44:24 2009
@@ -43,7 +43,6 @@
 import org.eclipse.jetty.security.authentication.ClientCertAuthenticator;
 import org.eclipse.jetty.security.authentication.DigestAuthenticator;
 import org.eclipse.jetty.security.authentication.FormAuthenticator;
-import org.eclipse.jetty.security.authentication.SessionCachingAuthenticator;
 
 /**
  * @version $Rev$ $Date$
@@ -99,7 +98,8 @@
         } else if (authMethod == BuiltInAuthMethod.CLIENTCERT) {
             authenticator = new ClientCertAuthenticator();
         } else if (authMethod == BuiltInAuthMethod.FORM) {
-            authenticator = new SessionCachingAuthenticator(new FormAuthenticator(loginPage,
errorPage));
+            boolean dispatch = true;
+            authenticator = new FormAuthenticator(loginPage, errorPage, dispatch);
         } else if (authMethod == BuiltInAuthMethod.NONE) {
             authenticator = new NoneAuthenticator();
         } else {

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java?rev=800490&r1=800489&r2=800490&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
Mon Aug  3 18:44:24 2009
@@ -76,6 +76,10 @@
         }
     }
 
+    public boolean validate(UserIdentity user) {
+        return false;
+    }
+
     public IdentityService getIdentityService() {
         return identityService;
     }

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=800490&r1=800489&r2=800490&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
Mon Aug  3 18:44:24 2009
@@ -64,7 +64,6 @@
 import org.eclipse.jetty.security.Authenticator;
 import org.eclipse.jetty.security.IdentityService;
 import org.eclipse.jetty.security.UserAuthentication;
-import org.eclipse.jetty.security.authentication.SessionCachingAuthenticator;
 import org.eclipse.jetty.security.authentication.FormAuthenticator;
 
 
@@ -131,7 +130,7 @@
                     return null;
                 }
 
-            }, loginService, false);
+            }, loginService);
         }
         String contextPath = "/test";
         WebAppContextWrapper app = new WebAppContextWrapper(null,
@@ -175,9 +174,8 @@
         String policyContextId = "TEST";
         ApplicationPolicyConfigurationManager jacc = setUpJACC(roleDesignates, principalRoleMap,
componentPermissions, policyContextId);
         LoginService loginService = newLoginService();
-        FormAuthenticator authenticator = new FormAuthenticator("/auth/logon.html?param=test",
"/auth/logonError.html?param=test");
-        Authenticator serverAuthentication = new SessionCachingAuthenticator(authenticator);
-        SecurityHandlerFactory securityHandlerFactory = new ServerAuthenticationGBean(serverAuthentication,
loginService, false);
+        Authenticator serverAuthentication = new FormAuthenticator("/auth/logon.html?param=test",
"/auth/logonError.html?param=test", true);
+        SecurityHandlerFactory securityHandlerFactory = new ServerAuthenticationGBean(serverAuthentication,
loginService);
         return setUpAppContext(
                 securityRealmName,
                 securityHandlerFactory,
@@ -295,6 +293,10 @@
             return null;
         }
 
+        public boolean validate(UserIdentity user) {
+            return false;
+        }
+
         public void logout(UserIdentity user) {
         }
 

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=800490&r1=800489&r2=800490&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
Mon Aug  3 18:44:24 2009
@@ -33,7 +33,6 @@
 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;
 
 /**
  * Wraps a supplied ServerAuthentication in a AuthenticationManager instance.  Mostly for
testing...
@@ -48,10 +47,7 @@
     private final LoginService loginService;
 
 
-    public ServerAuthenticationGBean(Authenticator authenticator, LoginService loginService,
boolean allowLazyAuthentication) {
-        if (allowLazyAuthentication) {
-            authenticator = new DeferredAuthenticator(authenticator);
-        }
+    public ServerAuthenticationGBean(Authenticator authenticator, LoginService loginService)
{
         this.authenticator = authenticator;
         this.loginService = loginService;
     }