[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/corba/security/config/css CSSConfigEditor.java

[maguro]

maguro      2005/04/01 20:08:42

  Modified:    
modules/openejb-builder/src/java/org/openejb/corba/security/config/css
                        CSSConfigEditor.java
  Log:

  Added SAS identity assertions.
  
  Fixed some SSL configuration problems.
  
  Revision  Changes    Path
  1.6       +29 -5     
openejb/modules/openejb-builder/src/java/org/openejb/corba/security/config/css/CSSConfigEditor.java
  
  Index: CSSConfigEditor.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/corba/security/config/css/CSSConfigEditor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CSSConfigEditor.java      31 Mar 2005 15:28:11 -0000      1.5
  +++ CSSConfigEditor.java      2 Apr 2005 01:08:42 -0000       1.6
  @@ -69,9 +69,12 @@
   
   import org.openejb.xbeans.csiv2.css.CSSCompoundSecMechType;
   import org.openejb.xbeans.csiv2.css.CSSCssType;
  -import org.openejb.xbeans.csiv2.css.CSSSSLType;
  -import org.openejb.xbeans.csiv2.css.CSSGSSUPStaticType;
   import org.openejb.xbeans.csiv2.css.CSSGSSUPDynamicType;
  +import org.openejb.xbeans.csiv2.css.CSSGSSUPStaticType;
  +import org.openejb.xbeans.csiv2.css.CSSITTPrincipalNameDynamicType;
  +import org.openejb.xbeans.csiv2.css.CSSITTPrincipalNameStaticType;
  +import org.openejb.xbeans.csiv2.css.CSSSSLType;
  +import org.openejb.xbeans.csiv2.css.CSSSasMechType;
   import org.openejb.xbeans.csiv2.tss.TSSAssociationOption;
   
   
  @@ -132,7 +135,8 @@
           } else {
               result.setAs_mech(new CSSNULLASMechConfig());
           }
  -        result.setSas_mech(new CSSSASMechConfig());
  +
  +        result.setSas_mech(extractSASMech(mechType.getSasMech()));
   
           return result;
       }
  @@ -152,6 +156,26 @@
   
       protected static CSSASMechConfig extractGSSUPDynamic(CSSGSSUPDynamicType 
gssupType) {
           return new CSSGSSUPMechConfigDynamic(gssupType.getDomain());
  +    }
  +
  +    protected static CSSSASMechConfig extractSASMech(CSSSasMechType 
sasMechType) {
  +        CSSSASMechConfig result = new CSSSASMechConfig();
  +
  +        if (sasMechType == null) {
  +            result.setIdentityToken(new CSSSASITTAbsent());
  +        } else if (sasMechType.isSetITTAbsent()) {
  +            result.setIdentityToken(new CSSSASITTAbsent());
  +        } else if (sasMechType.isSetITTAnonymous()) {
  +            result.setIdentityToken(new CSSSASITTAnonymous());
  +        } else if (sasMechType.isSetITTPrincipalNameStatic()) {
  +            CSSITTPrincipalNameStaticType principal = 
sasMechType.getITTPrincipalNameStatic();
  +            result.setIdentityToken(new 
CSSSASITTPrincipalNameStatic(principal.getOid(), principal.getName()));
  +        } else if (sasMechType.isSetITTPrincipalNameDynamic()) {
  +            CSSITTPrincipalNameDynamicType principal = 
sasMechType.getITTPrincipalNameDynamic();
  +            result.setIdentityToken(new 
CSSSASITTPrincipalNameDynamic(principal.getOid(), principal.getDomain()));
  +        }
  +
  +        return result;
       }
   
       protected static short extractAssociationOptions(List list) {