From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Fri, 18 Dec 2009 21:45:16 +0000 (+0000)
Subject: NOJIRA - name change for DBLoginModule, removed need for pricipalclass in getTenant... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=aaf2db15bcceea93d741723c4584175c53900eef;p=tmp%2Fjakarta-migration.git

NOJIRA - name change for DBLoginModule, removed need for pricipalclass in getTenant method
test: security test

D    services/authentication/service/src/main/java/org/collectionspace/authentication/CSpaceDBLoginModule.java
A  + services/authentication/service/src/main/java/org/collectionspace/authentication/CSpaceJBossDBLoginModule.java
M    services/authentication/service/src/main/java/org/collectionspace/authentication/DatabaseRealm.java
M    services/authentication/service/src/main/resources/config/jboss-login-config.xml
---

diff --git a/services/authentication/service/src/main/java/org/collectionspace/authentication/CSpaceDBLoginModule.java b/services/authentication/service/src/main/java/org/collectionspace/authentication/CSpaceJBossDBLoginModule.java
similarity index 94%
rename from services/authentication/service/src/main/java/org/collectionspace/authentication/CSpaceDBLoginModule.java
rename to services/authentication/service/src/main/java/org/collectionspace/authentication/CSpaceJBossDBLoginModule.java
index d79b54ff8..884cbf2fd 100644
--- a/services/authentication/service/src/main/java/org/collectionspace/authentication/CSpaceDBLoginModule.java
+++ b/services/authentication/service/src/main/java/org/collectionspace/authentication/CSpaceJBossDBLoginModule.java
@@ -38,7 +38,7 @@ import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
  * CollectionSpace default identity provider supporting multi-tenancy
  * @author
  */
-public class CSpaceDBLoginModule extends UsernamePasswordLoginModule {
+public class CSpaceJBossDBLoginModule extends UsernamePasswordLoginModule {
 
     private DatabaseRealm realm;
 
@@ -96,7 +96,6 @@ public class CSpaceDBLoginModule extends UsernamePasswordLoginModule {
                 "org.jboss.security.SimpleGroup");
 
         Collection<Group> tenants = realm.getTenants(username,
-                "org.collectionspace.authentication.CSpacePrincipal",
                 "org.jboss.security.SimpleGroup");
 
         List<Group> all = new ArrayList<Group>();
diff --git a/services/authentication/service/src/main/java/org/collectionspace/authentication/DatabaseRealm.java b/services/authentication/service/src/main/java/org/collectionspace/authentication/DatabaseRealm.java
index 39147afd2..5d1f265a0 100644
--- a/services/authentication/service/src/main/java/org/collectionspace/authentication/DatabaseRealm.java
+++ b/services/authentication/service/src/main/java/org/collectionspace/authentication/DatabaseRealm.java
@@ -279,7 +279,7 @@ public class DatabaseRealm {
      * the authenticated user.
      * @return collection containing the roles
      */
-    Collection<Group> getTenants(String username, String principalClassName, String groupClassName) throws LoginException {
+    Collection<Group> getTenants(String username, String groupClassName) throws LoginException {
 
         if (log.isDebugEnabled()) {
             log.debug("getTenants using tenantsQuery: " + tenantsQuery + ", username: " + username);
diff --git a/services/authentication/service/src/main/resources/config/jboss-login-config.xml b/services/authentication/service/src/main/resources/config/jboss-login-config.xml
index 53fd571c3..e5b0f7b81 100644
--- a/services/authentication/service/src/main/resources/config/jboss-login-config.xml
+++ b/services/authentication/service/src/main/resources/config/jboss-login-config.xml
@@ -18,7 +18,7 @@ copy before the "other" application-policy
 
 <application-policy name="cspace">
     <authentication>
-        <login-module code="org.collectionspace.authentication.CSpaceDBLoginModule"
+        <login-module code="org.collectionspace.authentication.CSpaceJBossDBLoginModule"
                       flag="required">
             <module-option name="dsJndiName">CspaceDS</module-option>
             <module-option name="hashAlgorithm">SHA-256</module-option>