dlestrat 2004/10/03 17:15:08
Modified: components/security/src/test/org/apache/jetspeed/security
AbstractSecurityTestcase.java
Log:
http://nagoya.apache.org/jira/browse/JS2-133
Revision Changes Path
1.6 +23 -5
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/AbstractSecurityTestcase.java
Index: AbstractSecurityTestcase.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/AbstractSecurityTestcase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractSecurityTestcase.java 2 Oct 2004 23:05:48 -0000 1.5
+++ AbstractSecurityTestcase.java 4 Oct 2004 00:15:08 -0000 1.6
@@ -17,12 +17,15 @@
import
org.apache.jetspeed.components.persistence.store.util.PersistenceSupportedTestCase;
import org.apache.jetspeed.prefs.impl.PreferencesProviderImpl;
import org.apache.jetspeed.security.impl.AuthenticationProviderImpl;
+import org.apache.jetspeed.security.impl.AuthorizationProviderImpl;
import org.apache.jetspeed.security.impl.GroupManagerImpl;
+import org.apache.jetspeed.security.impl.LoginModuleProxyImpl;
import org.apache.jetspeed.security.impl.PermissionManagerImpl;
import org.apache.jetspeed.security.impl.RdbmsPolicy;
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;
@@ -63,6 +66,9 @@
/** SPI Default Security Mapping Handler. */
protected SecurityMappingHandler smh;
+ /** The user security provider. */
+ protected UserSecurityProvider userSecurityProvider;
+
/** The security provider. */
protected SecurityProvider securityProvider;
@@ -89,20 +95,32 @@
prefsProvider = new PreferencesProviderImpl(persistenceStore,
"org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl", false);
prefsProvider.start();
+ // SPI Security handlers.
cq = new CommonQueries(persistenceStore);
ch = new DefaultCredentialHandler(cq);
ush = new DefaultUserSecurityHandler(cq);
rsh = new DefaultRoleSecurityHandler(cq);
gsh = new DefaultGroupSecurityHandler(cq);
smh = new DefaultSecurityMappingHandler(cq);
- pms = new PermissionManagerImpl(persistenceStore);
- Policy policy = new RdbmsPolicy(pms);
- securityProvider = new SecurityProviderImpl(policy, ch, ush, rsh, gsh, smh);
+
+ // Security Providers.
+ List userSecurityHandlers = new ArrayList();
+ userSecurityHandlers.add(ush);
+ userSecurityProvider = new UserSecurityProviderImpl(userSecurityHandlers);
+
+ securityProvider = new SecurityProviderImpl(ch, userSecurityProvider, rsh,
gsh, smh);
ums = new UserManagerImpl(securityProvider);
gms = new GroupManagerImpl(securityProvider);
rms = new RoleManagerImpl(securityProvider);
- new AuthenticationProviderImpl("login.conf", ums);
+ // Authentication.
+ new LoginModuleProxyImpl(ums);
+ new AuthenticationProviderImpl("login.conf");
+
+ // Authorization.
+ pms = new PermissionManagerImpl(persistenceStore);
+ Policy policy = new RdbmsPolicy(pms);
+ new AuthorizationProviderImpl(policy);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
