Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 4793 invoked from network); 12 Mar 2005 16:58:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 12 Mar 2005 16:58:44 -0000 Received: (qmail 7416 invoked by uid 500); 12 Mar 2005 16:58:43 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 7401 invoked by uid 500); 12 Mar 2005 16:58:43 -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 Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 7388 invoked by uid 99); 12 Mar 2005 16:58:43 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 12 Mar 2005 08:58:42 -0800 Received: (qmail 4776 invoked by uid 65534); 12 Mar 2005 16:58:41 -0000 Message-ID: <20050312165841.4774.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sat, 12 Mar 2005 16:58:41 -0000 Subject: svn commit: r157260 - in geronimo/trunk/modules: jetty/src/java/org/apache/geronimo/jetty/ jetty/src/java/org/apache/geronimo/jetty/interceptor/ security-builder/src/java/org/apache/geronimo/security/deployment/ security/src/java/org/apache/geronimo/security/ security/src/java/org/apache/geronimo/security/jaas/ security/src/java/org/apache/geronimo/security/util/ tomcat/src/java/org/apache/geronimo/tomcat/ To: scm@geronimo.apache.org From: adc@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: adc Date: Sat Mar 12 08:58:39 2005 New Revision: 157260 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157260 Log: Cleaned up confusing use of security realm and opened up a few utility meth= ods. Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWe= bAppContext.java geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interce= ptor/SecurityContextBeforeAfter.java geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/se= curity/deployment/SecurityBuilder.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/P= rimaryRealmPrincipal.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/R= ealmPrincipal.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/j= aas/JaasSecurityContext.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/u= til/ConfigurationUtil.java geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/Tomca= tGeronimoRealm.java Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/J= ettyWebAppContext.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/or= g/apache/geronimo/jetty/JettyWebAppContext.java?view=3Ddiff&r1=3D157259&r2= =3D157260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWe= bAppContext.java (original) +++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWe= bAppContext.java Sat Mar 12 08:58:39 2005 @@ -241,7 +241,7 @@ //set the JAASJettyRealm as our realm. JAASJettyRealm realm =3D new JAASJettyRealm(realmName, securit= yRealmName); setRealm(realm); - this.securityInterceptor =3D new SecurityContextBeforeAfter(in= terceptor, index++, index++, policyContextID, securityConfig, securityRealm= Name, authenticator, securityRoles, uncheckedPermissions, excludedPermissio= ns, rolePermissions, realm); + this.securityInterceptor =3D new SecurityContextBeforeAfter(in= terceptor, index++, index++, policyContextID, securityConfig, authenticator= , securityRoles, uncheckedPermissions, excludedPermissions, rolePermissions= , realm); interceptor =3D securityInterceptor; } else { securityInterceptor =3D null; Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/i= nterceptor/SecurityContextBeforeAfter.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/or= g/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java?view=3D= diff&r1=3D157259&r2=3D157260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interce= ptor/SecurityContextBeforeAfter.java (original) +++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interce= ptor/SecurityContextBeforeAfter.java Sat Mar 12 08:58:39 2005 @@ -88,7 +88,6 @@ int webAppContextIndex, String policyContextID, Security securityConfig, - String securityRealmName, Authenticator authenticator, Set securityRoles, PermissionCollection uncheckedPermis= sions, @@ -100,7 +99,7 @@ this.webAppContextIndex =3D webAppContextIndex; this.policyContextID =3D policyContextID; =20 - this.defaultPrincipal =3D generateDefaultPrincipal(securityConfig,= securityRealmName); + this.defaultPrincipal =3D generateDefaultPrincipal(securityConfig); =20 if (authenticator instanceof FormAuthenticator) { String formLoginPath =3D ((FormAuthenticator) authenticator).g= etLoginPage(); @@ -134,7 +133,7 @@ policyConfiguration =3D factory.getPolicyConfiguration(policyConte= xtID, true); configure(uncheckedPermissions, excludedPermissions, rolePermissio= ns); RoleMappingConfiguration roleMapper =3D RoleMappingConfigurationFa= ctory.getRoleMappingFactory().getRoleMappingConfiguration(policyContextID, = false); - addRoleMappings(securityRoles, securityRealmName, securityConfig, = roleMapper); + addRoleMappings(securityRoles, securityConfig, roleMapper); policyConfiguration.commit(); this.excludedPermissions =3D excludedPermissions; =20 @@ -335,15 +334,13 @@ } =20 =20 - //configuration methods /** * Generate the default principal from the security config. * * @param securityConfig The Geronimo security configuration. - * @param securityRealmName * @return the default principal */ - protected JAASJettyPrincipal generateDefaultPrincipal(Security securit= yConfig, String securityRealmName) throws GeronimoSecurityException { + protected JAASJettyPrincipal generateDefaultPrincipal(Security securit= yConfig) throws GeronimoSecurityException { =20 DefaultPrincipal defaultPrincipal =3D securityConfig.getDefaultPri= ncipal(); if (defaultPrincipal =3D=3D null) { @@ -353,11 +350,11 @@ JAASJettyPrincipal result =3D new JAASJettyPrincipal("default"); Subject defaultSubject =3D new Subject(); =20 - RealmPrincipal realmPrincipal =3D ConfigurationUtil.generateRealmP= rincipal(defaultPrincipal.getPrincipal(), securityRealmName, defaultPrincip= al.getRealmName()); + RealmPrincipal realmPrincipal =3D ConfigurationUtil.generateRealmP= rincipal(defaultPrincipal.getPrincipal(), defaultPrincipal.getRealmName()); if (realmPrincipal =3D=3D null) { throw new GeronimoSecurityException("Unable to create realm pr= incipal"); } - PrimaryRealmPrincipal primaryRealmPrincipal =3D ConfigurationUtil.= generatePrimaryRealmPrincipal(defaultPrincipal.getPrincipal(), securityReal= mName, defaultPrincipal.getRealmName()); + PrimaryRealmPrincipal primaryRealmPrincipal =3D ConfigurationUtil.= generatePrimaryRealmPrincipal(defaultPrincipal.getPrincipal(), defaultPrinc= ipal.getRealmName()); if (primaryRealmPrincipal =3D=3D null) { throw new GeronimoSecurityException("Unable to create primary = realm principal"); } @@ -371,7 +368,7 @@ } =20 =20 - public void addRoleMappings(Set securityRoles, String securityRealmNam= e, Security security, RoleMappingConfiguration roleMapper) throws PolicyCon= textException, GeronimoSecurityException { + public void addRoleMappings(Set securityRoles, Security security, Role= MappingConfiguration roleMapper) throws PolicyContextException, GeronimoSec= urityException { =20 for (Iterator roleMappings =3D security.getRoleMappings().values()= .iterator(); roleMappings.hasNext();) { Role role =3D (Role) roleMappings.next(); @@ -390,7 +387,7 @@ for (Iterator principals =3D realm.getPrincipals().iterato= r(); principals.hasNext();) { org.apache.geronimo.security.deploy.Principal principa= l =3D (org.apache.geronimo.security.deploy.Principal) principals.next(); =20 - RealmPrincipal realmPrincipal =3D ConfigurationUtil.ge= nerateRealmPrincipal(principal, securityRealmName, realm.getRealmName()); + RealmPrincipal realmPrincipal =3D ConfigurationUtil.ge= nerateRealmPrincipal(principal, realm.getRealmName()); if (realmPrincipal =3D=3D null) { throw new GeronimoSecurityException("Unable to cre= ate realm principal"); } Modified: geronimo/trunk/modules/security-builder/src/java/org/apache/geron= imo/security/deployment/SecurityBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/= src/java/org/apache/geronimo/security/deployment/SecurityBuilder.java?view= =3Ddiff&r1=3D157259&r2=3D157260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/se= curity/deployment/SecurityBuilder.java (original) +++ geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/se= curity/deployment/SecurityBuilder.java Sat Mar 12 08:58:39 2005 @@ -98,7 +98,7 @@ return security; } =20 - private static Principal buildPrincipal(GerPrincipalType principalType= ) { + public static Principal buildPrincipal(GerPrincipalType principalType)= { Principal principal =3D new Principal(); =20 principal.setClassName(principalType.getClass1()); Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/secu= rity/PrimaryRealmPrincipal.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java= /org/apache/geronimo/security/PrimaryRealmPrincipal.java?view=3Ddiff&r1=3D1= 57259&r2=3D157260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/P= rimaryRealmPrincipal.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/P= rimaryRealmPrincipal.java Sat Mar 12 08:58:39 2005 @@ -25,8 +25,8 @@ */ public class PrimaryRealmPrincipal extends RealmPrincipal { =20 - public PrimaryRealmPrincipal(String loginDomain, Principal principal, = String realmName) { - super(loginDomain, principal, realmName); + public PrimaryRealmPrincipal(String loginDomain, Principal principal) { + super(loginDomain, principal); } =20 /** Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/secu= rity/RealmPrincipal.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java= /org/apache/geronimo/security/RealmPrincipal.java?view=3Ddiff&r1=3D157259&r= 2=3D157260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/R= ealmPrincipal.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/R= ealmPrincipal.java Sat Mar 12 08:58:39 2005 @@ -34,13 +34,12 @@ private transient String name =3D null; private transient long id; =20 - public RealmPrincipal(String loginDomain, Principal principal, String = realmName) { + public RealmPrincipal(String loginDomain, Principal principal) { if (loginDomain =3D=3D null) throw new NullArgumentException("logi= nDomain"); if (principal =3D=3D null) throw new NullArgumentException("princi= pal"); =20 this.loginDomain =3D loginDomain; this.principal =3D principal; - //todo: ignoring realm name; we don't think we'll need it. } =20 public long getId() { Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/secu= rity/jaas/JaasSecurityContext.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java= /org/apache/geronimo/security/jaas/JaasSecurityContext.java?view=3Ddiff&r1= =3D157259&r2=3D157260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/j= aas/JaasSecurityContext.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/j= aas/JaasSecurityContext.java Sat Mar 12 08:58:39 2005 @@ -82,7 +82,7 @@ for (Iterator it =3D subject.getPrincipals().iterator(); it.hasNex= t();) { Principal p =3D (Principal) it.next(); if(!(p instanceof RealmPrincipal) && !processedPrincipals.cont= ains(p)) { - list.add(ContextManager.registerPrincipal(new RealmPrincip= al(loginDomainName, p, realmName))); + list.add(ContextManager.registerPrincipal(new RealmPrincip= al(loginDomainName, p))); processedPrincipals.add(p); } } @@ -94,7 +94,7 @@ for (int i =3D 0; i < principals.length; i++) { Principal p =3D principals[i]; list.add(p); - list.add(ContextManager.registerPrincipal(new RealmPrincipal(l= oginDomainName, p, realmName))); + list.add(ContextManager.registerPrincipal(new RealmPrincipal(l= oginDomainName, p))); processedPrincipals.add(p); } subject.getPrincipals().addAll(list); Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/secu= rity/util/ConfigurationUtil.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java= /org/apache/geronimo/security/util/ConfigurationUtil.java?view=3Ddiff&r1=3D= 157259&r2=3D157260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/u= til/ConfigurationUtil.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/u= til/ConfigurationUtil.java Sat Mar 12 08:58:39 2005 @@ -43,19 +43,22 @@ /** * Create a RealmPrincipal from a deployment description. * @param principal the deployment description of the principal to be = created. - * @param realmName the security realm that the principal belongs go * @return a RealmPrincipal from a deployment description */ - public static RealmPrincipal generateRealmPrincipal(final Principal pr= incipal, final String loginDomain, final String realmName) { + public static RealmPrincipal generateRealmPrincipal(final Principal pr= incipal, final String loginDomain) { + return generateRealmPrincipal(principal.getClassName(), principal.= getPrincipalName(), loginDomain); + } + + public static RealmPrincipal generateRealmPrincipal(final String class= Name, final String principalName, final String loginDomain) { try { return (RealmPrincipal) AccessController.doPrivileged(new Priv= ilegedExceptionAction() { public Object run() throws Exception { java.security.Principal p =3D null; - Class clazz =3D Class.forName(principal.getClassName()= ); + Class clazz =3D Class.forName(className); Constructor constructor =3D clazz.getDeclaredConstruct= or(new Class[]{String.class}); - p =3D (java.security.Principal) constructor.newInstanc= e(new Object[]{principal.getPrincipalName()}); + p =3D (java.security.Principal) constructor.newInstanc= e(new Object[]{principalName}); =20 - return new RealmPrincipal(loginDomain, p, realmName); + return new RealmPrincipal(loginDomain, p); } }); } catch (PrivilegedActionException e) { @@ -70,19 +73,22 @@ /** * Create a RealmPrincipal from a deployment description. * @param principal the deployment description of the principal to be = created. - * @param realmName the security realm that the principal belongs go * @return a RealmPrincipal from a deployment description */ - public static PrimaryRealmPrincipal generatePrimaryRealmPrincipal(fina= l Principal principal, final String loginDomain, final String realmName) { + public static PrimaryRealmPrincipal generatePrimaryRealmPrincipal(fina= l Principal principal, final String loginDomain) { + return generatePrimaryRealmPrincipal(principal.getClassName(), pri= ncipal.getPrincipalName(), loginDomain); + } + + public static PrimaryRealmPrincipal generatePrimaryRealmPrincipal(fina= l String className, final String principalName, final String loginDomain) { try { return (PrimaryRealmPrincipal) AccessController.doPrivileged(n= ew PrivilegedExceptionAction() { public Object run() throws Exception { java.security.Principal p =3D null; - Class clazz =3D Class.forName(principal.getClassName()= ); + Class clazz =3D Class.forName(className); Constructor constructor =3D clazz.getDeclaredConstruct= or(new Class[]{String.class}); - p =3D (java.security.Principal) constructor.newInstanc= e(new Object[]{principal.getPrincipalName()}); + p =3D (java.security.Principal) constructor.newInstanc= e(new Object[]{principalName}); =20 - return new PrimaryRealmPrincipal(loginDomain, p, realm= Name); + return new PrimaryRealmPrincipal(loginDomain, p); } }); } catch (PrivilegedActionException e) { Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat= /TomcatGeronimoRealm.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/o= rg/apache/geronimo/tomcat/TomcatGeronimoRealm.java?view=3Ddiff&r1=3D157259&= r2=3D157260 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/Tomca= tGeronimoRealm.java (original) +++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/Tomca= tGeronimoRealm.java Sat Mar 12 08:58:39 2005 @@ -104,7 +104,7 @@ Map rolePermissions) throws PolicyContextEx= ception, ClassNotFoundException { =20 this.policyContextID =3D policyContextID; - this.defaultSubject =3D generateDefaultSubject(securityConfig, log= inDomainName); + this.defaultSubject =3D generateDefaultSubject(securityConfig); =20 /** * Register our default subject with the ContextManager @@ -118,7 +118,7 @@ =20 configure(uncheckedPermissions, excludedPermissions, rolePermissio= ns); RoleMappingConfiguration roleMapper =3D RoleMappingConfigurationFa= ctory.getRoleMappingFactory().getRoleMappingConfiguration(policyContextID, = false); - addRoleMappings(securityRoles, loginDomainName, securityConfig, ro= leMapper); + addRoleMappings(securityRoles, securityConfig, roleMapper); policyConfiguration.commit(); this.loginDomainName =3D loginDomainName; =20 @@ -134,7 +134,7 @@ } } =20 - protected Subject generateDefaultSubject(Security securityConfig, Stri= ng loginDomainName) + protected Subject generateDefaultSubject(Security securityConfig) throws GeronimoSecurityException { DefaultPrincipal defaultPrincipal =3D securityConfig.getDefaultPri= ncipal(); if (defaultPrincipal =3D=3D null) { @@ -143,11 +143,11 @@ =20 Subject subject =3D new Subject(); =20 - RealmPrincipal realmPrincipal =3D ConfigurationUtil.generateRealmP= rincipal(defaultPrincipal.getPrincipal(), loginDomainName, defaultPrincipal= .getRealmName()); + RealmPrincipal realmPrincipal =3D ConfigurationUtil.generateRealmP= rincipal(defaultPrincipal.getPrincipal(), defaultPrincipal.getRealmName()); if (realmPrincipal =3D=3D null) { throw new GeronimoSecurityException("Unable to create realm pr= incipal"); } - PrimaryRealmPrincipal primaryRealmPrincipal =3D ConfigurationUtil.= generatePrimaryRealmPrincipal(defaultPrincipal.getPrincipal(), loginDomainN= ame, defaultPrincipal.getRealmName()); + PrimaryRealmPrincipal primaryRealmPrincipal =3D ConfigurationUtil.= generatePrimaryRealmPrincipal(defaultPrincipal.getPrincipal(), defaultPrinc= ipal.getRealmName()); if (primaryRealmPrincipal =3D=3D null) { throw new GeronimoSecurityException("Unable to create primary = realm principal"); } @@ -491,7 +491,7 @@ } =20 =20 - public void addRoleMappings(Set securityRoles, String loginDomainName,= Security security, RoleMappingConfiguration roleMapper) throws PolicyConte= xtException, GeronimoSecurityException { + public void addRoleMappings(Set securityRoles, Security security, Role= MappingConfiguration roleMapper) throws PolicyContextException, GeronimoSec= urityException { =20 for (Iterator roleMappings =3D security.getRoleMappings().values()= .iterator(); roleMappings.hasNext();) { Role role =3D (Role) roleMappings.next(); @@ -510,7 +510,7 @@ for (Iterator principals =3D realm.getPrincipals().iterato= r(); principals.hasNext();) { org.apache.geronimo.security.deploy.Principal principa= l =3D (org.apache.geronimo.security.deploy.Principal) principals.next(); =20 - RealmPrincipal realmPrincipal =3D ConfigurationUtil.ge= nerateRealmPrincipal(principal, loginDomainName, realm.getRealmName()); + RealmPrincipal realmPrincipal =3D ConfigurationUtil.ge= nerateRealmPrincipal(principal, realm.getRealmName()); if (realmPrincipal =3D=3D null) { throw new GeronimoSecurityException("Unable to cre= ate realm principal"); }