djencks 2005/04/19 22:28:57
Modified:
modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions
Ignore.java NoDTxClientTransactionPolicyConfig.java
NotRequired.java Required.java
Log:
use generated idl classes from geronimo instead of these checked in classes
Revision Changes Path
1.2 +4 -4
openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/Ignore.java
Index: Ignore.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/Ignore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ignore.java 15 Mar 2005 05:27:06 -0000 1.1
+++ Ignore.java 20 Apr 2005 02:28:57 -0000 1.2
@@ -19,20 +19,20 @@
import java.io.Serializable;
import org.openejb.corba.transaction.OperationTxPolicy;
-import org.openejb.corba.idl.CosTransactions.PropagationContext;
+import org.omg.CosTransactions.PropagationContext;
/**
* Use for:
* RequiresNew
* NotSupported
* Bean (? client should not send a PropagationContext)
- *
+ *
* @version $Rev: $ $Date$
*/
public class Ignore implements OperationTxPolicy, Serializable {
public static final OperationTxPolicy INSTANCE = new Ignore();
-
+
public void importTransaction(PropagationContext propagationContext) {
}
}
1.3 +11 -11
openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/NoDTxClientTransactionPolicyConfig.java
Index: NoDTxClientTransactionPolicyConfig.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/NoDTxClientTransactionPolicyConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NoDTxClientTransactionPolicyConfig.java 20 Apr 2005 01:47:37 -0000
1.2
+++ NoDTxClientTransactionPolicyConfig.java 20 Apr 2005 02:28:57 -0000
1.3
@@ -16,21 +16,21 @@
*/
package org.openejb.corba.transaction.nodistributedtransactions;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.context.TransactionContext;
-import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.INTERNAL;
+import org.omg.CosTransactions.PropagationContext;
+import org.omg.CosTransactions.PropagationContextHelper;
+import org.omg.CosTransactions.TransIdentity;
+import org.omg.CosTransactions.otid_t;
import org.omg.IOP.Codec;
+import org.omg.IOP.CodecPackage.InvalidTypeForEncoding;
import org.omg.IOP.ServiceContext;
import org.omg.IOP.TransactionService;
-import org.omg.IOP.CodecPackage.InvalidTypeForEncoding;
-import org.omg.CORBA.Any;
-import org.omg.CORBA.INTERNAL;
-import org.openejb.corba.util.Util;
+import org.omg.PortableInterceptor.ClientRequestInfo;
import org.openejb.corba.transaction.ClientTransactionPolicyConfig;
-import org.openejb.corba.idl.CosTransactions.TransIdentity;
-import org.openejb.corba.idl.CosTransactions.PropagationContext;
-import org.openejb.corba.idl.CosTransactions.PropagationContextHelper;
-import org.openejb.corba.idl.CosTransactions.otid_t;
+import org.openejb.corba.util.Util;
/**
* @version $Rev: $ $Date$
1.2 +3 -3
openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/NotRequired.java
Index: NotRequired.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/NotRequired.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NotRequired.java 15 Mar 2005 05:27:06 -0000 1.1
+++ NotRequired.java 20 Apr 2005 02:28:57 -0000 1.2
@@ -19,8 +19,8 @@
import java.io.Serializable;
import org.openejb.corba.transaction.OperationTxPolicy;
-import org.openejb.corba.idl.CosTransactions.PropagationContext;
import org.omg.CORBA.INVALID_TRANSACTION;
+import org.omg.CosTransactions.PropagationContext;
/**
* Use for:
@@ -32,7 +32,7 @@
*/
public class NotRequired implements OperationTxPolicy, Serializable {
public static final OperationTxPolicy INSTANCE = new NotRequired();
-
+
public void importTransaction(PropagationContext propagationContext) {
if (propagationContext != null) {
throw new INVALID_TRANSACTION("Transactions cannot be imported,
and might also be not allowed for this method");
1.3 +4 -4
openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/Required.java
Index: Required.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/Required.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Required.java 20 Apr 2005 01:47:37 -0000 1.2
+++ Required.java 20 Apr 2005 02:28:57 -0000 1.3
@@ -18,10 +18,10 @@
import java.io.Serializable;
-import org.openejb.corba.transaction.OperationTxPolicy;
-import org.openejb.corba.idl.CosTransactions.PropagationContext;
import org.omg.CORBA.INVALID_TRANSACTION;
import org.omg.CORBA.TRANSACTION_REQUIRED;
+import org.omg.CosTransactions.PropagationContext;
+import org.openejb.corba.transaction.OperationTxPolicy;
/**
* Use for:
@@ -32,7 +32,7 @@
public class Required implements OperationTxPolicy, Serializable {
public static final OperationTxPolicy INSTANCE = new Required();
-
+
public void importTransaction(PropagationContext propagationContext) {
if (propagationContext == null) {
throw new TRANSACTION_REQUIRED("Transaction required");
