Author: dasarath
Date: Wed Dec 21 15:13:39 2005
New Revision: 358418
URL: http://svn.apache.org/viewcvs?rev=358418&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/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=358418&r1=358417&r2=358418&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 Dec 21 15:13:39 2005
@@ -30,7 +30,7 @@
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";;
+ static final String DURABLE_2PC_PROTOCOL=
"http://schemas.xmlsoap.org/ws/2004/10/wsat/Durable2PC";;
static XATerminator xaTerminator=
TransactionManagerGlueFactory.getInstance().getTransactionManagerGlue().getXATerminator();
EndpointReference coordinator;
@@ -38,6 +38,7 @@
public ImportedTransaction(_CoordinationContext ctx) {
super.ctx= ctx;
+
System.out.println("[ImportedTransaction]"+ctx.toCoordinationContext().getRegistrationService().getAddress().getHost());
try {
coordinator=
ctx.register(
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=358418&r1=358417&r2=358418&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 Dec 21 15:13:39 2005
@@ -48,9 +48,12 @@
}
public Transaction importWSTransaction(_CoordinationContext ctx) {
+ System.out.println("[TransactionBridge/importWSTransaction] 1");
InterposedTransaction tx=
(InterposedTransaction)byCtx.get(ctx.getActivityId());
+ System.out.println("[TransactionBridge/importWSTransaction] 2");
if (tx != null)
return tx.getLocalTransaction();
+ System.out.println("[TransactionBridge/importWSTransaction] 3");
tx= new ImportedTransaction(ctx);
byCtx.put(ctx.getActivityId(), tx);
Transaction localTx= 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=358418&r1=358417&r2=358418&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 Dec 21 15:13:39 2005
@@ -39,9 +39,17 @@
static private ThreadLocal threadInfo= new ThreadLocal();
public void invoke(MessageContext msgContext) throws AxisFault {
+ System.out.println("[TransactionHandler/invoke]");
+ System.out.println("---------------------------");
+ if (msgContext.getCurrentMessage() != null)
+
System.out.println(msgContext.getCurrentMessage().getSOAPEnvelope().toString());
+ else
+ System.out.println("if (msgContext.getCurrentMessage()
== null)");
+ System.out.println("---------------------------");
try {
- if (msgContext.isClient()) {
- Transaction localTx= tm.getTransaction();
+ if (msgContext.isClient() &&
!msgContext.getPastPivot()) {
+ System.out.println("[TransactionHandler/invoke]
isClient = true ");
+ Transaction localTx= tm.getTransaction();
if (localTx != null) {
SOAPHeader header=
msgContext.getCurrentMessage().getSOAPEnvelope().getHeader();
_CoordinationContext
coordinationContext= bridge.exportJ2eeTransaction(localTx);
@@ -50,19 +58,23 @@
}
else {
if (msgContext.getPastPivot()) {
+
System.out.println("[TransactionHandler/invoke] getPastPivot = true");
if (threadInfo.get() != null) {
tm.suspend();
threadInfo.set(null);
}
}
else {
+
System.out.println("[TransactionHandler/invoke] getPastPivot = false");
SOAPHeader header=
msgContext.getCurrentMessage().getSOAPEnvelope().getHeader();
Iterator iter=
header.getChildElements();
while (iter.hasNext()) {
SOAPElement e=
(SOAPElement)iter.next();
if (_CoordinationContext.is(e))
{
+
System.out.println("[TransactionHandler/invoke] _CoordinationContext");
_CoordinationContext
coordinationContext=
new
_CoordinationContext(e);
+
System.out.println("[TransactionHandler/invoke] calling importWSTransaction");
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=358418&r1=358417&r2=358418&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 Dec 21 15:13:39 2005
@@ -27,7 +27,7 @@
* @author Dasarath Weeratunge
*/
public class Transaction {
- private static String COMPLETION_PROTOCOL =
"http://schemas.xmlsoap.org/ws/2003/09/wsat#Completion";;
+ private static String COMPLETION_PROTOCOL =
"http://schemas.xmlsoap.org/ws/2004/10/wsat/Completion";;
private _CoordinationContext 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=358418&r1=358417&r2=358418&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 Dec 21 15:13:39 2005
@@ -26,7 +26,7 @@
public class TransactionManager {
- private static String COORDINATION_TYPE=
"http://schemas.xmlsoap.org/ws/2003/09/wsat";;
+ private static String COORDINATION_TYPE=
"http://schemas.xmlsoap.org/ws/2004/10/wsat";;
private static TransactionManager instance= new TransactionManager();
private static ThreadLocal threadInfo= new ThreadLocal();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
