djencks 2005/04/19 22:28:56
Modified: modules/core/src/java/org/openejb/corba/transaction
AbstractServerTransactionPolicyConfig.java
ClientTransactionInterceptor.java
IORTransactionInterceptor.java
MappedServerTransactionPolicyConfig.java
OperationTxPolicy.java ServerTransactionPolicy.java
Log:
use generated idl classes from geronimo instead of these checked in classes
Revision Changes Path
1.4 +3 -3
openejb/modules/core/src/java/org/openejb/corba/transaction/AbstractServerTransactionPolicyConfig.java
Index: AbstractServerTransactionPolicyConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/AbstractServerTransactionPolicyConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractServerTransactionPolicyConfig.java 20 Apr 2005 01:47:37
-0000 1.3
+++ AbstractServerTransactionPolicyConfig.java 20 Apr 2005 02:28:56
-0000 1.4
@@ -20,14 +20,14 @@
import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.INTERNAL;
import org.omg.CORBA.SystemException;
+import org.omg.CosTransactions.PropagationContext;
+import org.omg.CosTransactions.PropagationContextHelper;
import org.omg.IOP.Codec;
import org.omg.IOP.CodecPackage.FormatMismatch;
import org.omg.IOP.CodecPackage.TypeMismatch;
import org.omg.IOP.ServiceContext;
import org.omg.IOP.TransactionService;
import org.omg.PortableInterceptor.ServerRequestInfo;
-import org.openejb.corba.idl.CosTransactions.PropagationContext;
-import org.openejb.corba.idl.CosTransactions.PropagationContextHelper;
import org.openejb.corba.util.Util;
1.7 +5 -5
openejb/modules/core/src/java/org/openejb/corba/transaction/ClientTransactionInterceptor.java
Index: ClientTransactionInterceptor.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/ClientTransactionInterceptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClientTransactionInterceptor.java 27 Mar 2005 02:04:42 -0000 1.6
+++ ClientTransactionInterceptor.java 20 Apr 2005 02:28:56 -0000 1.7
@@ -56,11 +56,11 @@
import org.omg.PortableInterceptor.ClientRequestInfo;
import org.omg.PortableInterceptor.ClientRequestInterceptor;
import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.CosTSInteroperation.TAG_OTS_POLICY;
+import org.omg.CosTransactions.OTSPolicyValueHelper;
+import org.omg.CosTransactions.ADAPTS;
import org.openejb.corba.ClientContextManager;
-import org.openejb.corba.idl.CosTSInteroperation.TAG_OTS_POLICY;
-import org.openejb.corba.idl.CosTransactions.ADAPTS;
-import org.openejb.corba.idl.CosTransactions.OTSPolicyValueHelper;
import org.openejb.corba.util.Util;
import org.openejb.corba.util.TypeCode;
1.4 +5 -6
openejb/modules/core/src/java/org/openejb/corba/transaction/IORTransactionInterceptor.java
Index: IORTransactionInterceptor.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/IORTransactionInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IORTransactionInterceptor.java 27 Mar 2005 02:04:42 -0000 1.3
+++ IORTransactionInterceptor.java 20 Apr 2005 02:28:56 -0000 1.4
@@ -50,15 +50,14 @@
import org.omg.CORBA.INV_POLICY;
import org.omg.CORBA.LocalObject;
import org.omg.CORBA.ORB;
+import org.omg.CosTSInteroperation.TAG_INV_POLICY;
+import org.omg.CosTransactions.ADAPTS;
+import org.omg.CosTransactions.SHARED;
import org.omg.IOP.TAG_INTERNET_IOP;
import org.omg.IOP.TAG_OTS_POLICY;
import org.omg.IOP.TaggedComponent;
import org.omg.PortableInterceptor.IORInfo;
import org.omg.PortableInterceptor.IORInterceptor;
-
-import org.openejb.corba.idl.CosTSInteroperation.TAG_INV_POLICY;
-import org.openejb.corba.idl.CosTransactions.ADAPTS;
-import org.openejb.corba.idl.CosTransactions.SHARED;
import org.openejb.corba.util.Util;
1.3 +3 -3
openejb/modules/core/src/java/org/openejb/corba/transaction/MappedServerTransactionPolicyConfig.java
Index: MappedServerTransactionPolicyConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/MappedServerTransactionPolicyConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MappedServerTransactionPolicyConfig.java 20 Apr 2005 01:47:37 -0000
1.2
+++ MappedServerTransactionPolicyConfig.java 20 Apr 2005 02:28:56 -0000
1.3
@@ -18,10 +18,10 @@
import java.util.Map;
-import org.omg.CORBA.SystemException;
-import org.openejb.corba.idl.CosTransactions.PropagationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.omg.CORBA.SystemException;
+import org.omg.CosTransactions.PropagationContext;
/**
* @version $Rev: $ $Date$
1.2 +2 -2
openejb/modules/core/src/java/org/openejb/corba/transaction/OperationTxPolicy.java
Index: OperationTxPolicy.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/OperationTxPolicy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OperationTxPolicy.java 15 Mar 2005 05:27:04 -0000 1.1
+++ OperationTxPolicy.java 20 Apr 2005 02:28:56 -0000 1.2
@@ -16,7 +16,7 @@
*/
package org.openejb.corba.transaction;
-import org.openejb.corba.idl.CosTransactions.PropagationContext;
+import org.omg.CosTransactions.PropagationContext;
/**
1.2 +1 -2
openejb/modules/core/src/java/org/openejb/corba/transaction/ServerTransactionPolicy.java
Index: ServerTransactionPolicy.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/ServerTransactionPolicy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerTransactionPolicy.java 15 Mar 2005 05:27:04 -0000 1.1
+++ ServerTransactionPolicy.java 20 Apr 2005 02:28:56 -0000 1.2
@@ -16,7 +16,6 @@
*/
package org.openejb.corba.transaction;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.omg.CORBA.LocalObject;
import org.omg.CORBA.Policy;
