NOJIRA - name change for DBLoginModule, removed need for pricipalclass in getTenant...

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 d79b54ff810ba1ae67294000b44d8d8899d3013b..884cbf2fd9435d56339fd603dab3e85df689eaad 100644 (file)
--- 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\r
  * @author\r
  */\r
-public class CSpaceDBLoginModule extends UsernamePasswordLoginModule {\r
+public class CSpaceJBossDBLoginModule extends UsernamePasswordLoginModule {\r
 \r
     private DatabaseRealm realm;\r
 \r
@@ -96,7 +96,6 @@ public class CSpaceDBLoginModule extends UsernamePasswordLoginModule {
                 "org.jboss.security.SimpleGroup");\r
 \r
         Collection<Group> tenants = realm.getTenants(username,\r
-                "org.collectionspace.authentication.CSpacePrincipal",\r
                 "org.jboss.security.SimpleGroup");\r
 \r
         List<Group> all = new ArrayList<Group>();\r

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 39147afd27c17cf46d95655e590e2cfd0d536ca9..5d1f265a00c4668b4c00885b1f00759c679edaf8 100644 (file)
--- 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 53fd571c3af55c7e3580c4ea699d263874a4fb9e..e5b0f7b81b6de0e3133a8f1792d47e1f6dcfb09b 100644 (file)
--- 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>