[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/sunorb SunORBConfigAdapter.java

[maguro]

maguro      2005/10/27 15:10:12

  Modified:    modules/core/src/java/org/openejb/corba/sunorb
                        SunORBConfigAdapter.java
  Log:

  Updated configurations to handle realm->login-domain->principal hierarchy.
  
  Revision  Changes    Path
  1.11      +16 -4     
openejb/modules/core/src/java/org/openejb/corba/sunorb/SunORBConfigAdapter.java
  
  Index: SunORBConfigAdapter.java
  ===================================================================
  RCS file: 
/scm/openejb/openejb/modules/core/src/java/org/openejb/corba/sunorb/SunORBConfigAdapter.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SunORBConfigAdapter.java  15 Oct 2005 21:27:53 -0000      1.10
  +++ SunORBConfigAdapter.java  27 Oct 2005 19:10:12 -0000      1.11
  @@ -50,6 +50,7 @@
   import java.util.List;
   import java.util.Properties;
   
  +import com.sun.corba.se.internal.core.EndPoint;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.omg.CORBA.ORB;
  @@ -58,7 +59,9 @@
   import org.omg.Security.EstablishTrustInTarget;
   import org.omg.Security.NoProtection;
   
  +import org.apache.geronimo.security.deploy.DefaultDomainPrincipal;
   import org.apache.geronimo.security.deploy.DefaultPrincipal;
  +import org.apache.geronimo.security.deploy.DefaultRealmPrincipal;
   
   import org.openejb.corba.security.config.ConfigAdapter;
   import org.openejb.corba.security.config.ConfigException;
  @@ -68,7 +71,6 @@
   import org.openejb.corba.security.config.tss.TSSConfig;
   import org.openejb.corba.security.config.tss.TSSSSLTransportConfig;
   import org.openejb.corba.security.config.tss.TSSTransportMechConfig;
  -import com.sun.corba.se.internal.core.EndPoint;
   
   
   /**
  @@ -85,7 +87,17 @@
   
           DefaultPrincipal principal = config.getDefaultPrincipal();
           if (principal != null) {
  -            list.add("default-principal::" + principal.getRealmName() + ":" 
+ principal.getLoginDomain() + ":" + principal.getPrincipal().getClassName() + 
":" + principal.getPrincipal().getPrincipalName());
  +            if (principal instanceof DefaultRealmPrincipal) {
  +                DefaultRealmPrincipal realmPrincipal = 
(DefaultRealmPrincipal) principal;
  +                list.add("default-realm-principal::" + 
realmPrincipal.getRealm() + ":" + realmPrincipal.getDomain() + ":"
  +                         + realmPrincipal.getPrincipal().getClassName() + 
":" + realmPrincipal.getPrincipal().getPrincipalName());
  +            } else if (principal instanceof DefaultDomainPrincipal) {
  +                DefaultDomainPrincipal domainPrincipal = 
(DefaultDomainPrincipal) principal;
  +                list.add("default-domain-principal::" + 
domainPrincipal.getDomain() + ":"
  +                         + domainPrincipal.getPrincipal().getClassName() + 
":" + domainPrincipal.getPrincipal().getPrincipalName());
  +            } else {
  +                list.add("default-principal::" + 
principal.getPrincipal().getClassName() + ":" + 
principal.getPrincipal().getPrincipalName());
  +            }
           }
   
           if (log.isDebugEnabled()) {