dlestrat    2004/10/11 16:26:06

  Modified:    portal/src/test/org/apache/jetspeed/userinfo
                        TestUserInfoManager.java
  Log:
  http://nagoya.apache.org/jira/browse/JS2-133#action_53917
  
  Revision  Changes    Path
  1.16      +9 -7      
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
  
  Index: TestUserInfoManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- TestUserInfoManager.java  4 Oct 2004 00:15:50 -0000       1.15
  +++ TestUserInfoManager.java  11 Oct 2004 23:26:06 -0000      1.16
  @@ -35,18 +35,20 @@
   import org.apache.jetspeed.prefs.PropertyException;
   import org.apache.jetspeed.prefs.om.Property;
   import org.apache.jetspeed.request.RequestContext;
  +import org.apache.jetspeed.security.AuthenticationProvider;
  +import org.apache.jetspeed.security.AuthenticationProviderProxy;
   import org.apache.jetspeed.security.SecurityException;
   import org.apache.jetspeed.security.SecurityHelper;
   import org.apache.jetspeed.security.SecurityProvider;
   import org.apache.jetspeed.security.User;
   import org.apache.jetspeed.security.UserManager;
  -import org.apache.jetspeed.security.UserSecurityProvider;
  +import org.apache.jetspeed.security.impl.AuthenticationProviderImpl;
  +import org.apache.jetspeed.security.impl.AuthenticationProviderProxyImpl;
   import org.apache.jetspeed.security.impl.GroupManagerImpl;
   import org.apache.jetspeed.security.impl.PermissionManagerImpl;
   import org.apache.jetspeed.security.impl.RoleManagerImpl;
   import org.apache.jetspeed.security.impl.SecurityProviderImpl;
   import org.apache.jetspeed.security.impl.UserManagerImpl;
  -import org.apache.jetspeed.security.impl.UserSecurityProviderImpl;
   import org.apache.jetspeed.security.spi.CredentialHandler;
   import org.apache.jetspeed.security.spi.GroupSecurityHandler;
   import org.apache.jetspeed.security.spi.RoleSecurityHandler;
  @@ -113,11 +115,11 @@
           SecurityMappingHandler smh = new DefaultSecurityMappingHandler(cq);
           
           // Security Providers.
  -        List userSecurityHandlers = new ArrayList();
  -        userSecurityHandlers.add(ush);
  -        UserSecurityProvider userSecurityProvider = new 
UserSecurityProviderImpl(userSecurityHandlers);
  -        
  -        SecurityProvider securityProvider = new SecurityProviderImpl(ch, 
userSecurityProvider, rsh, gsh, smh);
  +        AuthenticationProvider atnProvider = new 
AuthenticationProviderImpl("DefaultAuthenticator", "The default authenticator", 
"login.conf", ch, ush);
  +        List atnProviders = new ArrayList();
  +        atnProviders.add(atnProvider);
  +        AuthenticationProviderProxy atnProviderProxy = new 
AuthenticationProviderProxyImpl(atnProviders, "DefaultAuthenticator");
  +        SecurityProvider securityProvider = new 
SecurityProviderImpl(atnProviderProxy, rsh, gsh, smh);
           
           ums = new UserManagerImpl(securityProvider);
           gms = new GroupManagerImpl(securityProvider);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to