You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2005/11/03 05:42:02 UTC

svn commit: r330444 - in /webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant: j2ee/ j2ee/handler/ standalone/

Author: dasarath
Date: Wed Nov  2 20:41:57 2005
New Revision: 330444

URL: http://svn.apache.org/viewcvs?rev=330444&view=rev
Log: (empty)

Modified:
    webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/ImportedTransaction.java
    webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/InterposedTransaction.java
    webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/JOTM1_4_3TransactionManagerGlueImpl.java
    webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/TransactionBridge.java
    webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/handler/TransactionHandler.java
    webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/standalone/Transaction.java
    webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/standalone/TransactionManager.java

Modified: webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/ImportedTransaction.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/ImportedTransaction.java?rev=330444&r1=330443&r2=330444&view=diff
==============================================================================
--- webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/ImportedTransaction.java (original)
+++ webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/ImportedTransaction.java Wed Nov  2 20:41:57 2005
@@ -27,7 +27,7 @@
 import org.apache.ws.transaction.utility.EndpointReferenceFactory;
 import org.apache.ws.transaction.wsat.ParticipantRPCEndpoint;
 import org.apache.ws.transaction.wsat.Vote;
-import org.apache.ws.transaction.wscoor.CoordinationContext;
+import org.apache.ws.transaction.wscoor._CoordinationContext;
 
 public class ImportedTransaction extends InterposedTransaction {
 	static final String DURABLE_2PC_PROTOCOL= "http://schemas.xmlsoap.org/ws/2003/09/wsat#Durable2PC";
@@ -36,7 +36,7 @@
 	EndpointReference coordinator;
 	Xid xid= new XidImpl();
 
-	public ImportedTransaction(CoordinationContext ctx) {
+	public ImportedTransaction(_CoordinationContext ctx) {
 		super.ctx= ctx;
 		try {
 			coordinator=

Modified: webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/InterposedTransaction.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/InterposedTransaction.java?rev=330444&r1=330443&r2=330444&view=diff
==============================================================================
--- webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/InterposedTransaction.java (original)
+++ webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/InterposedTransaction.java Wed Nov  2 20:41:57 2005
@@ -20,11 +20,11 @@
 import javax.transaction.Status;
 import javax.transaction.Transaction;
 
-import org.apache.ws.transaction.wscoor.CoordinationContext;
+import org.apache.ws.transaction.wscoor._CoordinationContext;
 
 
 class InterposedTransaction {
-	protected CoordinationContext ctx;
+	protected _CoordinationContext ctx;
 	protected Transaction localTx;
 	protected int status;
 
@@ -36,7 +36,7 @@
 		return localTx;
 	}
 
-	public CoordinationContext getCoordinationContext() {
+	public _CoordinationContext getCoordinationContext() {
 		return ctx;
 	}
 

Modified: webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/JOTM1_4_3TransactionManagerGlueImpl.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/JOTM1_4_3TransactionManagerGlueImpl.java?rev=330444&r1=330443&r2=330444&view=diff
==============================================================================
--- webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/JOTM1_4_3TransactionManagerGlueImpl.java (original)
+++ webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/JOTM1_4_3TransactionManagerGlueImpl.java Wed Nov  2 20:41:57 2005
@@ -12,8 +12,6 @@
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.Xid;
 
-import org.apache.ws.transaction.participant.j2ee.TransactionImporter;
-import org.apache.ws.transaction.participant.j2ee.TransactionManagerGlue;
 import org.objectweb.jotm.Control;
 import org.objectweb.jotm.ControlImpl;
 import org.objectweb.jotm.Coordinator;

Modified: webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/TransactionBridge.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/TransactionBridge.java?rev=330444&r1=330443&r2=330444&view=diff
==============================================================================
--- webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/TransactionBridge.java (original)
+++ webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/TransactionBridge.java Wed Nov  2 20:41:57 2005
@@ -24,7 +24,7 @@
 
 import org.apache.ws.transaction.coordinator.Identifier;
 import org.apache.ws.transaction.coordinator.UnknownActivityException;
-import org.apache.ws.transaction.wscoor.CoordinationContext;
+import org.apache.ws.transaction.wscoor._CoordinationContext;
 
 
 public class TransactionBridge {
@@ -36,18 +36,18 @@
 		return instance;
 	}
 
-	public CoordinationContext exportJ2eeTransaction(Transaction localTx) {
+	public _CoordinationContext exportJ2eeTransaction(Transaction localTx) {
 		InterposedTransaction tx= (InterposedTransaction)byLocalTx.get(localTx);
 		if (tx != null)
 			return tx.getCoordinationContext();
 		tx= new ExportedTransaction(localTx);
 		byLocalTx.put(localTx, tx);
-		CoordinationContext ctx= tx.getCoordinationContext();
+		_CoordinationContext ctx= tx.getCoordinationContext();
 		byCtx.put(ctx.getActivityId(), tx);
 		return ctx;
 	}
 
-	public Transaction importWSTransaction(CoordinationContext ctx) {
+	public Transaction importWSTransaction(_CoordinationContext ctx) {
 		InterposedTransaction tx= (InterposedTransaction)byCtx.get(ctx.getActivityId());
 		if (tx != null)
 			return tx.getLocalTransaction();

Modified: webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/handler/TransactionHandler.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/handler/TransactionHandler.java?rev=330444&r1=330443&r2=330444&view=diff
==============================================================================
--- webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/handler/TransactionHandler.java (original)
+++ webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/j2ee/handler/TransactionHandler.java Wed Nov  2 20:41:57 2005
@@ -29,7 +29,7 @@
 import org.apache.axis.handlers.BasicHandler;
 import org.apache.ws.transaction.participant.j2ee.TransactionBridge;
 import org.apache.ws.transaction.participant.j2ee.TransactionManagerGlueFactory;
-import org.apache.ws.transaction.wscoor.CoordinationContext;
+import org.apache.ws.transaction.wscoor._CoordinationContext;
 
 
 public class TransactionHandler extends BasicHandler {
@@ -44,7 +44,7 @@
 				Transaction localTx= tm.getTransaction();
 				if (localTx != null) {
 					SOAPHeader header= msgContext.getCurrentMessage().getSOAPEnvelope().getHeader();
-					CoordinationContext coordinationContext= bridge.exportJ2eeTransaction(localTx);
+					_CoordinationContext coordinationContext= bridge.exportJ2eeTransaction(localTx);
 					coordinationContext.toSOAPHeaderElement(header);
 				}
 			}
@@ -60,9 +60,9 @@
 					Iterator iter= header.getChildElements();
 					while (iter.hasNext()) {
 						SOAPElement e= (SOAPElement)iter.next();
-						if (CoordinationContext.is(e)) {
-							CoordinationContext coordinationContext=
-								new CoordinationContext(e);
+						if (_CoordinationContext.is(e)) {
+							_CoordinationContext coordinationContext=
+								new _CoordinationContext(e);
 							Transaction localTx=
 								bridge.importWSTransaction(coordinationContext);
 							tm.resume(localTx);

Modified: webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/standalone/Transaction.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/standalone/Transaction.java?rev=330444&r1=330443&r2=330444&view=diff
==============================================================================
--- webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/standalone/Transaction.java (original)
+++ webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/standalone/Transaction.java Wed Nov  2 20:41:57 2005
@@ -21,7 +21,7 @@
 import org.apache.ws.transaction.utility.EndpointReferenceFactory;
 import org.apache.ws.transaction.wsat.CompletionRPCPort;
 import org.apache.ws.transaction.wsat.ParticipantRPCEndpoint;
-import org.apache.ws.transaction.wscoor.CoordinationContext;
+import org.apache.ws.transaction.wscoor._CoordinationContext;
 
 /**
  * @author Dasarath Weeratunge
@@ -29,11 +29,11 @@
 public class Transaction {
 	private static String COMPLETION_PROTOCOL = "http://schemas.xmlsoap.org/ws/2003/09/wsat#Completion";
 
-	private CoordinationContext ctx;
+	private _CoordinationContext ctx;
 
 	private CompletionRPCPort compPort;
 
-	public Transaction(CoordinationContext ctx) throws RemoteException {
+	public Transaction(_CoordinationContext ctx) throws RemoteException {
 		this.ctx = ctx;
 		// FIXME: 
 		compPort = new CompletionRPCPort(ctx.register(COMPLETION_PROTOCOL,
@@ -41,7 +41,7 @@
 						ParticipantRPCEndpoint.PORT_TYPE, null)));
 	}
 
-	public CoordinationContext getCoordinationContex() {
+	public _CoordinationContext getCoordinationContex() {
 		return ctx;
 	}
 

Modified: webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/standalone/TransactionManager.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/standalone/TransactionManager.java?rev=330444&r1=330443&r2=330444&view=diff
==============================================================================
--- webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/standalone/TransactionManager.java (original)
+++ webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/participant/standalone/TransactionManager.java Wed Nov  2 20:41:57 2005
@@ -22,7 +22,7 @@
 import org.apache.ws.transaction.utility.EndpointReferenceFactory;
 import org.apache.ws.transaction.wscoor.ActivationRPCEndpoint;
 import org.apache.ws.transaction.wscoor.ActivationRPCPort;
-import org.apache.ws.transaction.wscoor.CoordinationContext;
+import org.apache.ws.transaction.wscoor._CoordinationContext;
 
 
 public class TransactionManager {
@@ -48,7 +48,7 @@
 		if (threadInfo.get() != null)
 			throw new IllegalStateException();
 		ActivationRPCPort act= new ActivationRPCPort(coord);
-		CoordinationContext ctx= act.createCoordinationContext(COORDINATION_TYPE);
+		_CoordinationContext ctx= act.createCoordinationContext(COORDINATION_TYPE);
 		threadInfo.set(new Transaction(ctx));
 	}
 



---------------------------------------------------------------------
To unsubscribe, e-mail: kandula-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: kandula-dev-help@ws.apache.org