geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty JettyXMLConfiguration.java
Date Thu, 09 Sep 2004 12:17:52 GMT
adc         2004/09/09 05:17:52

  Modified:    modules/jetty/src/java/org/apache/geronimo/jetty
                        JettyXMLConfiguration.java
  Log:
  The principal set for a role mapping can span multiple realms.
  
  Revision  Changes    Path
  1.3       +3 -3      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyXMLConfiguration.java
  
  Index: JettyXMLConfiguration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyXMLConfiguration.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JettyXMLConfiguration.java	27 Jun 2004 20:37:38 -0000	1.2
  +++ JettyXMLConfiguration.java	9 Sep 2004 12:17:52 -0000	1.3
  @@ -309,6 +309,7 @@
               while (rollMappings.hasNext()) {
                   Role role = (Role) rollMappings.next();
                   String roleName = role.getRoleName();
  +                Set principalSet = new HashSet();
   
                   if (!securityRoles.contains(roleName)) throw new GeronimoSecurityException("Role
does not exist in this configuration");
   
  @@ -316,7 +317,6 @@
   
                   Iterator realms = role.getRealms().iterator();
                   while (realms.hasNext()) {
  -                    Set principalSet = new HashSet();
                       Realm realm = (Realm) realms.next();
   
                       Iterator principals = realm.getPrincipals().iterator();
  @@ -330,8 +330,8 @@
                           principalSet.add(realmPrincipal);
                           if (principal.isDesignatedRunAs()) roleDesignate.getPrincipals().add(realmPrincipal);
                       }
  -                    roleMapper.addRoleMapping(roleName, principalSet);
                   }
  +                roleMapper.addRoleMapping(roleName, principalSet);
   
                   if (roleDesignate.getPrincipals().size() > 0) context.setRoleDesignate(roleName,
roleDesignate);
               }
  
  
  

Mime
View raw message