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

[maguro]

maguro      2005/03/12 12:04:57

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

  Some fixes to POA policies and added default principal to the CORBA ORB.
  
  Revision  Changes    Path
  1.11      +3 -5      
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ContainerSecurityBuilder.java     3 Mar 2005 07:42:34 -0000       1.10
  +++ ContainerSecurityBuilder.java     12 Mar 2005 17:04:57 -0000      1.11
  @@ -268,13 +268,11 @@
           DefaultPrincipal defaultPrincipal = security.getDefaultPrincipal();
           Subject defaultSubject = new Subject();
   
  -        //todo: needs a proper login domain name to go with the realm name
  -        RealmPrincipal realmPrincipal = 
ConfigurationUtil.generateRealmPrincipal(defaultPrincipal.getPrincipal(), 
defaultPrincipal.getRealmName(), defaultPrincipal.getRealmName());
  +        RealmPrincipal realmPrincipal = 
ConfigurationUtil.generateRealmPrincipal(defaultPrincipal.getPrincipal(), 
defaultPrincipal.getRealmName());
           if (realmPrincipal == null) {
               throw new GeronimoSecurityException("Unable to create realm 
principal");
           }
  -        //todo: needs a proper login domain name to go with the realm name
  -        PrimaryRealmPrincipal primaryRealmPrincipal = 
ConfigurationUtil.generatePrimaryRealmPrincipal(defaultPrincipal.getPrincipal(),
 defaultPrincipal.getRealmName(), defaultPrincipal.getRealmName());
  +        PrimaryRealmPrincipal primaryRealmPrincipal = 
ConfigurationUtil.generatePrimaryRealmPrincipal(defaultPrincipal.getPrincipal(),
 defaultPrincipal.getRealmName());
           if (primaryRealmPrincipal == null) {
               throw new GeronimoSecurityException("Unable to create primary 
realm principal");
           }
  @@ -347,7 +345,7 @@
                       Principal principal = (Principal) principals.next();
   
                       //todo: needs a proper login domain name to go with the 
realm name
  -                    RealmPrincipal realmPrincipal = 
ConfigurationUtil.generateRealmPrincipal(principal, realm.getRealmName(), 
realm.getRealmName());
  +                    RealmPrincipal realmPrincipal = 
ConfigurationUtil.generateRealmPrincipal(principal, realm.getRealmName());
   
                       if (realmPrincipal == null) throw new 
DeploymentException("Unable to create realm principal");