Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 16989 invoked from network); 26 Sep 2006 23:24:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Sep 2006 23:24:29 -0000 Received: (qmail 69444 invoked by uid 500); 26 Sep 2006 23:24:29 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 69413 invoked by uid 500); 26 Sep 2006 23:24:28 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 69402 invoked by uid 99); 26 Sep 2006 23:24:28 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Sep 2006 16:24:28 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=adc@apache.org; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 140.211.166.113 cause and error) Received: from [140.211.166.113] ([140.211.166.113:54252] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 52/20-20356-BA6B9154 for ; Tue, 26 Sep 2006 16:24:28 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B3D5A1A981A; Tue, 26 Sep 2006 16:24:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: adc@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060926232425.B3D5A1A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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());