[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/security SASReplyManager.java ServerSecurityInterceptor.java

[maguro]

maguro      2005/03/28 16:00:17

  Modified:    modules/core/src/java/org/openejb/corba/security
                        SASReplyManager.java ServerSecurityInterceptor.java
  Log:

  Change dependency to geronimo-spec-corba.
  
  Revision  Changes    Path
  1.2       +3 -3      
openejb/modules/core/src/java/org/openejb/corba/security/SASReplyManager.java
  
  Index: SASReplyManager.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/SASReplyManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SASReplyManager.java      27 Mar 2005 02:04:41 -0000      1.1
  +++ SASReplyManager.java      28 Mar 2005 21:00:17 -0000      1.2
  @@ -47,7 +47,7 @@
   import java.util.Hashtable;
   import java.util.Map;
   
  -import org.apache.geronimo.interop.CSI.SASContextBody;
  +import org.omg.CSI.SASContextBody;
   
   
   /**
  
  
  
  1.8       +12 -12    
openejb/modules/core/src/java/org/openejb/corba/security/ServerSecurityInterceptor.java
  
  Index: ServerSecurityInterceptor.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/ServerSecurityInterceptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ServerSecurityInterceptor.java    27 Mar 2005 02:04:41 -0000      1.7
  +++ ServerSecurityInterceptor.java    28 Mar 2005 21:00:17 -0000      1.8
  @@ -45,18 +45,26 @@
   package org.openejb.corba.security;
   
   import java.util.Set;
  -import javax.security.auth.Subject;
   import javax.security.auth.DestroyFailedException;
  +import javax.security.auth.Subject;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.omg.CORBA.Any;
  +import org.omg.CORBA.BAD_PARAM;
   import org.omg.CORBA.INTERNAL;
   import org.omg.CORBA.INV_POLICY;
   import org.omg.CORBA.LocalObject;
   import org.omg.CORBA.MARSHAL;
   import org.omg.CORBA.ORB;
  -import org.omg.CORBA.BAD_PARAM;
  +import org.omg.CSI.CompleteEstablishContext;
  +import org.omg.CSI.ContextError;
  +import org.omg.CSI.MTCompleteEstablishContext;
  +import org.omg.CSI.MTContextError;
  +import org.omg.CSI.MTEstablishContext;
  +import org.omg.CSI.MTMessageInContext;
  +import org.omg.CSI.SASContextBody;
  +import org.omg.CSI.SASContextBodyHelper;
   import org.omg.IOP.CodecPackage.FormatMismatch;
   import org.omg.IOP.CodecPackage.InvalidTypeForEncoding;
   import org.omg.IOP.CodecPackage.TypeMismatch;
  @@ -66,14 +74,6 @@
   import org.omg.PortableInterceptor.ServerRequestInterceptor;
   
   import org.apache.geronimo.security.ContextManager;
  -import org.apache.geronimo.interop.CSI.SASContextBodyHelper;
  -import org.apache.geronimo.interop.CSI.SASContextBody;
  -import org.apache.geronimo.interop.CSI.MTEstablishContext;
  -import org.apache.geronimo.interop.CSI.ContextError;
  -import org.apache.geronimo.interop.CSI.CompleteEstablishContext;
  -import org.apache.geronimo.interop.CSI.MTCompleteEstablishContext;
  -import org.apache.geronimo.interop.CSI.MTContextError;
  -import org.apache.geronimo.interop.CSI.MTMessageInContext;
   
   import org.openejb.corba.security.config.tss.TSSConfig;
   import org.openejb.corba.util.Util;