Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 40850 invoked from network); 12 Dec 2005 07:07:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Dec 2005 07:07:48 -0000 Received: (qmail 50419 invoked by uid 500); 12 Dec 2005 07:07:46 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 50400 invoked by uid 500); 12 Dec 2005 07:07:45 -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 50389 invoked by uid 99); 12 Dec 2005 07:07:45 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Dec 2005 23:07:45 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 11 Dec 2005 23:07:44 -0800 Received: (qmail 40665 invoked by uid 65534); 12 Dec 2005 07:07:24 -0000 Message-ID: <20051212070724.40664.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r356188 - in /geronimo/trunk: applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java Date: Mon, 12 Dec 2005 07:07:24 -0000 To: scm@geronimo.apache.org From: ammulder@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ammulder Date: Sun Dec 11 23:07:21 2005 New Revision: 356188 URL: http://svn.apache.org/viewcvs?rev=356188&view=rev Log: Merge wrap principals fix from branch Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=356188&r1=356187&r2=356188&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Sun Dec 11 23:07:21 2005 @@ -414,6 +414,7 @@ details.setLoginDomainName(module.getLoginDomainName()); details.setClassName(module.getLoginModuleClass()); details.setServerSide(module.isServerSide()); + details.setWrapPrincipals(module.isWrapPrincipals()); details.setOptions(module.getOptions()); list.add(details); final String next = node.getNextName(); Modified: geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java?rev=356188&r1=356187&r2=356188&view=diff ============================================================================== --- geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java (original) +++ geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java Sun Dec 11 23:07:21 2005 @@ -158,6 +158,7 @@ loginModuleGBeanData.setAttribute("loginModuleClass", className); loginModuleGBeanData.setAttribute("options", options); loginModuleGBeanData.setAttribute("serverSide", new Boolean(serverSide)); + loginModuleGBeanData.setAttribute("wrapPrincipals", Boolean.valueOf(wrapPrincipals)); context.addGBean(loginModuleGBeanData); } @@ -176,7 +177,6 @@ } GBeanData loginModuleUseGBeanData = new GBeanData(thisName, JaasLoginModuleUse.GBEAN_INFO); loginModuleUseGBeanData.setAttribute("controlFlag", controlFlag); - loginModuleUseGBeanData.setAttribute("wrapPrincipals", new Boolean(wrapPrincipals)); loginModuleUseGBeanData.setReferencePattern("LoginModule", loginModuleName); uses.add(loginModuleUseGBeanData); }