[jboss-svn-commits] JBL Code SVN: r29488 - in labs/jbosstm/trunk/XTS: WS-C/dev and 37 other directories.

Mon Sep 28 09:46:21 EDT 2009

Author: adinn
Date: 2009-09-28 09:46:19 -0400 (Mon, 28 Sep 2009)
New Revision: 29488

Removed:
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/
Modified:
   labs/jbosstm/trunk/XTS/WS-C/build.xml
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/processor/BaseWSAddrResponseProcessor.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/InstanceIdentifier.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/ActivationCoordinatorClient.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/ActivationCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/RegistrationCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/ActivationCoordinator.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/ActivationTestCase.java
   labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java
   labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationTestCase.java
   labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationParticipantClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantCallback.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/CoordinatorInboundEvents.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/ParticipantInboundEvents.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionCoordinatorClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorCallback.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/ParticipantProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionCoordinatorInboundEvents.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionParticipantInboundEvents.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionCoordinatorInboundEvents.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionParticipantInboundEvents.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionParticipantProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionParticipantProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/TerminationCoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionParticipantEngine.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorEngine.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionParticipantEngine.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantEngine.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/CompletionStub.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionCoordinatorTestCase.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionParticipantTestCase.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionCoordinatorTestCase.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionParticipantTestCase.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionParticipantTestCase.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionInitiatorCallback.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionParticipantProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionCoordinatorProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionParticipantProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantProcessor.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCCoordinatorTestCase.java
   labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
Log:
removed XTS MAP abstraction layer and changed to use implementation provided in JBossWS 3.2.0 -- fixes JBTM-621

Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================

--- labs/jbosstm/trunk/XTS/WS-C/build.xml	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml	2009-09-28 13:46:19 UTC (rev 29488)
@@ -64,15 +64,6 @@
     <property name="build.tests.dd.dir"      value="${build.dir}/tests/dd"/>
     <property name="build.tests.webapps.dir" value="${build.dir}/tests/webapps"/>
 
-    <!-- location of extra dir containing map code depends upon whether this is a native or cxf build -->
-    <condition property="dev.src11.map.dir"  value="dev/src11-native">
-        <not><isset  property="cxf.build"/></not>
-    </condition>
-
-    <condition property="dev.src11.map.dir"  value="dev/src11-cxf">
-        <isset  property="cxf.build"/>
-    </condition>
-
     <!-- classes provided for clients via api jar -->
     <property name="ws-c.api.classes" value="com/arjuna/wsc/AlreadyRegisteredException.class"/>
     <!-- we had to delete the JaxRPC handlers so we export the bist needed to allow clients to create them -->
@@ -190,7 +181,6 @@
                 <path refid="lib.ext.path"/>
             </classpath>
             <src path="${dev.src11.dir}"/>
-            <src path="${dev.src11.map.dir}"/>
         </javac>
     </target>
 
@@ -219,10 +209,6 @@
               <include name="com/arjuna/**"/>
             </packageset>
 
-            <packageset dir="${dev.src11.map.dir}" defaultexcludes="yes">
-              <include name="org.jboss/**"/>
-            </packageset>
-
              <doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
                 <path>
                     <pathelement path="${com.arjuna.buildsystem.classpath}"/>

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -8,7 +8,7 @@
 import javax.xml.namespace.QName;
 import java.util.Map;
 
-import org.jboss.jbossts.xts.wsaddr.map.*;
+import org.jboss.wsf.common.addressing.*;
 
 /**
  * The complete addressing context.
@@ -24,7 +24,7 @@
     {
         // create this each time so it uses the current thread classloader
         // this allows the builder class to be redefined via a property
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         final MAP responseMap = builder.newMap();
         // ok just calling initializeAsDestination directly fails when the FaultTo/ReplyTo/From
         // contains reference parameter elements. these get installed into the target element extensions
@@ -59,7 +59,7 @@
     {
         // create this each time so it uses the current thread classloader
         // this allows the builder class to be redefined via a property
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         final MAP responseMap = builder.newMap();
         MAPEndpoint epref = map.getReplyTo();
         if (isNoneAddress(epref)) {
@@ -89,7 +89,7 @@
     {
         // create this each time so it uses the current thread classloader
         // this allows the builder class to be redefined via a property
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         final MAP faultMap = builder.newMap();
         // ok just calling initializeAsDestination directly fails when the FaultTo/ReplyTo/From
         // contains reference parameter elements. these get installed into the target element extensions
@@ -129,7 +129,7 @@
     {
         // create this each time so it uses the current thread classloader
         // this allows the builder class to be redefined via a property
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         final MAP requestMap = builder.newMap();
         requestMap.setTo(address);
         if (messageID != null) {
@@ -157,7 +157,7 @@
     {
         // create this each time so it uses the current thread classloader
         // this allows the builder class to be redefined via a property
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         final MAP requestMap = builder.newMap();
         requestMap.setTo(address);
         if (messageID != null) {
@@ -186,7 +186,7 @@
     {
         // create this each time so it uses the current thread classloader
         // this allows the builder class to be redefined via a property
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         final MAP requestMap = builder.newMap();
         // ok just calling initializeAsDestination directly fails when the FaultTo/ReplyTo/From
         // contains reference parameter elements. these get installed into the target element extensions
@@ -223,7 +223,7 @@
     {
         // create this each time so it uses the current thread classloader
         // this allows the builder class to be redefined via a property
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         final MAP requestMap = builder.newMap();
         requestMap.setMessageID (messageID);
         requestMap.setAction("");
@@ -241,7 +241,7 @@
 
         // create this each time so it uses the current thread classloader
         // this allows the builder class to be redefined via a property
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         map.setMessageID(messageID);
         map.setAction(action);
     }
@@ -283,7 +283,7 @@
     
     public static void installFaultTo(MAP map, MAPEndpoint epReference, InstanceIdentifier identifier)
     {
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         MAPEndpoint from = builder.newEndpoint(epReference.getAddress());
         InstanceIdentifier.setEndpointInstanceIdentifier(from, identifier);
         map.setFaultTo(from);
@@ -291,7 +291,7 @@
 
     public static void installFromFaultTo(MAP map, MAPEndpoint epReference, InstanceIdentifier identifier)
     {
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         MAPEndpoint from = builder.newEndpoint(epReference.getAddress());
         InstanceIdentifier.setEndpointInstanceIdentifier(from, identifier);
         map.setFrom(from);
@@ -341,7 +341,7 @@
      */
     public static void configureRequestContext(Map<String, Object> requestContext, MAP map)
     {
-        map.installOutboundMap(requestContext, map);
+        map.installOutboundMapOnClientSide(requestContext, map);
     }
 
     /**
@@ -367,7 +367,7 @@
      */
     public static MAP inboundMap(MessageContext ctx)
     {
-        return MAPBuilder.getBuilder().inboundMap(ctx);
+        return MAPBuilderFactory.getInstance().getBuilderInstance().inboundMap(ctx);
     }
 
     /**
@@ -376,7 +376,7 @@
      * @return
      */
     public static MAP outboundMap(Map<String, Object>  ctx) {
-        return MAPBuilder.getBuilder().outboundMap(ctx);
+        return MAPBuilderFactory.getInstance().getBuilderInstance().outboundMap(ctx);
     }
 
     private static MAPEndpoint noneAddress = null;
@@ -384,7 +384,7 @@
     private static synchronized MAPEndpoint getNoneAddress()
     {
         if (noneAddress == null) {
-            MAPBuilder builder = MAPBuilder.getBuilder();
+            MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
             MAPConstants mapConstants = builder.newConstants();
             String noneURI = mapConstants.getNoneURI();
             noneAddress = builder.newEndpoint(noneURI);

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -29,7 +29,7 @@
 
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
 import org.jboss.jbossts.xts.soapfault.Fault;
 import org.jboss.jbossts.xts.soapfault.SoapFaultService;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/processor/BaseWSAddrResponseProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/processor/BaseWSAddrResponseProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/processor/BaseWSAddrResponseProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -21,8 +21,8 @@
 package com.arjuna.webservices11.wsaddr.processor;
 
 import com.arjuna.webservices.base.processors.BaseProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
-import org.jboss.jbossts.xts.wsaddr.map.MAPRelatesTo;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPRelatesTo;
 
 /**
  * Utility class handling common response functionality.

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/InstanceIdentifier.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/InstanceIdentifier.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/InstanceIdentifier.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -29,7 +29,7 @@
 import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
 
 import com.arjuna.webservices.wsarj.ArjunaConstants;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
 
 /**
  * Representation of an InstanceIdentifier element.

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/ActivationCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/ActivationCoordinatorClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/ActivationCoordinatorClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.*;
 
 import java.io.IOException;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -1,7 +1,7 @@
 package com.arjuna.webservices11.wscoor.client;
 
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.ActivationPortType;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.ActivationService;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegistrationPortType;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/ActivationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/ActivationCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/ActivationCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CreateCoordinationContextType;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CreateCoordinationContextResponseType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 /**
  * The Activation Coordinator processor.

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/RegistrationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/RegistrationCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/RegistrationCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -21,7 +21,7 @@
 package com.arjuna.webservices11.wscoor.processors;
 
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegisterResponseType;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegisterType;
 

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -1,7 +1,7 @@
 package com.arjuna.webservices11.wscoor.sei;
 
 import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.ActivationPortType;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CreateCoordinationContextType;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -1,7 +1,7 @@
 package com.arjuna.webservices11.wscoor.sei;
 
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegistrationPortType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 // import org.jboss.ws.annotation.EndpointConfig;
 

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/ActivationCoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/ActivationCoordinator.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/ActivationCoordinator.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
 import com.arjuna.webservices11.wscoor.client.ActivationCoordinatorClient;
 import com.arjuna.wsc.InvalidCreateParametersException;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.logging.WSCLogger;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
 import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.SoapFaultType;
 import com.arjuna.wsc11.ContextFactory;
 import com.arjuna.wsc.InvalidCreateParametersException;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -26,7 +26,7 @@
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
 import com.arjuna.webservices11.wscoor.processors.RegistrationCoordinatorProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc.*;
 import com.arjuna.wsc11.RegistrarMapper;
 import com.arjuna.wsc11.Registrar;

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/ActivationTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/ActivationTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/ActivationTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -28,7 +28,7 @@
 
 import com.arjuna.webservices11.ServiceRegistry;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wscoor.client.ActivationCoordinatorClient;
 import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
 import com.arjuna.wsc.tests.TestUtil;

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -27,7 +27,7 @@
 package com.arjuna.wsc11.tests.junit;
 
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wscoor.client.ActivationCoordinatorClient;
 import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -27,7 +27,7 @@
 package com.arjuna.wsc11.tests.junit;
 
 import com.arjuna.webservices11.ServiceRegistry;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFaultType;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
 import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc.tests.TestUtil;
 import com.arjuna.wsc11.tests.TestUtil11;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContext;

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
 import com.arjuna.webservices11.wscoor.processors.RegistrationCoordinatorProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc.tests.TestUtil;
 import com.arjuna.wsc11.tests.TestUtil11;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegisterResponseType;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -1,7 +1,7 @@
 package com.arjuna.webservices11.wsarjtx.client;
 
 import com.arjuna.schemas.ws._2005._10.wsarjtx.*;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 
 import javax.xml.ws.BindingProvider;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -29,9 +29,10 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.ServiceRegistry;
 import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
@@ -83,7 +84,7 @@
      */
     private TerminationCoordinatorClient()
     {
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         completeAction = ArjunaTXConstants.WSARJTX_ACTION_COMPLETE;
         closeAction = ArjunaTXConstants.WSARJTX_ACTION_CLOSE;
         cancelAction = ArjunaTXConstants.WSARJTX_ACTION_CANCEL;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationParticipantClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationParticipantClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -29,15 +29,16 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
 import com.arjuna.webservices11.ServiceRegistry;
 import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
 
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 import java.io.IOException;
 
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 
 /**
  * The Client side of the Terminator Coordinator.
@@ -86,7 +87,7 @@
      */
     private TerminationParticipantClient()
     {
-        final MAPBuilder builder = MAPBuilder.getBuilder();
+        final MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         completedAction = ArjunaTXConstants.WSARJTX_ACTION_COMPLETED;
         closedAction = ArjunaTXConstants.WSARJTX_ACTION_CLOSED;
         cancelledAction = ArjunaTXConstants.WSARJTX_ACTION_CANCELLED;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -6,8 +6,9 @@
 import com.arjuna.schemas.ws._2005._10.wsarjtx.TerminationParticipantService;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.soap.AddressingFeature;
@@ -38,7 +39,7 @@
     /**
      *  builder used to construct addressing info for calls
      */
-    private static MAPBuilder builder = MAPBuilder.getBuilder();
+    private static MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
 
     /**
      * fetch a termination coordinator service unique to the current thread

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.schemas.ws._2005._10.wsarjtx.NotificationType;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wst11.BusinessActivityTerminator;
 import com.arjuna.webservices.SoapFault;
 

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantCallback.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantCallback.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,7 +24,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 /**
  * The Terminator Coordinator callback.

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.processor.BaseNotificationProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 /**
  * The Terminator Coordinator processor.

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -8,7 +8,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarjtx.processors.TerminationCoordinatorProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices.SoapFault;
 

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -10,7 +10,7 @@
 import com.arjuna.webservices.SoapFaultType;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.SoapFault11;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarjtx.processors.TerminationParticipantProcessor;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/CoordinatorInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/CoordinatorInboundEvents.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/CoordinatorInboundEvents.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -1,7 +1,7 @@
 package com.arjuna.webservices11.wsat;
 
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.SoapFault;
 
 import javax.xml.ws.wsaddressing.W3CEndpointReference;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/ParticipantInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/ParticipantInboundEvents.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/ParticipantInboundEvents.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -1,7 +1,7 @@
 package com.arjuna.webservices11.wsat;
 
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.SoapFault;
 
 import javax.xml.ws.wsaddressing.W3CEndpointReference;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionCoordinatorClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionCoordinatorClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -7,9 +7,10 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.CompletionCoordinatorPortType;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 
@@ -51,7 +52,7 @@
      */
     private CompletionCoordinatorClient()
     {
-        final MAPBuilder builder = MAPBuilder.getBuilder();
+        final MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
             commitAction = AtomicTransactionConstants.WSAT_ACTION_COMMIT;
             rollbackAction = AtomicTransactionConstants.WSAT_ACTION_ROLLBACK;
         // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -9,9 +9,10 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.CompletionInitiatorPortType;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 
@@ -57,7 +58,7 @@
      */
     private CompletionInitiatorClient()
     {
-        final MAPBuilder builder = MAPBuilder.getBuilder();
+        final MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         committedAction = AtomicTransactionConstants.WSAT_ACTION_COMMITTED;
         abortedAction = AtomicTransactionConstants.WSAT_ACTION_ABORTED;
         faultAction = AtomicTransactionConstants.WSAT_ACTION_FAULT;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -9,9 +9,10 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.CoordinatorPortType;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 
@@ -65,7 +66,7 @@
      */
     private CoordinatorClient()
     {
-        final MAPBuilder builder = MAPBuilder.getBuilder();
+        final MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         preparedAction = AtomicTransactionConstants.WSAT_ACTION_PREPARED;
         abortedAction = AtomicTransactionConstants.WSAT_ACTION_ABORTED;
         readOnlyAction = AtomicTransactionConstants.WSAT_ACTION_READ_ONLY;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -9,9 +9,10 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.ParticipantPortType;
 
@@ -60,7 +61,7 @@
      * Construct the completion initiator client.
      */
     {
-        final MAPBuilder builder = MAPBuilder.getBuilder();
+        final MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         prepareAction = AtomicTransactionConstants.WSAT_ACTION_PREPARE;
         commitAction = AtomicTransactionConstants.WSAT_ACTION_COMMIT;
         rollbackAction = AtomicTransactionConstants.WSAT_ACTION_ROLLBACK;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -1,8 +1,9 @@
 package com.arjuna.webservices11.wsat.client;
 
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.*;
 
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -43,7 +44,7 @@
     /**
      *  builder used to construct addressing info for calls
      */
-    private static MAPBuilder builder = MAPBuilder.getBuilder();
+    private static MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
 
     /**
      * fetch a coordinator service unique to the current thread

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -2,7 +2,7 @@
 
 import com.arjuna.wst11.CompletionCoordinatorParticipant;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorCallback.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorCallback.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -2,7 +2,7 @@
 
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -2,7 +2,7 @@
 
 import com.arjuna.webservices11.wsarj.processor.BaseNotificationProcessor;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -2,7 +2,7 @@
 
 import com.arjuna.webservices11.wsat.CoordinatorInboundEvents;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.SoapFault;
 
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/ParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/ParticipantProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/ParticipantProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -2,7 +2,7 @@
 
 import com.arjuna.webservices11.wsat.ParticipantInboundEvents;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.SoapFault;
 
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -2,7 +2,7 @@
 
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.CompletionCoordinatorPortType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 import javax.jws.*;
 import javax.jws.soap.SOAPBinding;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -3,7 +3,7 @@
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.CompletionInitiatorPortType;
 import org.jboss.jbossts.xts.soapfault.Fault;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 import javax.jws.*;
 import javax.jws.soap.SOAPBinding;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -3,7 +3,7 @@
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.CoordinatorPortType;
 import org.jboss.jbossts.xts.soapfault.Fault;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 import javax.jws.*;
 import javax.jws.soap.SOAPBinding;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -3,7 +3,7 @@
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.ParticipantPortType;
 import org.jboss.jbossts.xts.soapfault.Fault;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 import javax.jws.*;
 import javax.jws.soap.SOAPBinding;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionCoordinatorInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionCoordinatorInboundEvents.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionCoordinatorInboundEvents.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionParticipantInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionParticipantInboundEvents.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionParticipantInboundEvents.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionCoordinatorInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionCoordinatorInboundEvents.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionCoordinatorInboundEvents.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionParticipantInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionParticipantInboundEvents.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionParticipantInboundEvents.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
 

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -28,13 +28,14 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionCoordinatorPortType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -103,7 +104,7 @@
      */
     private CoordinatorCompletionCoordinatorClient()
     {
-        final MAPBuilder builder = MAPBuilder.getBuilder();
+        final MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         completedAction = BusinessActivityConstants.WSBA_ACTION_COMPLETED;
         failAction = BusinessActivityConstants.WSBA_ACTION_FAIL;
         compensatedAction = BusinessActivityConstants.WSBA_ACTION_COMPENSATED;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -28,12 +28,13 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionParticipantPortType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -102,7 +103,7 @@
      */
     private CoordinatorCompletionParticipantClient()
     {
-        final MAPBuilder builder = MAPBuilder.getBuilder();
+        final MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         completeAction = BusinessActivityConstants.WSBA_ACTION_COMPLETE;
         closeAction = BusinessActivityConstants.WSBA_ACTION_CLOSE;
         cancelAction = BusinessActivityConstants.WSBA_ACTION_CANCEL;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -28,13 +28,14 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionCoordinatorPortType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -103,7 +104,7 @@
      */
     private ParticipantCompletionCoordinatorClient()
     {
-        final MAPBuilder builder = MAPBuilder.getBuilder();
+        final MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         completedAction = BusinessActivityConstants.WSBA_ACTION_COMPLETED;
         failAction = BusinessActivityConstants.WSBA_ACTION_FAIL;
         compensatedAction = BusinessActivityConstants.WSBA_ACTION_COMPENSATED;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -28,12 +28,13 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionParticipantPortType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -98,7 +99,7 @@
      */
     private ParticipantCompletionParticipantClient()
     {
-        final MAPBuilder builder = MAPBuilder.getBuilder();
+        final MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
             closeAction = BusinessActivityConstants.WSBA_ACTION_CLOSE;
             cancelAction = BusinessActivityConstants.WSBA_ACTION_CANCEL;
             compensateAction = BusinessActivityConstants.WSBA_ACTION_COMPENSATE;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -1,8 +1,9 @@
 package com.arjuna.webservices11.wsba.client;
 
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.*;
 
 import javax.xml.ws.BindingProvider;
@@ -43,7 +44,7 @@
     /**
      *  builder used to construct addressing info for calls
      */
-    private static MAPBuilder builder = MAPBuilder.getBuilder();
+    private static MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
 
     /**
      * fetch a participant completion coordinator service unique to the current thread

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.CoordinatorCompletionCoordinatorInboundEvents;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionParticipantProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionParticipantProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.CoordinatorCompletionParticipantInboundEvents;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
 

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.ParticipantCompletionCoordinatorInboundEvents;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionParticipantProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionParticipantProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.ParticipantCompletionParticipantInboundEvents;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
 

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -6,7 +6,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionCoordinatorProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionCoordinatorPortType;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -6,7 +6,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionParticipantProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionParticipantPortType;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -6,7 +6,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.processors.ParticipantCompletionCoordinatorProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionCoordinatorPortType;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -6,7 +6,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.processors.ParticipantCompletionParticipantProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionParticipantPortType;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -7,7 +7,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsat.client.CompletionInitiatorClient;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorProcessorImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorProcessorImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -5,7 +5,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsat.CoordinatorInboundEvents;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantProcessorImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantProcessorImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -4,7 +4,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/TerminationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/TerminationCoordinatorProcessorImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/TerminationCoordinatorProcessorImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -28,7 +28,7 @@
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsarjtx.client.TerminationParticipantClient;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionParticipantEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionParticipantEngine.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionParticipantEngine.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,7 +24,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsba.CoordinatorCompletionParticipantInboundEvents;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorEngine.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorEngine.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -6,7 +6,7 @@
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsat.CoordinatorInboundEvents;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,7 +24,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsba.ParticipantCompletionCoordinatorInboundEvents;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionParticipantEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionParticipantEngine.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionParticipantEngine.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,7 +24,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsba.ParticipantCompletionParticipantInboundEvents;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantEngine.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantEngine.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -5,7 +5,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -33,7 +33,7 @@
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsarjtx.client.TerminationCoordinatorClient;

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/CompletionStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/CompletionStub.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/CompletionStub.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -3,7 +3,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsat.client.CompletionCoordinatorClient;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionCoordinatorTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionCoordinatorTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -35,7 +35,7 @@
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionParticipantTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionParticipantTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -30,7 +30,7 @@
 
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionCoordinatorTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionCoordinatorTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -36,7 +36,7 @@
 import com.arjuna.webservices11.ServiceRegistry;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionParticipantTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionParticipantTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -34,7 +34,7 @@
 import com.arjuna.webservices.SoapFaultType;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -41,7 +41,7 @@
 import com.arjuna.webservices11.wsat.processors.CompletionInitiatorProcessor;
 import com.arjuna.wst11.tests.TestUtil;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 
 public class CompletionCoordinatorTestCase extends TestCase

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionParticipantTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionParticipantTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -29,7 +29,7 @@
 import junit.framework.TestCase;
 
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.client.CompletionCoordinatorClient;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.processors.CompletionCoordinatorProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wst11.CompletionCoordinatorParticipant;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionInitiatorCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionInitiatorCallback.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionInitiatorCallback.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.processors.CompletionInitiatorCallback;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 
 /**              B

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -26,7 +26,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.CoordinatorCompletionCoordinatorInboundEvents;
 import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionCoordinatorProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionParticipantProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionParticipantProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -26,7 +26,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.CoordinatorCompletionParticipantInboundEvents;
 import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionParticipantProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.wst.BusinessAgreementWithCoordinatorCompletionParticipant;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -27,7 +27,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.CoordinatorInboundEvents;
 import com.arjuna.webservices11.wsat.processors.CoordinatorProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionCoordinatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionCoordinatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -26,7 +26,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.ParticipantCompletionCoordinatorInboundEvents;
 import com.arjuna.webservices11.wsba.processors.ParticipantCompletionCoordinatorProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionParticipantProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionParticipantProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -26,7 +26,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.ParticipantCompletionParticipantInboundEvents;
 import com.arjuna.webservices11.wsba.processors.ParticipantCompletionParticipantProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -27,7 +27,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.ParticipantInboundEvents;
 import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 
 public class TestParticipantProcessor extends ParticipantProcessor

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCCoordinatorTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCCoordinatorTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -38,7 +38,7 @@
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.client.ParticipantClient;

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -43,7 +43,7 @@
 import com.arjuna.wst11.tests.junit.TestCoordinatorProcessor.CoordinatorDetails;
 import com.arjuna.wst11.tests.TestUtil;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 public class TwoPCParticipantTestCase extends TestCase
 {

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.SoapFaultType;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.SoapFault11;

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,7 +24,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.jboss.transaction.wstf.webservices.sc007.client.SyncParticipantClient;

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,12 +24,13 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.ServiceRegistry;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
 import com.jboss.transaction.wstf.webservices.CoordinationContextManager;
 import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import com.jboss.transaction.wstf.webservices.sc007.generated.ParticipantPortType;
 
 /**
@@ -114,7 +115,7 @@
      */
     private AsyncParticipantClient()
     {
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         final String initiatorURIString = ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_INITIATOR) ;
         initiator = builder.newEndpoint(initiatorURIString);
     }

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -27,7 +27,7 @@
 import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc11.messaging.MessageId;
 import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
 import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -28,9 +28,10 @@
 import java.util.Map;
 
 import com.arjuna.webservices11.ServiceRegistry;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.jboss.transaction.wstf.webservices.sc007.generated.Sc007Service;
 import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;
@@ -55,7 +56,7 @@
     /**
      *  builder used to construct addressing info for calls
      */
-    private static MAPBuilder builder = MAPBuilder.getBuilder();
+    private static MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
 
     /**
      * fetch an Sc007 service unique to the current thread

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import java.io.IOException;
 
 import com.arjuna.webservices.*;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
 import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
 

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 /**
  * The callback for the initiator client.

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 /**
  * The Initiator processor.

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.ats.arjuna.common.Uid;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wst.CompletionCoordinatorParticipant;
 import com.arjuna.wst11.messaging.engines.ParticipantEngine;
 import com.arjuna.webservices11.SoapFault11;

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,7 +24,7 @@
 import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.WebServiceContext;

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.jboss.transaction.wstf.webservices.sc007.generated.ParticipantPortType;
 import com.jboss.transaction.wstf.webservices.CoordinationContextManager;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
 import org.jboss.jbossts.xts.soapfault.Fault;
 import com.arjuna.webservices11.SoapFault11;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.SoapFaultType;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.SoapFault11;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,7 +24,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.jboss.transaction.txinterop.webservices.atinterop.client.SyncParticipantClient;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -28,9 +28,10 @@
 import java.util.Map;
 
 import com.arjuna.webservices11.ServiceRegistry;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorService;
 import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantService;
@@ -61,7 +62,7 @@
     /**
      *  builder used to construct addressing info for calls
      */
-    private static MAPBuilder builder = MAPBuilder.getBuilder();
+    private static MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
 
     /**
      * fetch a coordinator activation service unique to the current thread

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,9 +24,10 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.ServiceRegistry;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
 import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
@@ -124,7 +125,7 @@
         //ClientPolicy.register(handlerRegistry) ;
 
         //soapService = new SoapService(handlerRegistry) ;
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         final String initiatorURIString = ServiceRegistry.getRegistry().getServiceURI(ATInteropConstants.SERVICE_INITIATOR) ;
         initiator = builder.newEndpoint(initiatorURIString);
     }

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -27,7 +27,7 @@
 import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc11.messaging.MessageId;
 import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
 import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import java.io.IOException;
 
 import com.arjuna.webservices.*;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
 import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
 

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 /**
  * The callback for the initiator client.

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 /**
  * The Initiator processor.

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.ats.arjuna.common.Uid;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wst.CompletionCoordinatorParticipant;
 import com.arjuna.wst11.messaging.engines.ParticipantEngine;
 import com.arjuna.webservices11.SoapFault11;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
 import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;
 import com.arjuna.webservices11.SoapFault11;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 
 import javax.xml.ws.RequestWrapper;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantPortType;
 import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
 import org.jboss.jbossts.xts.soapfault.Fault;
 import com.arjuna.webservices11.SoapFault11;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.SoapFaultType;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,7 +24,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.jboss.transaction.txinterop.webservices.bainterop.client.SyncParticipantClient;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,9 +24,10 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.ServiceRegistry;
-import org.jboss.jbossts.xts.wsaddr.map.MAPEndpoint;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPEndpoint;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
 import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
@@ -113,7 +114,7 @@
         
         // soapService = new SoapService(handlerRegistry) ;
         final String initiatorURIString = ServiceRegistry.getRegistry().getServiceURI(BAInteropConstants.SERVICE_INITIATOR) ;
-        MAPBuilder builder = MAPBuilder.getBuilder();
+        MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
         initiator = builder.newEndpoint(initiatorURIString);
     }
     

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -32,8 +32,9 @@
 import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorPortType;
 import com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantPortType;
 import com.jboss.transaction.txinterop.webservices.handlers.CoordinationContextHandler;
-import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilder;
+import org.jboss.wsf.common.addressing.MAP;
+import org.jboss.wsf.common.addressing.MAPBuilderFactory;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 
 /**
@@ -58,7 +59,7 @@
     /**
      *  builder used to construct addressing info for calls
      */
-    private static MAPBuilder builder = MAPBuilder.getBuilder();
+    private static MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
 
     /**
      * fetch a coordinator activation service unique to the current thread

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.webservices11.SoapFault11;
 import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
 import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorPortType;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import java.io.IOException;
 
 import com.arjuna.webservices.SoapFault;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
 import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
 

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 /**
  * The callback for the initiator client.

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 
 /**
  * The Initiator processor.

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -22,7 +22,7 @@
 
 import com.arjuna.ats.arjuna.common.Uid;
 import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine;
 import com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine;
 import com.arjuna.webservices11.SoapFault11;

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -24,7 +24,7 @@
 import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorPortType;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.SoapFault11;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
 import org.jboss.jbossts.xts.soapfault.Fault;
 

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java	2009-09-28 13:43:26 UTC (rev 29487)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java	2009-09-28 13:46:19 UTC (rev 29488)
@@ -25,7 +25,7 @@
 import com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantPortType;
 import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.wsf.common.addressing.MAP;
 import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
 import org.jboss.jbossts.xts.soapfault.Fault;
 import com.arjuna.webservices11.SoapFault11;

