[jboss-svn-commits] JBL Code SVN: r6922 - in labs/jbosstm/trunk/XTS: WS-T/dev/src/com/arjuna/webservices/wsarjtx WS-T/dev/src/com/arjuna/webservices/wsat WS-T/dev/src/com/arjuna/webservices/wsba WSTX/classes/com/arjuna/mw/wst/client WSTX/classes/com/arjuna/mw/wst/common WSTX/classes/com/arjuna/mw/wst/service WSTX/classes/com/arjuna/mwlabs/wst/at WSTX/classes/com/arjuna/mwlabs/wst/at/context WSTX/classes/com/arjuna/mwlabs/wst/at/local WSTX/classes/com/arjuna/mwlabs/wst/at/remote WSTX/classes/com/arjuna/mwlabs/wst/ba WSTX/classes/com/arjuna/mwlabs/wst/ba/context WSTX/classes/com/arjuna/mwlabs/wst/ba/local WSTX/classes/com/arjuna/mwlabs/wst/ba/remote
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 19 13:33:50 EDT 2006
Author: kevin.conner at jboss.com
Date: 2006-10-19 13:33:36 -0400 (Thu, 19 Oct 2006)
New Revision: 6922
Removed:
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/common/Protocols.java
Modified:
labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsarjtx/ArjunaTXConstants.java
labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsat/AtomicTransactionConstants.java
labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsba/BusinessActivityConstants.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/client/GlueIncomingContextInterceptor.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/GlueIncomingContextInterceptor.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/GlueOutgoingContextInterceptor.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/ContextFactoryImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/RegistrarImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/context/ArjunaContextImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/LocalContextFactoryImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/LocalRegistrarImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/TransactionManagerImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/UserTransactionImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/remote/TransactionManagerImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/remote/UserTransactionImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/RegistrarImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/context/ArjunaContextImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/BusinessActivityManagerImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/LocalContextFactoryImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/LocalRegistrarImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/UserBusinessActivityImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/remote/BusinessActivityManagerImple.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/remote/UserBusinessActivityImple.java
Log:
Tidy up namespace/protocol usage: JBTM-151
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsarjtx/ArjunaTXConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsarjtx/ArjunaTXConstants.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsarjtx/ArjunaTXConstants.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -185,4 +185,9 @@
* The unknown error error code.
*/
public static final QName UNKNOWNERROR_ERROR_CODE_QNAME = new QName(WSARJTX_NAMESPACE, UNKNOWNERROR_ERROR_CODE, WSARJTX_PREFIX);
+
+ /**
+ * The termination protocol.
+ */
+ public String WSARJTX_PROTOCOL_TERMINATION = WSARJTX_NAMESPACE + "/BATermination";
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsat/AtomicTransactionConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsat/AtomicTransactionConstants.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsat/AtomicTransactionConstants.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -198,4 +198,21 @@
* The InconsistentInternalState error code QName.
*/
public QName WSAT_ERROR_CODE_INCONSISTENT_INTERNAL_STATE_QNAME = new QName(WSAT_NAMESPACE, WSAT_ERROR_CODE_INCONSISTENT_INTERNAL_STATE, WSAT_PREFIX) ;
+
+ /**
+ * The atomic transaction protocol.
+ */
+ public String WSAT_PROTOCOL = WSAT_NAMESPACE ;
+ /**
+ * The atomic transaction completion protocol.
+ */
+ public String WSAT_SUB_PROTOCOL_COMPLETION = WSAT_NAMESPACE + "/Completion" ;
+ /**
+ * The atomic transaction durable 2PC protocol.
+ */
+ public String WSAT_SUB_PROTOCOL_DURABLE_2PC = WSAT_NAMESPACE + "/Durable2PC" ;
+ /**
+ * The atomic transaction volatile 2PC protocol.
+ */
+ public String WSAT_SUB_PROTOCOL_VOLATILE_2PC = WSAT_NAMESPACE + "/Volatile2PC" ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsba/BusinessActivityConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsba/BusinessActivityConstants.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/wsba/BusinessActivityConstants.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -250,4 +250,21 @@
* The InconsistentInternalState error code QName.
*/
public QName WSBA_ERROR_CODE_INCONSISTENT_INTERNAL_STATE_QNAME = new QName(WSBA_NAMESPACE, WSBA_ERROR_CODE_INCONSISTENT_INTERNAL_STATE, WSBA_PREFIX) ;
+
+ /**
+ * The business activity atomic outcome protocol.
+ */
+ public String WSBA_PROTOCOL_ATOMIC_OUTCOME = WSBA_NAMESPACE + "/AtomicOutcome" ;
+ /**
+ * The business activity mixed outcome protocol.
+ */
+ public String WSBA_PROTOCOL_MIXED_OUTCOME = WSBA_NAMESPACE + "/MixedOutcome" ;
+ /**
+ * The participant completion protocol.
+ */
+ public String WSBA_SUB_PROTOCOL_PARTICIPANT_COMPLETION = WSBA_NAMESPACE + "/ParticipantCompletion" ;
+ /**
+ * The coordinator completion protocol.
+ */
+ public String WSBA_SUB_PROTOCOL_COORDINATOR_COMPLETION = WSBA_NAMESPACE + "/CoordinatorCompletion" ;
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/client/GlueIncomingContextInterceptor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/client/GlueIncomingContextInterceptor.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/client/GlueIncomingContextInterceptor.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -39,8 +39,9 @@
import com.arjuna.mw.wst.TransactionManagerFactory;
import com.arjuna.mw.wst.TxContext;
import com.arjuna.mw.wst.common.CoordinationContextHelper;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
+import com.arjuna.webservices.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
import com.arjuna.webservices.wscoor.CoordinationConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
@@ -79,12 +80,12 @@
{
final CoordinationContextType cc = CoordinationContextHelper.deserialise(soapHeaderElement) ;
final String coordinationType = cc.getCoordinationType().getValue() ;
- if (Protocols.AtomicTransaction.equals(coordinationType))
+ if (AtomicTransactionConstants.WSAT_PROTOCOL.equals(coordinationType))
{
final TxContext txContext = new com.arjuna.mwlabs.wst.at.context.TxContextImple(cc) ;
TransactionManagerFactory.transactionManager().resume(txContext) ;
}
- else if (Protocols.BusinessActivityAtomic.equals(coordinationType))
+ else if (BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME.equals(coordinationType))
{
final TxContext txContext = new com.arjuna.mwlabs.wst.ba.context.TxContextImple(cc);
BusinessActivityManagerFactory.businessActivityManager().resume(txContext) ;
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -52,9 +52,10 @@
import com.arjuna.mw.wst.TransactionManagerFactory;
import com.arjuna.mw.wst.TxContext;
import com.arjuna.mw.wst.common.CoordinationContextHelper;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wst.common.SOAPUtil;
import com.arjuna.mw.wstx.logging.wstxLogger;
+import com.arjuna.webservices.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
import com.arjuna.webservices.wscoor.CoordinationConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
@@ -232,12 +233,12 @@
if (cc != null)
{
final String coordinationType = cc.getCoordinationType().getValue() ;
- if (Protocols.AtomicTransaction.equals(coordinationType))
+ if (AtomicTransactionConstants.WSAT_PROTOCOL.equals(coordinationType))
{
final TxContext txContext = new com.arjuna.mwlabs.wst.at.context.TxContextImple(cc) ;
TransactionManagerFactory.transactionManager().resume(txContext) ;
}
- else if (Protocols.BusinessActivityAtomic.equals(coordinationType))
+ else if (BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME.equals(coordinationType))
{
final TxContext txContext = new com.arjuna.mwlabs.wst.ba.context.TxContextImple(cc);
BusinessActivityManagerFactory.businessActivityManager().resume(txContext) ;
Deleted: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/common/Protocols.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/common/Protocols.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/common/Protocols.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2003,
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Protocols.java,v 1.6 2004/12/21 09:49:14 kconner Exp $
- */
-
-package com.arjuna.mw.wst.common;
-
-/**
- */
-
-public interface Protocols
-{
-
- public static final String AtomicTransaction = "http://schemas.xmlsoap.org/ws/2004/10/wsat";
- public static final String BusinessActivityAtomic = "http://schemas.xmlsoap.org/ws/2004/10/wsba/AtomicOutcome";
- public static final String BusinessActivityMixed = "http://schemas.xmlsoap.org/ws/2004/10/wsba/MixedOutcome";
-
- /*
- * The AtomicTransaction subprotocols.
- */
-
- public static final String Completion = "http://schemas.xmlsoap.org/ws/2004/10/wsat/Completion";
- public static final String DurableTwoPhaseCommit = "http://schemas.xmlsoap.org/ws/2004/10/wsat/Durable2PC";
- public static final String VolatileTwoPhaseCommit = "http://schemas.xmlsoap.org/ws/2004/10/wsat/Volatile2PC";
-
- /*
- * The BusinessActivity subprotocols.
- */
-
- public static final String BusinessAgreementWithParticipantCompletion = "http://schemas.xmlsoap.org/ws/2004/10/wsba/ParticipantCompletion";
- public static final String BusinessAgreementWithCoordinatorCompletion = "http://schemas.xmlsoap.org/ws/2004/10/wsba/CoordinatorCompletion";
- public static final String BusinessAgreementTermination = "http://schemas.arjuna.com/ws/2005/10/wsarj/BATermination";
-
-}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/GlueIncomingContextInterceptor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/GlueIncomingContextInterceptor.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/GlueIncomingContextInterceptor.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -18,4 +18,6 @@
* (C) 2005-2006,
* @author JBoss Inc.
*/
-/*
* Copyright (C) 2005,
*
* Arjuna Technologies Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
* UK.
*
* $Id$
*
* @author Malik SAHEB
*/
package com.arjuna.mw.wst.service;
import com.arjuna.mw.wst.BusinessActivityManager;
import com.arjuna.mw.wst.BusinessActivityManagerFactory;
import com.arjuna.mw.wst.TransactionManager;
import com.arjuna.mw.wst.TransactionManagerFactory;
import com.arjuna.mw.wst.TxContext;
import com.arjuna.mw.wst.common.CoordinationContextHelper;
import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.webservices.wscoor.CoordinationConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
import electric.soap.ISOAPInterceptor;
import electric.xml.Element;
/**
* The class is used to perform WS-Transaction context insertion
* and extraction for application level SOAP messages within WebMethods Glue.
*
* @message com.arjuna.mw.wst.service.GlueICI_1 [com.arjuna.mw.wst.service.GlueICI_1] - Error in:
* @message com.arjuna.mw.wst.service.GlueICI_2 [com.arjuna.mw.wst.service.GlueICI_2] - Stack trace:
* @message com.arjuna.mw.wst.service.GlueICI_3 [com.arjuna.mw.wst.service.GlueICI_3] - Unknown context type:
*/
public class GlueIncomingContextInterceptor implements ISOAPInterceptor
{
public void intercept( electric.soap.SOAPMessage soapMessage, electric.util.Context messageContext )
{
if (soapMessage != null)
{
try
{
final TransactionManager transactionManager = TransactionManagerFactory.transactionManager() ;
final BusinessActivityManager businessActivityManager = BusinessActivityManagerFactory.businessActivityManager() ;
if (transactionManager != null)
{
final com.arjuna.mwlabs.wst.at.context.TxContextImple txContext =
(com.arjuna.mwlabs.wst.at.context.TxContextImple)transactionManager.suspend() ;
if (txContext != null)
{
messageContext.setProperty(Protocols.AtomicTransaction, txContext) ;
}
}
if (businessActivityManager != null)
{
final com.arjuna.mwlabs.wst.ba.context.TxContextImple txContext =
(com.arjuna.mwlabs.wst.ba.context.TxContextImple)businessActivityManager.suspend() ;
if (txContext != null)
{
messageContext.setProperty(Protocols.BusinessActivityAtomic, txContext) ;
}
}
final Element soapHeaderElement = soapMessage.getHeaderElement(CoordinationConstants.WSCOOR_NAMESPACE, CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT) ;
if (soapHeaderElement != null)
{
final CoordinationContextType cc = CoordinationContextHelper.deserialise(soapHeaderElement) ;
final String coordinationType = cc.getCoordinationType().getValue() ;
if (Protocols.AtomicTransaction.equals(coordinationType))
{
final TxContext txContext = new com.arjuna.mwlabs.wst.at.context.TxContextImple(cc) ;
transactionManager.resume(txContext) ;
}
else if (Protocols.BusinessActivityAtomic.equals(coordinationType))
{
final TxContext txContext = new com.arjuna.mwlabs.wst.ba.context.TxContextImple(cc);
businessActivityManager.resume(txContext) ;
}
else
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueICI_1",
new Object[]{"com.arjuna.mw.wst.service.GlueOutgoingContextInterceptor.intercept()"});
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueICI_3",
new Object[]{coordinationType});
}
}
}
catch (final Throwable th)
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueICI_1",
new Object[]{"com.arjuna.mw.wst.service.GlueIncomingContextInterceptor.intercept()"});
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueICI_2",
new Object[]{th});
}
}
}
}
+/*
* Copyright (C) 2005,
*
* Arjuna Technologies Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
* UK.
*
* $Id$
*
* @author Malik SAHEB
*/
package com.arjuna.mw.wst.service;
import com.arjuna.mw.wst.BusinessActivityManager;
import com.arjuna.mw.wst.BusinessActivityManagerFactory;
import com.arjuna.mw.wst.TransactionManager;
import com.arjuna.mw.wst.TransactionManagerFactory;
import com.arjuna.mw.wst.TxContext;
import com.arjuna.mw.wst.common.CoordinationContextHelper;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.webservices.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
+import com.arjuna.webservices.wscoor.CoordinationConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
import electric.soap.ISOAPInterceptor;
import electric.xml.Element;
/**
* The class is used to perform WS-Transaction context insertion
* and extraction for application level SOAP messages within WebMethods Glue.
*
* @message com.arjuna.mw.wst.service.GlueICI_1 [com.arjuna.mw.wst.service.GlueICI_1] - Error in:
* @message com.arjuna.mw.wst.service.GlueICI_2 [com.arjuna.mw.wst.service.GlueICI_2] - Stack trace:
* @message com.arjuna.mw.wst.service.GlueICI_3 [com.arjuna.mw.wst.service.GlueICI_3] - Unknown context type:
*/
public class GlueIncomingContextInterceptor implements ISOAPInterceptor
{
public void intercept( electric.soap.SOAPMessage soapMessage, electric.util.Context messageContext )
{
if (soapMessage != null)
{
try
{
final TransactionManager transactionManager = TransactionManagerFactory.transactionManager() ;
final BusinessActivityManager businessActivityManager = BusinessActivityManagerFactory.businessActivityManager() ;
if (transactionManager != null)
{
final com.arjuna.mwlabs.wst.at.context.TxContextImple txContext =
(com.arjuna.mwlabs.wst.at.context.TxContextImple)transactionManager.suspend() ;
if (txContext != null)
{
messageContext.setProperty(AtomicTransactionConstants.WSAT_PROTOCOL, txContext) ;
}
}
if (businessActivityManager != null)
{
final com.arjuna.mwlabs.wst.ba.context.TxContextImple txContext =
(com.arjuna.mwlabs.wst.ba.context.TxContextImple)businessActivityManager.suspend() ;
if (txContext != null)
{
messageContext.setProperty(BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME, txContext) ;
}
}
final Element soapHeaderElement = soapMessage.getHeaderElement(CoordinationConstants.WSCOOR_NAMESPACE, CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT) ;
if (soapHeaderElement != null)
{
final CoordinationContextType cc = CoordinationContextHelper.deserialise(soapHeaderElement) ;
final String coordinationType = cc.getCoordinationType().getValue() ;
if (AtomicTransactionConstants.WSAT_PROTOCOL.equals(coordinationType))
{
final TxContext txContext = new com.arjuna.mwlabs.wst.at.context.TxContextImple(cc) ;
transactionManager.resume(txContext) ;
}
else if (BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME.equals(coordinationType))
{
final TxContext txContext = new com.arjuna.mwlabs.wst.ba.context.TxContextImple(cc);
businessActivityManager.resume(txContext) ;
}
else
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueICI_1",
new Object[]{"com.arjuna.mw.wst.service.GlueOutgoingContextInterceptor.intercept()"});
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueICI_3",
new Object[]{coordinationType});
}
}
}
catch (final Throwable th)
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueICI_1",
new Object[]{"com.arjuna.mw.wst.service.GlueIncomingContextInterceptor.intercept()"});
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueICI_2",
new Object[]{th});
}
}
}
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/GlueOutgoingContextInterceptor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/GlueOutgoingContextInterceptor.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/GlueOutgoingContextInterceptor.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -18,4 +18,13 @@
* (C) 2005-2006,
* @author JBoss Inc.
*/
-/*
* Copyright (C) 2005,
*
* Arjuna Technologies Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
* UK.
*
* $Id$
*/
package com.arjuna.mw.wst.service;
import com.arjuna.mw.wst.BusinessActivityManager;
import com.arjuna.mw.wst.BusinessActivityManagerFactory;
import com.arjuna.mw.wst.TransactionManager;
import com.arjuna.mw.wst.TransactionManagerFactory;
import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import electric.soap.ISOAPInterceptor;
/**
* The class is used to perform WS-Transaction context insertion
* and extraction for application level SOAP messages within WebMethods Glue.
*
* @message com.arjuna.mw.wst.service.GlueOCI_1 [com.arjuna.mw.wst.service.GlueOCI_1] - Error in:
* @message com.arjuna.mw.wst.service.GlueOCI_2 [com.arjuna.mw.wst.service.GlueOCI_2] - Stack trace:
*/
public class GlueOutgoingContextInterceptor implements ISOAPInterceptor
{
public void intercept( electric.soap.SOAPMessage soapMessage, electric.util.Context messageContext )
{
try
{
final TransactionManager transactionManager = TransactionManagerFactory.transactionManager() ;
final com.arjuna.mwlabs.wst.at.context.TxContextImple atTXContext =
(com.arjuna.mwlabs.wst.at.context.TxContextImple)messageContext.getProperty(Protocols.AtomicTransaction) ;
if (atTXContext != null)
{
transactionManager.resume(atTXContext) ;
}
else
{
transactionManager.suspend() ;
}
final BusinessActivityManager businessActivityManager = BusinessActivityManagerFactory.businessActivityManager() ;
final com.arjuna.mwlabs.wst.ba.context.TxContextImple baTXContext =
(com.arjuna.mwlabs.wst.ba.context.TxContextImple)messageContext.getProperty(Protocols.BusinessActivityAtomic) ;
if (baTXContext != null)
{
businessActivityManager.resume(baTXContext) ;
}
else
{
businessActivityManager.suspend() ;
}
}
catch (final Throwable th)
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueOCI_1",
new Object[]{"com.arjuna.mw.wst.service.GlueOutgoingContextInterceptor.intercept()"});
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueOCI_2",
new Object[]{th});
}
}
}
+/*
* Copyright (C) 2005,
*
* Arjuna Technologies Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
* UK.
*
* $Id$
*/
package com.arjuna.mw.wst.service;
import com.arjuna.mw.wst.BusinessActivityManager;
+import com.arjuna.mw.wst.BusinessActivityManagerFactory;
+import com.arjuna.mw.wst.TransactionManager;
+import com.arjuna.mw.wst.TransactionManagerFactory;
+import com.arjuna.mw.wstx.logging.wstxLogger;
+import com.arjuna.webservices.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
+
+import electric.soap.ISOAPInterceptor;
+
/**
* The class is used to perform WS-Transaction context insertion
* and extraction for application level SOAP messages within WebMethods Glue.
*
* @message com.arjuna.mw.wst.service.GlueOCI_1 [com.arjuna.mw.wst.service.GlueOCI_1] - Error in:
* @message com.arjuna.mw.wst.service.GlueOCI_2 [com.arjuna.mw.wst.service.GlueOCI_2] - Stack trace:
*/
public class GlueOutgoingContextInterceptor implements ISOAPInterceptor
{
public void intercept( electric.soap.SOAPMessage soapMessage, electric.util.Context messageContext )
{
try
{
final TransactionManager transactionManager = TransactionManagerFactory.transactionManager() ;
final com.arjuna.mwlabs.wst.at.context.TxContextImple atTXContext =
(com.arjuna.mwlabs.wst.at.context.TxContextImple)messageContext.getProperty(AtomicTransactionConstants.WSAT_PROTOCOL) ;
if (atTXContext != null)
{
transactionManager.resume(atTXContext) ;
}
else
{
transactionManager.suspend() ;
}
final BusinessActivityManager businessActivityManager = BusinessActivityManagerFactory.businessActivityManager() ;
final com.arjuna.mwlabs.wst.ba.context.TxContextImple baTXContext =
(com.arjuna.mwlabs.wst.ba.context.TxContextImple)messageContext.getProperty(BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME) ;
if (baTXContext != null)
{
businessActivityManager.resume(baTXContext) ;
}
else
{
businessActivityManager.suspend() ;
}
}
catch (final Throwable th)
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueOCI_1",
new Object[]{"com.arjuna.mw.wst.service.GlueOutgoingContextInterceptor.intercept()"});
wstxLogger.arjLoggerI18N.warn("com.arjuna.mw.wst.service.GlueOCI_2",
new Object[]{th});
}
}
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -51,9 +51,10 @@
import com.arjuna.mw.wst.TransactionManagerFactory;
import com.arjuna.mw.wst.TxContext;
import com.arjuna.mw.wst.common.CoordinationContextHelper;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wst.common.SOAPUtil;
import com.arjuna.mw.wstx.logging.wstxLogger;
+import com.arjuna.webservices.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
import com.arjuna.webservices.wscoor.CoordinationConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
@@ -118,12 +119,12 @@
{
final CoordinationContextType cc = CoordinationContextHelper.deserialise(soapEnvelope, soapHeaderElement) ;
final String coordinationType = cc.getCoordinationType().getValue() ;
- if (Protocols.AtomicTransaction.equals(coordinationType))
+ if (AtomicTransactionConstants.WSAT_PROTOCOL.equals(coordinationType))
{
final TxContext txContext = new com.arjuna.mwlabs.wst.at.context.TxContextImple(cc) ;
TransactionManagerFactory.transactionManager().resume(txContext) ;
}
- else if (Protocols.BusinessActivityAtomic.equals(coordinationType))
+ else if (BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME.equals(coordinationType))
{
final TxContext txContext = new com.arjuna.mwlabs.wst.ba.context.TxContextImple(cc);
BusinessActivityManagerFactory.businessActivityManager().resume(txContext) ;
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/ContextFactoryImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/ContextFactoryImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/ContextFactoryImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -35,7 +35,6 @@
import com.arjuna.mw.wsas.exceptions.SystemException;
import com.arjuna.mw.wscf.model.twophase.CoordinatorManagerFactory;
import com.arjuna.mw.wscf.model.twophase.api.CoordinatorManager;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mwlabs.wscf.coordinator.LocalFactory;
import com.arjuna.mwlabs.wscf.model.twophase.arjunacore.ACCoordinator;
@@ -48,6 +47,7 @@
import com.arjuna.webservices.wsaddr.AttributedURIType;
import com.arjuna.webservices.wsaddr.EndpointReferenceType;
import com.arjuna.webservices.wsarj.InstanceIdentifier;
+import com.arjuna.webservices.wsat.AtomicTransactionConstants;
import com.arjuna.webservices.wscoor.AttributedUnsignedIntType;
import com.arjuna.webservices.wscoor.CoordinationConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
@@ -118,7 +118,7 @@
final CoordinationContextType currentContext)
throws InvalidCreateParametersException
{
- if (coordinationTypeURI.equals(Protocols.AtomicTransaction))
+ if (coordinationTypeURI.equals(AtomicTransactionConstants.WSAT_PROTOCOL))
{
try
{
@@ -200,12 +200,12 @@
else
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wst.at.ContextFactoryImple_1", new Object[]
- { Protocols.AtomicTransaction, coordinationTypeURI });
+ { AtomicTransactionConstants.WSAT_PROTOCOL, coordinationTypeURI });
throw new InvalidCreateParametersException(
wstxLogger.log_mesg.getString("com.arjuna.mwlabs.wst.at.ContextFactoryImple_3")
+ " < "
- + Protocols.AtomicTransaction
+ + AtomicTransactionConstants.WSAT_PROTOCOL
+ ", "
+ coordinationTypeURI + " >");
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/RegistrarImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/RegistrarImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/RegistrarImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -39,7 +39,6 @@
import com.arjuna.mw.wscf.exceptions.ProtocolNotRegisteredException;
import com.arjuna.mw.wscf.model.twophase.CoordinatorManagerFactory;
import com.arjuna.mw.wscf.model.twophase.api.CoordinatorManager;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mwlabs.wscf.model.twophase.arjunacore.ACCoordinator;
import com.arjuna.mwlabs.wscf.model.twophase.arjunacore.subordinate.SubordinateCoordinator;
@@ -86,9 +85,9 @@
// register with mapper using tx id as protocol identifier.
final RegistrarMapper mapper = RegistrarMapper.getFactory() ;
- mapper.addRegistrar(Protocols.DurableTwoPhaseCommit, this);
- mapper.addRegistrar(Protocols.VolatileTwoPhaseCommit, this);
- mapper.addRegistrar(Protocols.Completion, this);
+ mapper.addRegistrar(AtomicTransactionConstants.WSAT_SUB_PROTOCOL_DURABLE_2PC, this);
+ mapper.addRegistrar(AtomicTransactionConstants.WSAT_SUB_PROTOCOL_VOLATILE_2PC, this);
+ mapper.addRegistrar(AtomicTransactionConstants.WSAT_SUB_PROTOCOL_COMPLETION, this);
}
/**
@@ -171,7 +170,7 @@
// TODO check for AlreadyRegisteredException
- if (Protocols.DurableTwoPhaseCommit.equals(protocolIdentifier))
+ if (AtomicTransactionConstants.WSAT_SUB_PROTOCOL_DURABLE_2PC.equals(protocolIdentifier))
{
// enlist participant that wraps the requester URI.
final String participantId = new Uid().stringForm();
@@ -190,7 +189,7 @@
throw new InvalidStateException();
}
}
- else if (Protocols.VolatileTwoPhaseCommit.equals(protocolIdentifier))
+ else if (AtomicTransactionConstants.WSAT_SUB_PROTOCOL_VOLATILE_2PC.equals(protocolIdentifier))
{
// enlist participant that wraps the requester URI.
final String participantId = new Uid().stringForm();
@@ -209,7 +208,7 @@
throw new InvalidStateException();
}
}
- else if (Protocols.Completion.equals(protocolIdentifier))
+ else if (AtomicTransactionConstants.WSAT_SUB_PROTOCOL_COMPLETION.equals(protocolIdentifier))
{
try
{
@@ -230,7 +229,7 @@
else
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wst.at.RegistrarImple_1", new Object[]
- { Protocols.AtomicTransaction, protocolIdentifier });
+ { AtomicTransactionConstants.WSAT_PROTOCOL, protocolIdentifier });
throw new InvalidProtocolException();
}
@@ -278,7 +277,7 @@
throws AlreadyRegisteredException, InvalidProtocolException,
InvalidStateException, NoActivityException
{
- if (Protocols.DurableTwoPhaseCommit.equals(protocolIdentifier))
+ if (AtomicTransactionConstants.WSAT_SUB_PROTOCOL_DURABLE_2PC.equals(protocolIdentifier))
{
// enlist participant that wraps the requester URI.
final String participantId = new Uid().stringForm();
@@ -295,7 +294,7 @@
throw new InvalidStateException();
}
}
- else if (Protocols.VolatileTwoPhaseCommit.equals(protocolIdentifier))
+ else if (AtomicTransactionConstants.WSAT_SUB_PROTOCOL_VOLATILE_2PC.equals(protocolIdentifier))
{
// enlist participant that wraps the requester URI.
final String participantId = new Uid().stringForm();
@@ -312,7 +311,7 @@
throw new InvalidStateException();
}
}
- else if (Protocols.Completion.equals(protocolIdentifier))
+ else if (AtomicTransactionConstants.WSAT_SUB_PROTOCOL_COMPLETION.equals(protocolIdentifier))
{
// not allowed for subordinate transactions!
@@ -321,7 +320,7 @@
else
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wst.at.RegistrarImple_1", new Object[]
- { Protocols.AtomicTransaction, protocolIdentifier });
+ { AtomicTransactionConstants.WSAT_PROTOCOL, protocolIdentifier });
throw new InvalidProtocolException();
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/context/ArjunaContextImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/context/ArjunaContextImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/context/ArjunaContextImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -43,9 +43,10 @@
import com.arjuna.mw.wsas.context.soap.SOAPContext;
import com.arjuna.mw.wsas.exceptions.SystemException;
import com.arjuna.mw.wscf.utils.DomUtil;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mwlabs.wscf.model.twophase.arjunacore.ACCoordinator;
+import com.arjuna.webservices.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices.wscoor.CoordinationConstants;
/**
* On demand this class creates the SOAP context information necessary to
@@ -163,7 +164,7 @@
_context.appendChild(expires);
org.w3c.dom.Element coordinationType = doc.createElement("wscoor:CoordinationType");
- coordinationType.appendChild(doc.createTextNode(Protocols.AtomicTransaction));
+ coordinationType.appendChild(doc.createTextNode(AtomicTransactionConstants.WSAT_PROTOCOL));
_context.appendChild(coordinationType);
@@ -247,12 +248,11 @@
private String[] _identifierValues ;
private int[] _expiresValues ;
- private static final String _wscoorNamespace = "http://schemas.xmlsoap.org/ws/2004/10/wscoor";
+ private static final String _wscoorNamespace = CoordinationConstants.WSCOOR_NAMESPACE;
private static final String _wsuNamespace = "http://schemas.xmlsoap.org/ws/2002/07/utility";
private static final String _arjunaNamespace = "http://arjuna.com/schemas/wsc/2003/01/extension";
- private static final String _contextName = "CoordinationContext";
- private static final String _identifier = "Identifier";
- private static final String _expires = "Expires";
- private static final String _coordinationType = "CoordinationType";
+ private static final String _contextName = CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT;
+ private static final String _identifier = CoordinationConstants.WSCOOR_ELEMENT_IDENTIFIER;
+ private static final String _expires = CoordinationConstants.WSCOOR_ELEMENT_EXPIRES;
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/LocalContextFactoryImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/LocalContextFactoryImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/LocalContextFactoryImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -35,7 +35,6 @@
import com.arjuna.mw.wsas.context.DeploymentContextFactory;
import com.arjuna.mw.wscf.model.twophase.CoordinatorManagerFactory;
import com.arjuna.mw.wscf.model.twophase.api.CoordinatorManager;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mwlabs.wst.at.context.ArjunaContextImple;
import com.arjuna.webservices.SoapRegistry;
@@ -43,6 +42,7 @@
import com.arjuna.webservices.wsaddr.AttributedURIType;
import com.arjuna.webservices.wsaddr.EndpointReferenceType;
import com.arjuna.webservices.wsarj.InstanceIdentifier;
+import com.arjuna.webservices.wsat.AtomicTransactionConstants;
import com.arjuna.webservices.wscoor.AttributedUnsignedIntType;
import com.arjuna.webservices.wscoor.CoordinationConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
@@ -105,7 +105,7 @@
final Long expires, final CoordinationContextType currentContext)
throws InvalidCreateParametersException
{
- if (coordinationTypeURI.equals(Protocols.AtomicTransaction))
+ if (coordinationTypeURI.equals(AtomicTransactionConstants.WSAT_PROTOCOL))
{
try
{
@@ -155,12 +155,12 @@
else
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wst.at.local.LocalContextFactoryImple_1", new Object[]
- { Protocols.AtomicTransaction, coordinationTypeURI });
+ { AtomicTransactionConstants.WSAT_PROTOCOL, coordinationTypeURI });
throw new InvalidCreateParametersException(
wstxLogger.log_mesg.getString("com.arjuna.mwlabs.wst.at.local.LocalContextFactoryImple_11"
+ " <"
- + Protocols.AtomicTransaction
+ + AtomicTransactionConstants.WSAT_PROTOCOL
+ ", "
+ coordinationTypeURI + " >"));
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/LocalRegistrarImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/LocalRegistrarImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/LocalRegistrarImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -39,10 +39,9 @@
import com.arjuna.mwlabs.wst.at.participants.*;
+import com.arjuna.webservices.wsat.AtomicTransactionConstants;
import com.arjuna.wst.*;
-import com.arjuna.mw.wst.common.Protocols;
-
import com.arjuna.wsc.AlreadyRegisteredException;
import com.arjuna.wsc.InvalidProtocolException;
import com.arjuna.wsc.InvalidStateException;
@@ -101,7 +100,7 @@
{
// TODO check for AlreadyRegisteredException
- if (protocolIdentifier.equals(Protocols.DurableTwoPhaseCommit))
+ if (protocolIdentifier.equals(AtomicTransactionConstants.WSAT_SUB_PROTOCOL_DURABLE_2PC))
{
// enlist participant that wraps the requester URI.
@@ -118,7 +117,7 @@
}
else
{
- if (protocolIdentifier.equals(Protocols.VolatileTwoPhaseCommit))
+ if (protocolIdentifier.equals(AtomicTransactionConstants.WSAT_SUB_PROTOCOL_VOLATILE_2PC))
{
try
{
@@ -133,7 +132,7 @@
else
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wst.at.local.LocalRegistrarImple_1", new Object[]
- { Protocols.AtomicTransaction, protocolIdentifier });
+ { AtomicTransactionConstants.WSAT_PROTOCOL, protocolIdentifier });
throw new InvalidProtocolException();
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/TransactionManagerImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/TransactionManagerImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/TransactionManagerImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -33,10 +33,9 @@
import com.arjuna.mw.wstx.logging.wstxLogger;
+import com.arjuna.webservices.wsat.AtomicTransactionConstants;
import com.arjuna.wst.*;
-import com.arjuna.mw.wst.common.Protocols;
-
import com.arjuna.wsc.AlreadyRegisteredException;
import com.arjuna.mw.wst.TransactionManager;
@@ -66,7 +65,7 @@
{
try
{
- _registrar.register(tpp, Protocols.DurableTwoPhaseCommit);
+ _registrar.register(tpp, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_DURABLE_2PC);
}
catch (com.arjuna.wsc.InvalidProtocolException ex)
{
@@ -88,7 +87,7 @@
{
try
{
- _registrar.register(tpp, Protocols.VolatileTwoPhaseCommit);
+ _registrar.register(tpp, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_VOLATILE_2PC);
}
catch (com.arjuna.wsc.InvalidProtocolException ex)
{
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/UserTransactionImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/UserTransactionImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/local/UserTransactionImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -32,9 +32,9 @@
package com.arjuna.mwlabs.wst.at.local;
import com.arjuna.mw.wst.UserTransaction;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mwlabs.wst.at.context.TxContextImple;
import com.arjuna.mwlabs.wst.at.participants.CompletionCoordinatorImple;
+import com.arjuna.webservices.wsat.AtomicTransactionConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
import com.arjuna.wst.SystemException;
import com.arjuna.wst.TransactionRolledBackException;
@@ -71,7 +71,7 @@
if (_contextManager.currentTransaction() != null)
throw new WrongStateException();
- final CoordinationContextType ctx = _factory.create(Protocols.AtomicTransaction, null, null);
+ final CoordinationContextType ctx = _factory.create(AtomicTransactionConstants.WSAT_PROTOCOL, null, null);
TxContextImple theContext = new TxContextImple(ctx);
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/remote/TransactionManagerImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/remote/TransactionManagerImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/remote/TransactionManagerImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -34,7 +34,6 @@
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.mw.wst.TransactionManager;
import com.arjuna.mw.wst.TxContext;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mwlabs.wst.at.context.TxContextImple;
import com.arjuna.webservices.SoapFault;
@@ -75,7 +74,7 @@
{
try
{
- registerParticipant(getParticipant(id) , Protocols.DurableTwoPhaseCommit);
+ registerParticipant(getParticipant(id) , AtomicTransactionConstants.WSAT_SUB_PROTOCOL_DURABLE_2PC);
ParticipantProcessor.getProcessor().activateParticipant(new ParticipantEngine(tpp), id) ;
}
@@ -99,7 +98,7 @@
{
try
{
- registerParticipant(getParticipant(id), Protocols.VolatileTwoPhaseCommit);
+ registerParticipant(getParticipant(id), AtomicTransactionConstants.WSAT_SUB_PROTOCOL_VOLATILE_2PC);
ParticipantProcessor.getProcessor().activateParticipant(new ParticipantEngine(tpp), id) ;
}
@@ -168,7 +167,7 @@
if (currentTx == null)
throw new com.arjuna.wsc.NoActivityException();
- return registerParticipant(participantEndpoint, Protocols.Completion);
+ return registerParticipant(participantEndpoint, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_COMPLETION);
}
catch (com.arjuna.wsc.InvalidProtocolException ex)
{
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/remote/UserTransactionImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/remote/UserTransactionImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/at/remote/UserTransactionImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -37,7 +37,6 @@
import com.arjuna.mw.wst.TransactionManager;
import com.arjuna.mw.wst.UserTransaction;
import com.arjuna.mw.wst.common.Environment;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mwlabs.wst.at.ContextImple;
import com.arjuna.mwlabs.wst.at.context.TxContextImple;
@@ -216,7 +215,7 @@
final Long expires = (timeout > 0 ? new Long(timeout) : null) ;
final String messageId = new Uid().stringForm() ;
final CoordinationContextType coordinationContext = ActivationCoordinator.createCoordinationContext(
- _activationCoordinatorService, messageId, Protocols.AtomicTransaction, expires, null) ;
+ _activationCoordinatorService, messageId, AtomicTransactionConstants.WSAT_PROTOCOL, expires, null) ;
if (coordinationContext == null)
{
throw new SystemException(
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -33,7 +33,6 @@
import com.arjuna.mw.wscf.model.sagas.CoordinatorManagerFactory;
import com.arjuna.mw.wscf.model.sagas.api.CoordinatorManager;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mwlabs.wst.ba.context.ArjunaContextImple;
import com.arjuna.webservices.SoapRegistry;
@@ -42,6 +41,7 @@
import com.arjuna.webservices.wsaddr.EndpointReferenceType;
import com.arjuna.webservices.wsarj.InstanceIdentifier;
import com.arjuna.webservices.wsarjtx.processors.TerminationCoordinatorProcessor;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
import com.arjuna.webservices.wscoor.AttributedUnsignedIntType;
import com.arjuna.webservices.wscoor.CoordinationConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
@@ -104,7 +104,7 @@
final Long expires, final CoordinationContextType currentContext)
throws InvalidCreateParametersException
{
- if (Protocols.BusinessActivityAtomic.equals(coordinationTypeURI))
+ if (BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME.equals(coordinationTypeURI))
{
try
{
@@ -175,9 +175,9 @@
else
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wst.ba.ContextFactoryImple_1",
- new Object[]{Protocols.BusinessActivityAtomic, coordinationTypeURI});
+ new Object[]{BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME, coordinationTypeURI});
- throw new InvalidCreateParametersException(wstxLogger.log_mesg.getString("com.arjuna.mwlabs.wst.ba.ContextFactoryImple_3")+" < "+Protocols.BusinessActivityAtomic+", "+coordinationTypeURI+" >");
+ throw new InvalidCreateParametersException(wstxLogger.log_mesg.getString("com.arjuna.mwlabs.wst.ba.ContextFactoryImple_3")+" < "+BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME+", "+coordinationTypeURI+" >");
}
return null;
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/RegistrarImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/RegistrarImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/RegistrarImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -39,7 +39,6 @@
import com.arjuna.mw.wscf.exceptions.ProtocolNotRegisteredException;
import com.arjuna.mw.wscf.model.sagas.CoordinatorManagerFactory;
import com.arjuna.mw.wscf.model.sagas.api.CoordinatorManager;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mwlabs.wst.ba.participants.BusinessAgreementWithCoordinatorCompletionImple;
import com.arjuna.mwlabs.wst.ba.participants.BusinessAgreementWithParticipantCompletionImple;
@@ -49,8 +48,6 @@
import com.arjuna.webservices.wsarj.InstanceIdentifier;
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import com.arjuna.webservices.wsba.BusinessActivityConstants;
-import com.arjuna.webservices.wsba.processors.CoordinatorCompletionCoordinatorProcessor;
-import com.arjuna.webservices.wsba.processors.ParticipantCompletionCoordinatorProcessor;
import com.arjuna.wsc.AlreadyRegisteredException;
import com.arjuna.wsc.InvalidProtocolException;
import com.arjuna.wsc.InvalidStateException;
@@ -74,10 +71,10 @@
final RegistrarMapper mapper = RegistrarMapper.getFactory();
mapper.addRegistrar(
- Protocols.BusinessAgreementWithParticipantCompletion, this);
+ BusinessActivityConstants.WSBA_SUB_PROTOCOL_PARTICIPANT_COMPLETION, this);
mapper.addRegistrar(
- Protocols.BusinessAgreementWithCoordinatorCompletion, this);
- mapper.addRegistrar(Protocols.BusinessAgreementTermination, this);
+ BusinessActivityConstants.WSBA_SUB_PROTOCOL_COORDINATOR_COMPLETION, this);
+ mapper.addRegistrar(ArjunaTXConstants.WSARJTX_PROTOCOL_TERMINATION, this);
}
/**
@@ -149,7 +146,7 @@
// TODO check for AlreadyRegisteredException
- if (Protocols.BusinessAgreementWithParticipantCompletion
+ if (BusinessActivityConstants.WSBA_SUB_PROTOCOL_PARTICIPANT_COMPLETION
.equals(protocolIdentifier))
{
// enlist participant that wraps the requester URI.
@@ -176,7 +173,7 @@
}
}
else
- if (Protocols.BusinessAgreementWithCoordinatorCompletion
+ if (BusinessActivityConstants.WSBA_SUB_PROTOCOL_COORDINATOR_COMPLETION
.equals(protocolIdentifier))
{
final String id = new Uid().stringForm();
@@ -201,8 +198,7 @@
}
}
else
- if (Protocols.BusinessAgreementTermination
- .equals(protocolIdentifier))
+ if (ArjunaTXConstants.WSARJTX_PROTOCOL_TERMINATION.equals(protocolIdentifier))
{
try
{
@@ -220,7 +216,7 @@
wstxLogger.arjLoggerI18N
.warn(
"com.arjuna.mwlabs.wst.ba.RegistrarImple_1",
- new Object[] { Protocols.BusinessActivityAtomic, protocolIdentifier });
+ new Object[] { BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME, protocolIdentifier });
throw new InvalidProtocolException();
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/context/ArjunaContextImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/context/ArjunaContextImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/context/ArjunaContextImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -43,9 +43,9 @@
import com.arjuna.mw.wsas.context.soap.SOAPContext;
import com.arjuna.mw.wsas.exceptions.SystemException;
import com.arjuna.mw.wscf.utils.DomUtil;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mwlabs.wscf.model.sagas.arjunacore.ACCoordinator;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
/**
* On demand this class creates the SOAP context information necessary to
@@ -163,7 +163,7 @@
_context.appendChild(expires);
org.w3c.dom.Element coordinationType = doc.createElement("wscoor:CoordinationType");
- coordinationType.appendChild(doc.createTextNode(Protocols.BusinessActivityAtomic));
+ coordinationType.appendChild(doc.createTextNode(BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME));
_context.appendChild(coordinationType);
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/BusinessActivityManagerImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/BusinessActivityManagerImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/BusinessActivityManagerImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -31,14 +31,15 @@
package com.arjuna.mwlabs.wst.ba.local;
-import com.arjuna.wst.*;
-
-import com.arjuna.mw.wst.common.Protocols;
-
-import com.arjuna.wsc.AlreadyRegisteredException;
-
import com.arjuna.mw.wst.BusinessActivityManager;
import com.arjuna.mw.wst.TxContext;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
+import com.arjuna.wsc.AlreadyRegisteredException;
+import com.arjuna.wst.BusinessAgreementWithCoordinatorCompletionParticipant;
+import com.arjuna.wst.BusinessAgreementWithParticipantCompletionParticipant;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.UnknownTransactionException;
+import com.arjuna.wst.WrongStateException;
/**
* This is the interface that the core exposes in order to allow different
@@ -63,7 +64,7 @@
{
try
{
- _registrar.register(pzp, Protocols.BusinessAgreementWithParticipantCompletion, id);
+ _registrar.register(pzp, BusinessActivityConstants.WSBA_SUB_PROTOCOL_PARTICIPANT_COMPLETION, id);
return new BAParticipantManagerImple(id);
}
@@ -85,7 +86,7 @@
{
try
{
- _registrar.register(tpp, Protocols.BusinessAgreementWithCoordinatorCompletion, id);
+ _registrar.register(tpp, BusinessActivityConstants.WSBA_SUB_PROTOCOL_COORDINATOR_COMPLETION, id);
return new BAParticipantManagerImple(id);
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/LocalContextFactoryImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/LocalContextFactoryImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/LocalContextFactoryImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -31,29 +31,24 @@
package com.arjuna.mwlabs.wst.ba.local;
+import com.arjuna.mw.wsas.context.DeploymentContext;
+import com.arjuna.mw.wsas.context.DeploymentContextFactory;
+import com.arjuna.mw.wscf.model.sagas.CoordinatorManagerFactory;
+import com.arjuna.mw.wscf.model.sagas.api.CoordinatorManager;
import com.arjuna.mw.wstx.logging.wstxLogger;
-
import com.arjuna.mwlabs.wst.at.context.ArjunaContextImple;
-
-import com.arjuna.mw.wst.common.Protocols;
-
import com.arjuna.webservices.SoapRegistry;
import com.arjuna.webservices.stax.URI;
import com.arjuna.webservices.wsaddr.AttributedURIType;
import com.arjuna.webservices.wsaddr.EndpointReferenceType;
import com.arjuna.webservices.wsarj.InstanceIdentifier;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
import com.arjuna.webservices.wscoor.AttributedUnsignedIntType;
import com.arjuna.webservices.wscoor.CoordinationConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
import com.arjuna.wsc.ContextFactory;
import com.arjuna.wsc.InvalidCreateParametersException;
-import com.arjuna.mw.wsas.context.DeploymentContext;
-import com.arjuna.mw.wsas.context.DeploymentContextFactory;
-
-import com.arjuna.mw.wscf.model.sagas.CoordinatorManagerFactory;
-import com.arjuna.mw.wscf.model.sagas.api.CoordinatorManager;
-
public class LocalContextFactoryImple implements ContextFactory
{
@@ -101,7 +96,7 @@
final CoordinationContextType currentContext)
throws InvalidCreateParametersException
{
- if (Protocols.BusinessActivityAtomic.equals(coordinationTypeURI))
+ if (BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME.equals(coordinationTypeURI))
{
try
{
@@ -151,9 +146,9 @@
else
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wst.ba.local.LocalContextFactoryImple_1",
- new Object[]{Protocols.BusinessActivityAtomic, coordinationTypeURI});
+ new Object[]{BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME, coordinationTypeURI});
- throw new InvalidCreateParametersException(wstxLogger.log_mesg.getString("com.arjuna.mwlabs.wst.ba.local.LocalContextFactoryImple_11"+" <"+Protocols.BusinessActivityAtomic+", "+coordinationTypeURI+" >"));
+ throw new InvalidCreateParametersException(wstxLogger.log_mesg.getString("com.arjuna.mwlabs.wst.ba.local.LocalContextFactoryImple_11"+" <"+BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME+", "+coordinationTypeURI+" >"));
}
return null;
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/LocalRegistrarImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/LocalRegistrarImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/LocalRegistrarImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -31,21 +31,17 @@
package com.arjuna.mwlabs.wst.ba.local;
-import com.arjuna.mw.wstx.logging.wstxLogger;
-
+import com.arjuna.mw.wscf.model.sagas.CoordinatorManagerFactory;
import com.arjuna.mw.wscf.model.sagas.api.CoordinatorManager;
-
-import com.arjuna.wst.*;
-
-import com.arjuna.mw.wst.common.Protocols;
-
+import com.arjuna.mw.wstx.logging.wstxLogger;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
import com.arjuna.wsc.AlreadyRegisteredException;
import com.arjuna.wsc.InvalidProtocolException;
import com.arjuna.wsc.InvalidStateException;
import com.arjuna.wsc.NoActivityException;
+import com.arjuna.wst.BusinessAgreementWithCoordinatorCompletionParticipant;
+import com.arjuna.wst.BusinessAgreementWithParticipantCompletionParticipant;
-import com.arjuna.mw.wscf.model.sagas.CoordinatorManagerFactory;
-
/**
* This class simulates the use of the real RegistrarImple, which we can't
* use in a local environment simply because we do not have URIs to register:
@@ -92,7 +88,7 @@
{
// TODO check for AlreadyRegisteredException
- if (protocolIdentifier.equals(Protocols.BusinessAgreementWithParticipantCompletion))
+ if (protocolIdentifier.equals(BusinessActivityConstants.WSBA_SUB_PROTOCOL_PARTICIPANT_COMPLETION))
{
// enlist participant that wraps the requester URI.
@@ -107,7 +103,7 @@
}
else
{
- if (protocolIdentifier.equals(Protocols.BusinessAgreementWithCoordinatorCompletion))
+ if (protocolIdentifier.equals(BusinessActivityConstants.WSBA_SUB_PROTOCOL_COORDINATOR_COMPLETION))
{
try
{
@@ -121,7 +117,7 @@
else
{
wstxLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wst.ba.local.LocalRegistrarImple_1",
- new Object[]{Protocols.BusinessActivityAtomic, protocolIdentifier});
+ new Object[]{BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME, protocolIdentifier});
throw new InvalidProtocolException();
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/UserBusinessActivityImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/UserBusinessActivityImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/local/UserBusinessActivityImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -31,16 +31,16 @@
package com.arjuna.mwlabs.wst.ba.local;
-import com.arjuna.mwlabs.wst.ba.context.*;
-
import com.arjuna.mw.wst.UserBusinessActivity;
-import com.arjuna.mw.wst.common.Protocols;
-
+import com.arjuna.mwlabs.wst.ba.context.TxContextImple;
+import com.arjuna.mwlabs.wst.ba.participants.TerminationCoordinatorImple;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
-import com.arjuna.wst.*;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.TransactionRolledBackException;
+import com.arjuna.wst.UnknownTransactionException;
+import com.arjuna.wst.WrongStateException;
-import com.arjuna.mwlabs.wst.ba.participants.*;
-
/**
* This is the interface that allows transactions to be started and terminated.
* The messaging layer converts the Commit, Rollback and Notify messages into
@@ -69,7 +69,7 @@
if (_contextManager.currentTransaction() != null)
throw new WrongStateException();
- CoordinationContextType ctx = _factory.create(Protocols.BusinessActivityAtomic, null, null);
+ CoordinationContextType ctx = _factory.create(BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME, null, null);
TxContextImple theContext = new TxContextImple(ctx);
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/remote/BusinessActivityManagerImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/remote/BusinessActivityManagerImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/remote/BusinessActivityManagerImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -34,7 +34,6 @@
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.mw.wst.BusinessActivityManager;
import com.arjuna.mw.wst.TxContext;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mwlabs.wst.ba.context.TxContextImple;
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapRegistry;
@@ -77,7 +76,7 @@
final EndpointReferenceType participant = getParticipant(BusinessActivityConstants.SERVICE_PARTICIPANT_COMPLETION_PARTICIPANT, id) ;
try
{
- EndpointReferenceType baPMEndpoint = registerParticipant(participant, Protocols.BusinessAgreementWithParticipantCompletion);
+ EndpointReferenceType baPMEndpoint = registerParticipant(participant, BusinessActivityConstants.WSBA_SUB_PROTOCOL_PARTICIPANT_COMPLETION);
final ParticipantCompletionParticipantEngine engine = new ParticipantCompletionParticipantEngine(id, baPMEndpoint, bap) ;
ParticipantCompletionParticipantProcessor.getProcessor().activateParticipant(engine, id) ;
@@ -108,7 +107,7 @@
final EndpointReferenceType participant = getParticipant(BusinessActivityConstants.SERVICE_COORDINATOR_COMPLETION_PARTICIPANT, id) ;
try
{
- EndpointReferenceType baPMEndpoint = registerParticipant(participant, Protocols.BusinessAgreementWithCoordinatorCompletion);
+ EndpointReferenceType baPMEndpoint = registerParticipant(participant, BusinessActivityConstants.WSBA_SUB_PROTOCOL_COORDINATOR_COMPLETION);
final CoordinatorCompletionParticipantEngine engine = new CoordinatorCompletionParticipantEngine(id, baPMEndpoint, bawcp) ;
CoordinatorCompletionParticipantProcessor.getProcessor().activateParticipant(engine, id) ;
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/remote/UserBusinessActivityImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/remote/UserBusinessActivityImple.java 2006-10-19 17:33:32 UTC (rev 6921)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mwlabs/wst/ba/remote/UserBusinessActivityImple.java 2006-10-19 17:33:36 UTC (rev 6922)
@@ -34,7 +34,6 @@
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.mw.wst.UserBusinessActivity;
import com.arjuna.mw.wst.common.Environment;
-import com.arjuna.mw.wst.common.Protocols;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mwlabs.wst.ba.ContextImple;
import com.arjuna.mwlabs.wst.ba.context.TxContextImple;
@@ -42,8 +41,10 @@
import com.arjuna.webservices.SoapRegistry;
import com.arjuna.webservices.wsaddr.AttributedURIType;
import com.arjuna.webservices.wsaddr.EndpointReferenceType;
+import com.arjuna.webservices.wsarj.ArjunaConstants;
import com.arjuna.webservices.wsarj.InstanceIdentifier;
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
+import com.arjuna.webservices.wsba.BusinessActivityConstants;
import com.arjuna.webservices.wscoor.CoordinationConstants;
import com.arjuna.webservices.wscoor.CoordinationContextType;
import com.arjuna.wsc.ActivationCoordinator;
@@ -257,7 +258,7 @@
final Long expires = (timeout > 0 ? new Long(timeout) : null) ;
final String messageId = new Uid().stringForm() ;
final CoordinationContextType coordinationContext = ActivationCoordinator.createCoordinationContext(
- _activationCoordinatorService, messageId, Protocols.BusinessActivityAtomic, expires, null) ;
+ _activationCoordinatorService, messageId, BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME, expires, null) ;
if (coordinationContext == null)
{
throw new SystemException(
@@ -287,7 +288,7 @@
try
{
return RegistrationCoordinator.register(coordinationContext, messageId,
- getParticipantProtocolService(ctx.identifier()), Protocols.BusinessAgreementTermination) ;
+ getParticipantProtocolService(ctx.identifier()), ArjunaConstants.WSARJ_PROTOCOL_TERMINATION) ;
}
catch (final Throwable th)
{
More information about the jboss-svn-commits
mailing list