maguro 2005/03/28 16:00:20
Modified: modules/core/src/java/org/openejb/corba/security/config/tss
TSSASMechConfig.java TSSCompoundSecMechConfig.java
TSSCompoundSecMechListConfig.java TSSConfig.java
TSSGSSExportedNameConfig.java
TSSGSSUPMechConfig.java TSSGeneralNameConfig.java
TSSNULLASMechConfig.java
TSSNULLTransportConfig.java TSSSASMechConfig.java
TSSSECIOPTransportConfig.java
TSSSSLTransportConfig.java
TSSServiceConfigurationConfig.java
TSSTransportMechConfig.java
Log:
Change dependency to geronimo-spec-corba.
Revision Changes Path
1.3 +2 -3
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSASMechConfig.java
Index: TSSASMechConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSASMechConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TSSASMechConfig.java 27 Mar 2005 02:04:41 -0000 1.2
+++ TSSASMechConfig.java 28 Mar 2005 21:00:19 -0000 1.3
@@ -50,9 +50,8 @@
import java.io.Serializable;
import org.omg.CORBA.ORB;
+import org.omg.CSIIOP.AS_ContextSec;
import org.omg.IOP.Codec;
-
-import org.apache.geronimo.interop.CSIIOP.AS_ContextSec;
/**
1.3 +2 -3
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSCompoundSecMechConfig.java
Index: TSSCompoundSecMechConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSCompoundSecMechConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TSSCompoundSecMechConfig.java 27 Mar 2005 02:04:41 -0000 1.2
+++ TSSCompoundSecMechConfig.java 28 Mar 2005 21:00:19 -0000 1.3
@@ -50,9 +50,8 @@
import java.io.Serializable;
import org.omg.CORBA.ORB;
+import org.omg.CSIIOP.CompoundSecMech;
import org.omg.IOP.Codec;
-
-import org.apache.geronimo.interop.CSIIOP.CompoundSecMech;
/**
1.3 +5 -6
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSCompoundSecMechListConfig.java
Index: TSSCompoundSecMechListConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSCompoundSecMechListConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TSSCompoundSecMechListConfig.java 27 Mar 2005 02:04:41 -0000 1.2
+++ TSSCompoundSecMechListConfig.java 28 Mar 2005 21:00:19 -0000 1.3
@@ -52,13 +52,12 @@
import org.omg.CORBA.Any;
import org.omg.CORBA.ORB;
+import org.omg.CSIIOP.CompoundSecMech;
+import org.omg.CSIIOP.CompoundSecMechList;
+import org.omg.CSIIOP.CompoundSecMechListHelper;
+import org.omg.CSIIOP.TAG_CSI_SEC_MECH_LIST;
import org.omg.IOP.Codec;
import org.omg.IOP.TaggedComponent;
-
-import org.apache.geronimo.interop.CSIIOP.CompoundSecMech;
-import org.apache.geronimo.interop.CSIIOP.CompoundSecMechList;
-import org.apache.geronimo.interop.CSIIOP.CompoundSecMechListHelper;
-import org.apache.geronimo.interop.CSIIOP.TAG_CSI_SEC_MECH_LIST;
/**
1.4 +2 -2
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSConfig.java
Index: TSSConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TSSConfig.java 27 Mar 2005 02:04:41 -0000 1.3
+++ TSSConfig.java 28 Mar 2005 21:00:19 -0000 1.4
@@ -52,11 +52,11 @@
import javax.security.auth.Subject;
import org.omg.CORBA.ORB;
+import org.omg.CSI.EstablishContext;
import org.omg.IOP.Codec;
import org.omg.IOP.TaggedComponent;
import org.apache.geronimo.security.deploy.DefaultPrincipal;
-import org.apache.geronimo.interop.CSI.EstablishContext;
import org.openejb.corba.security.SASException;
1.3 +4 -4
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSGSSExportedNameConfig.java
Index: TSSGSSExportedNameConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSGSSExportedNameConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TSSGSSExportedNameConfig.java 27 Mar 2005 02:04:41 -0000 1.2
+++ TSSGSSExportedNameConfig.java 28 Mar 2005 21:00:19 -0000 1.3
@@ -44,8 +44,8 @@
*/
package org.openejb.corba.security.config.tss;
-import org.apache.geronimo.interop.CSIIOP.SCS_GSSExportedName;
-import org.apache.geronimo.interop.CSIIOP.ServiceConfiguration;
+import org.omg.CSIIOP.SCS_GSSExportedName;
+import org.omg.CSIIOP.ServiceConfiguration;
import org.openejb.corba.security.config.ConfigException;
import org.openejb.corba.util.Util;
1.3 +4 -5
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSGSSUPMechConfig.java
Index: TSSGSSUPMechConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSGSSUPMechConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TSSGSSUPMechConfig.java 27 Mar 2005 02:04:41 -0000 1.2
+++ TSSGSSUPMechConfig.java 28 Mar 2005 21:00:19 -0000 1.3
@@ -48,11 +48,10 @@
package org.openejb.corba.security.config.tss;
import org.omg.CORBA.ORB;
+import org.omg.CSIIOP.AS_ContextSec;
+import org.omg.CSIIOP.EstablishTrustInClient;
+import org.omg.GSSUP.GSSUPMechOID;
import org.omg.IOP.Codec;
-
-import org.apache.geronimo.interop.CSIIOP.AS_ContextSec;
-import org.apache.geronimo.interop.CSIIOP.EstablishTrustInClient;
-import org.apache.geronimo.interop.GSSUP.GSSUPMechOID;
import org.openejb.corba.util.Util;
1.3 +4 -4
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSGeneralNameConfig.java
Index: TSSGeneralNameConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSGeneralNameConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TSSGeneralNameConfig.java 27 Mar 2005 02:04:41 -0000 1.2
+++ TSSGeneralNameConfig.java 28 Mar 2005 21:00:19 -0000 1.3
@@ -46,8 +46,8 @@
import java.io.IOException;
-import org.apache.geronimo.interop.CSIIOP.SCS_GeneralNames;
-import org.apache.geronimo.interop.CSIIOP.ServiceConfiguration;
+import org.omg.CSIIOP.SCS_GeneralNames;
+import org.omg.CSIIOP.ServiceConfiguration;
import org.openejb.corba.security.config.ConfigException;
import org.openejb.corba.util.Util;
1.3 +2 -3
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSNULLASMechConfig.java
Index: TSSNULLASMechConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSNULLASMechConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TSSNULLASMechConfig.java 27 Mar 2005 02:04:41 -0000 1.2
+++ TSSNULLASMechConfig.java 28 Mar 2005 21:00:19 -0000 1.3
@@ -48,9 +48,8 @@
package org.openejb.corba.security.config.tss;
import org.omg.CORBA.ORB;
+import org.omg.CSIIOP.AS_ContextSec;
import org.omg.IOP.Codec;
-
-import org.apache.geronimo.interop.CSIIOP.AS_ContextSec;
/**
1.4 +3 -4
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSNULLTransportConfig.java
Index: TSSNULLTransportConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSNULLTransportConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TSSNULLTransportConfig.java 27 Mar 2005 02:04:41 -0000 1.3
+++ TSSNULLTransportConfig.java 28 Mar 2005 21:00:19 -0000 1.4
@@ -51,10 +51,9 @@
import javax.security.auth.Subject;
import org.omg.CORBA.ORB;
+import org.omg.CSIIOP.TAG_NULL_TAG;
import org.omg.IOP.Codec;
-
-import org.apache.geronimo.interop.CSIIOP.TAG_NULL_TAG;
-import org.apache.geronimo.interop.IOP.TaggedComponent;
+import org.omg.IOP.TaggedComponent;
import org.openejb.corba.security.SASException;
1.3 +7 -8
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSSASMechConfig.java
Index: TSSSASMechConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSSASMechConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TSSSASMechConfig.java 27 Mar 2005 02:04:41 -0000 1.2
+++ TSSSASMechConfig.java 28 Mar 2005 21:00:19 -0000 1.3
@@ -52,14 +52,13 @@
import java.util.Iterator;
import org.omg.CORBA.ORB;
+import org.omg.CSI.ITTAbsent;
+import org.omg.CSI.ITTPrincipalName;
+import org.omg.CSIIOP.DelegationByClient;
+import org.omg.CSIIOP.IdentityAssertion;
+import org.omg.CSIIOP.SAS_ContextSec;
+import org.omg.CSIIOP.ServiceConfiguration;
import org.omg.IOP.Codec;
-
-import org.apache.geronimo.interop.CSI.ITTAbsent;
-import org.apache.geronimo.interop.CSI.ITTPrincipalName;
-import org.apache.geronimo.interop.CSIIOP.DelegationByClient;
-import org.apache.geronimo.interop.CSIIOP.IdentityAssertion;
-import org.apache.geronimo.interop.CSIIOP.SAS_ContextSec;
-import org.apache.geronimo.interop.CSIIOP.ServiceConfiguration;
import org.openejb.corba.util.Util;
1.4 +7 -8
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSSECIOPTransportConfig.java
Index: TSSSECIOPTransportConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSSECIOPTransportConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TSSSECIOPTransportConfig.java 27 Mar 2005 02:04:41 -0000 1.3
+++ TSSSECIOPTransportConfig.java 28 Mar 2005 21:00:19 -0000 1.4
@@ -55,15 +55,14 @@
import org.omg.CORBA.Any;
import org.omg.CORBA.ORB;
+import org.omg.CSIIOP.SECIOP_SEC_TRANS;
+import org.omg.CSIIOP.SECIOP_SEC_TRANSHelper;
+import org.omg.CSIIOP.TAG_SECIOP_SEC_TRANS;
+import org.omg.CSIIOP.TLS_SEC_TRANSHelper;
+import org.omg.CSIIOP.TransportAddress;
import org.omg.IOP.Codec;
+import org.omg.IOP.TaggedComponent;
import org.openorb.orb.csiv2.ASN1Utils;
-
-import org.apache.geronimo.interop.CSIIOP.SECIOP_SEC_TRANS;
-import org.apache.geronimo.interop.CSIIOP.SECIOP_SEC_TRANSHelper;
-import org.apache.geronimo.interop.CSIIOP.TAG_SECIOP_SEC_TRANS;
-import org.apache.geronimo.interop.CSIIOP.TLS_SEC_TRANSHelper;
-import org.apache.geronimo.interop.CSIIOP.TransportAddress;
-import org.apache.geronimo.interop.IOP.TaggedComponent;
import org.openejb.corba.security.SASException;
import org.openejb.corba.util.Util;
1.5 +8 -9
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSSSLTransportConfig.java
Index: TSSSSLTransportConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSSSLTransportConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TSSSSLTransportConfig.java 27 Mar 2005 02:04:41 -0000 1.4
+++ TSSSSLTransportConfig.java 28 Mar 2005 21:00:19 -0000 1.5
@@ -59,15 +59,14 @@
import org.omg.CORBA.NO_PERMISSION;
import org.omg.CORBA.ORB;
import org.omg.CORBA.UserException;
+import org.omg.CSIIOP.EstablishTrustInClient;
+import org.omg.CSIIOP.TAG_NULL_TAG;
+import org.omg.CSIIOP.TAG_TLS_SEC_TRANS;
+import org.omg.CSIIOP.TLS_SEC_TRANS;
+import org.omg.CSIIOP.TLS_SEC_TRANSHelper;
+import org.omg.CSIIOP.TransportAddress;
import org.omg.IOP.Codec;
-
-import org.apache.geronimo.interop.CSIIOP.EstablishTrustInClient;
-import org.apache.geronimo.interop.CSIIOP.TAG_NULL_TAG;
-import org.apache.geronimo.interop.CSIIOP.TAG_TLS_SEC_TRANS;
-import org.apache.geronimo.interop.CSIIOP.TLS_SEC_TRANS;
-import org.apache.geronimo.interop.CSIIOP.TLS_SEC_TRANSHelper;
-import org.apache.geronimo.interop.CSIIOP.TransportAddress;
-import org.apache.geronimo.interop.IOP.TaggedComponent;
+import org.omg.IOP.TaggedComponent;
import org.openejb.corba.security.SASException;
1.3 +5 -5
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSServiceConfigurationConfig.java
Index: TSSServiceConfigurationConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSServiceConfigurationConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TSSServiceConfigurationConfig.java 27 Mar 2005 02:04:41 -0000
1.2
+++ TSSServiceConfigurationConfig.java 28 Mar 2005 21:00:19 -0000
1.3
@@ -46,9 +46,9 @@
import java.io.Serializable;
-import org.apache.geronimo.interop.CSIIOP.SCS_GSSExportedName;
-import org.apache.geronimo.interop.CSIIOP.SCS_GeneralNames;
-import org.apache.geronimo.interop.CSIIOP.ServiceConfiguration;
+import org.omg.CSIIOP.SCS_GSSExportedName;
+import org.omg.CSIIOP.SCS_GeneralNames;
+import org.omg.CSIIOP.ServiceConfiguration;
import org.openejb.corba.security.config.ConfigException;
1.4 +5 -6
openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSTransportMechConfig.java
Index: TSSTransportMechConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/tss/TSSTransportMechConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TSSTransportMechConfig.java 27 Mar 2005 02:04:41 -0000 1.3
+++ TSSTransportMechConfig.java 28 Mar 2005 21:00:19 -0000 1.4
@@ -54,12 +54,11 @@
import javax.security.auth.Subject;
import org.omg.CORBA.ORB;
+import org.omg.CSIIOP.TAG_NULL_TAG;
+import org.omg.CSIIOP.TAG_SECIOP_SEC_TRANS;
+import org.omg.CSIIOP.TAG_TLS_SEC_TRANS;
import org.omg.IOP.Codec;
-
-import org.apache.geronimo.interop.CSIIOP.TAG_NULL_TAG;
-import org.apache.geronimo.interop.CSIIOP.TAG_SECIOP_SEC_TRANS;
-import org.apache.geronimo.interop.CSIIOP.TAG_TLS_SEC_TRANS;
-import org.apache.geronimo.interop.IOP.TaggedComponent;
+import org.omg.IOP.TaggedComponent;
import org.openejb.corba.security.SASException;
