[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment ContainerSecurityBuilder.java OpenEJBModuleBuilder.java

[ammulder]

ammulder    2004/11/22 21:09:03

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        ContainerSecurityBuilder.java
                        OpenEJBModuleBuilder.java
  Log:

  Update to latest Geronimo security syntax
  
  Revision  Changes    Path
  1.6       +6 -3      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerSecurityBuilder.java
  
  Index: ContainerSecurityBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerSecurityBuilder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ContainerSecurityBuilder.java     19 Nov 2004 03:58:59 -0000      1.5
  +++ ContainerSecurityBuilder.java     23 Nov 2004 02:09:03 -0000      1.6
  @@ -265,11 +265,13 @@
           DefaultPrincipal defaultPrincipal = security.getDefaultPrincipal();
           Subject defaultSubject = new Subject();
   
  -        RealmPrincipal realmPrincipal = 
ConfigurationUtil.generateRealmPrincipal(defaultPrincipal.getPrincipal(), 
defaultPrincipal.getRealmName());
  +        //todo: needs a proper login domain name to go with the realm name
  +        RealmPrincipal realmPrincipal = 
ConfigurationUtil.generateRealmPrincipal(defaultPrincipal.getPrincipal(), 
defaultPrincipal.getRealmName(), defaultPrincipal.getRealmName());
           if (realmPrincipal == null) {
               throw new GeronimoSecurityException("Unable to create realm 
principal");
           }
  -        PrimaryRealmPrincipal primaryRealmPrincipal = 
ConfigurationUtil.generatePrimaryRealmPrincipal(defaultPrincipal.getPrincipal(),
 defaultPrincipal.getRealmName());
  +        //todo: needs a proper login domain name to go with the realm name
  +        PrimaryRealmPrincipal primaryRealmPrincipal = 
ConfigurationUtil.generatePrimaryRealmPrincipal(defaultPrincipal.getPrincipal(),
 defaultPrincipal.getRealmName(), defaultPrincipal.getRealmName());
           if (primaryRealmPrincipal == null) {
               throw new GeronimoSecurityException("Unable to create primary 
realm principal");
           }
  @@ -341,7 +343,8 @@
                   while (principals.hasNext()) {
                       Principal principal = (Principal) principals.next();
   
  -                    RealmPrincipal realmPrincipal = 
ConfigurationUtil.generateRealmPrincipal(principal, realm.getRealmName());
  +                    //todo: needs a proper login domain name to go with the 
realm name
  +                    RealmPrincipal realmPrincipal = 
ConfigurationUtil.generateRealmPrincipal(principal, realm.getRealmName(), 
realm.getRealmName());
   
                       if (realmPrincipal == null) throw new 
DeploymentException("Unable to create realm principal");
   
  
  
  
  1.11      +2 -1      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- OpenEJBModuleBuilder.java 21 Nov 2004 14:17:05 -0000      1.10
  +++ OpenEJBModuleBuilder.java 23 Nov 2004 02:09:03 -0000      1.11
  @@ -442,6 +442,7 @@
            * Build the security configuration.  Attempt to auto generate role 
mappings.
            */
           Security security = 
SecurityBuilder.buildSecurityConfig(openejbEjbJar.getSecurity(), 
collectRoleNames(ejbJar));
  +        //todo: needs to take login domain name into account, perhaps should 
be an element on the security DD?
           if (security != null) security.autoGenerate(securityService);
   
           EnterpriseBeansType enterpriseBeans = ejbJar.getEnterpriseBeans();