geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r657969 - in /geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas: ClassOptionLoginModule.java JaasLoginModuleUse.java
Date Mon, 19 May 2008 20:56:03 GMT
Author: djencks
Date: Mon May 19 13:56:02 2008
New Revision: 657969

URL: http://svn.apache.org/viewvc?rev=657969&view=rev
Log:
GERONIMO-3965 Supply the correct classloader for a login module by delegation

Added:
    geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ClassOptionLoginModule.java
      - copied unchanged from r657967, geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ClassOptionLoginModule.java
Modified:
    geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java

Modified: geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java?rev=657969&r1=657968&r2=657969&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
Mon May 19 13:56:02 2008
@@ -96,15 +96,15 @@
             options.put(CLASSLOADER_LM_OPTION, classLoader);
         }
         AppConfigurationEntry entry;
+        Class loginModuleClass;
+        loginModuleClass = classLoader.loadClass(loginModule.getLoginModuleClass());
+        options.put(WrappingLoginModule.CLASS_OPTION, loginModuleClass);
         if (loginModule.isWrapPrincipals()) {
-            Class loginModuleClass;
-            loginModuleClass = classLoader.loadClass(loginModule.getLoginModuleClass());
-            options.put(WrappingLoginModule.CLASS_OPTION, loginModuleClass);
             options.put(WrappingLoginModule.DOMAIN_OPTION, loginModule.getLoginDomainName());
             options.put(WrappingLoginModule.REALM_OPTION, realmName);
             entry = new AppConfigurationEntry(WrappingLoginModule.class.getName(), controlFlag.getFlag(),
options);
         } else {
-            entry = new AppConfigurationEntry(loginModule.getLoginModuleClass(), controlFlag.getFlag(),
options);
+            entry = new AppConfigurationEntry(ClassOptionLoginModule.class.getName(), controlFlag.getFlag(),
options);
         }
         if (loginModule.getLoginDomainName() != null) {
             if (domainNames.contains(loginModule.getLoginDomainName())) {



Mime
View raw message