geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r450253 - in /geronimo/server/trunk/modules/geronimo-security/src: main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
Date Tue, 26 Sep 2006 23:24:25 GMT
Author: adc
Date: Tue Sep 26 16:24:24 2006
New Revision: 450253

URL: http://svn.apache.org/viewvc?view=rev&rev=450253
Log:
GERONIMO-1432 DirectConfigurationEntry should not wrap principals

Modified:
    geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
    geronimo/server/trunk/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java

Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java?view=diff&rev=450253&r1=450252&r2=450253
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
(original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
Tue Sep 26 16:24:24 2006
@@ -34,20 +34,17 @@
     private final String applicationConfigName;
     private final LoginModuleControlFlag controlFlag;
     private final LoginModuleSettings module;
-    private final boolean wrapPrincipals;
 
     public DirectConfigurationEntry() {
         this.applicationConfigName = null;
         this.controlFlag = null;
         this.module = null;
-        this.wrapPrincipals = false;
     }
 
-    public DirectConfigurationEntry(String applicationConfigName, LoginModuleControlFlag
controlFlag, LoginModuleSettings module, boolean wrapPrincipals) {
+    public DirectConfigurationEntry(String applicationConfigName, LoginModuleControlFlag
controlFlag, LoginModuleSettings module) {
         this.applicationConfigName = applicationConfigName;
         this.controlFlag = controlFlag;
         this.module = module;
-        this.wrapPrincipals = wrapPrincipals;
     }
 
     public String getConfigurationName() {
@@ -55,7 +52,7 @@
     }
 
     public JaasLoginModuleConfiguration generateConfiguration() {
-        return new JaasLoginModuleConfiguration(module.getLoginModuleClass(), controlFlag,
module.getOptions(), module.isServerSide(), applicationConfigName, wrapPrincipals, module.getClassLoader());
+        return new JaasLoginModuleConfiguration(module.getLoginModuleClass(), controlFlag,
module.getOptions(), module.isServerSide(), applicationConfigName, false, module.getClassLoader());
     }
 
     public static final GBeanInfo GBEAN_INFO;
@@ -65,11 +62,10 @@
         infoFactory.addInterface(ConfigurationEntryFactory.class);
         infoFactory.addAttribute("applicationConfigName", String.class, true);
         infoFactory.addAttribute("controlFlag", LoginModuleControlFlag.class, true);
-        infoFactory.addAttribute("wrapPrincipals", boolean.class, true);
 
         infoFactory.addReference("Module", LoginModuleSettings.class, NameFactory.LOGIN_MODULE);
 
-        infoFactory.setConstructor(new String[]{"applicationConfigName", "controlFlag", "Module",
"wrapPrincipals"});
+        infoFactory.setConstructor(new String[]{"applicationConfigName", "controlFlag", "Module"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

Modified: geronimo/server/trunk/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java?view=diff&rev=450253&r1=450252&r2=450253
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
Tue Sep 26 16:24:24 2006
@@ -64,7 +64,6 @@
         clientCE = gbean.getAbstractName();
         gbean.setAttribute("applicationConfigName", "properties-client");
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
-        gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
         gbean.setReferencePattern("Module", clientLM);
         kernel.loadGBean(gbean, DirectConfigurationEntry.class.getClassLoader());
 



Mime
View raw message