[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/openorb OpenORBConfigAdapter.java

[maguro]

maguro      2005/03/12 12:04:54

  Modified:    modules/core/src/java/org/openejb/corba/openorb
                        OpenORBConfigAdapter.java
  Log:

  Some fixes to POA policies and added default principal to the CORBA ORB.
  
  Revision  Changes    Path
  1.2       +16 -6     
openejb/modules/core/src/java/org/openejb/corba/openorb/OpenORBConfigAdapter.java
  
  Index: OpenORBConfigAdapter.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/openorb/OpenORBConfigAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OpenORBConfigAdapter.java 8 Mar 2005 04:08:31 -0000       1.1
  +++ OpenORBConfigAdapter.java 12 Mar 2005 17:04:54 -0000      1.2
  @@ -46,12 +46,15 @@
   
   import java.util.ArrayList;
   import java.util.Properties;
  +import java.util.List;
   
   import org.omg.Security.Confidentiality;
   import org.omg.Security.EstablishTrustInClient;
   import org.omg.Security.EstablishTrustInTarget;
   import org.omg.Security.NoProtection;
   
  +import org.apache.geronimo.security.deploy.DefaultPrincipal;
  +
   import org.openejb.corba.security.config.ConfigAdapter;
   import org.openejb.corba.security.config.ConfigException;
   import org.openejb.corba.security.config.css.CSSCompoundSecMechConfig;
  @@ -67,8 +70,16 @@
    */
   public class OpenORBConfigAdapter implements ConfigAdapter {
   
  -    public String[] translateToArgs(TSSConfig config) throws ConfigException 
{
  +    public String[] translateToArgs(TSSConfig config, List args) throws 
ConfigException {
           ArrayList list = new ArrayList();
  +
  +        list.addAll(args);
  +
  +        DefaultPrincipal principal = config.getDefaultPrincipal();
  +        if (principal != null) {
  +            list.add("default-principal::" + 
principal.getRealmName()+":"+principal.getPrincipal().getClassName()+":"+principal.getPrincipal().getPrincipalName());
  +        }
  +        
           return (String[]) list.toArray(new String[list.size()]);
       }
   
  @@ -117,9 +128,8 @@
           return props;
       }
   
  -    public String[] translateToArgs(CSSConfig config) throws ConfigException 
{
  -        ArrayList list = new ArrayList();
  -        return (String[]) list.toArray(new String[list.size()]);
  +    public String[] translateToArgs(CSSConfig config, List args) throws 
ConfigException {
  +        return (String[]) args.toArray(new String[args.size()]);
       }
   
       public Properties translateToProps(CSSConfig config) throws 
ConfigException {