geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r367046 - in /geronimo/trunk/modules/security/src: java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
Date Sun, 08 Jan 2006 16:31:27 GMT
Author: adc
Date: Sun Jan  8 08:31:23 2006
New Revision: 367046

URL: http://svn.apache.org/viewcvs?rev=367046&view=rev
Log:
PR: GERONIMO-1432
Removed wrapPrincipals attribute.

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

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java?rev=367046&r1=367045&r2=367046&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
Sun Jan  8 08:31:23 2006
@@ -34,20 +34,17 @@
     private final String applicationConfigName;
     private final LoginModuleControlFlag controlFlag;
     private final LoginModuleGBean 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, LoginModuleGBean module, boolean wrapPrincipals) {
+    public DirectConfigurationEntry(String applicationConfigName, LoginModuleControlFlag
controlFlag, LoginModuleGBean 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", LoginModuleGBean.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/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java?rev=367046&r1=367045&r2=367046&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
(original)
+++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
Sun Jan  8 08:31:23 2006
@@ -84,7 +84,6 @@
         gbean = new GBeanData(clientCE, DirectConfigurationEntry.getGBeanInfo());
         gbean.setAttribute("applicationConfigName", "properties-client");
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
-        gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
         gbean.setReferencePatterns("Module", Collections.singleton(clientLM));
         kernel.loadGBean(gbean, DirectConfigurationEntry.class.getClassLoader());
 



Mime
View raw message