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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri May 15 06:29:16 EDT 2009


Author: adinn
Date: 2009-05-15 06:29:10 -0400 (Fri, 15 May 2009)
New Revision: 26549

Added:
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAP.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPBuilder.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPConstants.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPEndpoint.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPRelatesTo.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAP.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPBuilder.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPConstants.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPEndpoint.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPRelatesTo.java
Removed:
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAP.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPBuilder.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPConstants.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPEndpoint.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPRelatesTo.java
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/build.xml
   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/WSAS/build.xml
   labs/jbosstm/trunk/XTS/WSCF/build.xml
   labs/jbosstm/trunk/XTS/WSTX/build.xml
   labs/jbosstm/trunk/XTS/build.xml
   labs/jbosstm/trunk/XTS/demo/xts-build.xml
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
   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/build.xml
   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
   labs/jbosstm/trunk/XTS/sar/build.xml
Log:
relocated default (WS Native) impl of MAP code and added new CXF impl. reorganized build files for XTS, unit tests, demo and interop tests to recognize presence of property cxf.build and if set build against the JBossWS/CXF libraries using the CXF MAP library -- fixes JBTM-265

Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml	2009-05-15 10:29:10 UTC (rev 26549)
@@ -64,6 +64,15 @@
     <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"/>
     
@@ -80,9 +89,13 @@
     <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
     <property name="jta.ext.jars" value="jbossts-common.jar commons-logging.jar"/>
     <property name="xts.ext.jars" value=""/>
+    <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+            geronimo-ws-metadata_2.0_spec.jar">
+        <isset property="cxf.build"/>
+    </condition>
     <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
             jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
-            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar"/>
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
     <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
     <property name="jboss.lib.jars" value="dom4j.jar"/>
 
@@ -175,6 +188,7 @@
                 <path refid="lib.ext.path"/>
             </classpath>
             <src path="${dev.src11.dir}"/>
+            <src path="${dev.src11.map.dir}"/>
         </javac>
     </target>
 
@@ -203,6 +217,10 @@
               <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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -2,13 +2,14 @@
 
 import com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
-import com.arjuna.webservices11.wsaddr.map.*;
 
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.handler.MessageContext;
 import javax.xml.namespace.QName;
 import java.util.Map;
 
+import org.jboss.jbossts.xts.wsaddr.map.*;
+
 /**
  * The complete addressing context.
  * @author kevin
@@ -350,7 +351,9 @@
      * @param action
      */
     public static void configureRequestContext(Map<String, Object> requestContext, String to, String action) {
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, to);
+        if (to != null) {
+            requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, to);
+        }
         if (action != null) {
             // need to set soap action header based upon what the client asks for
             requestContext.put(BindingProvider.SOAPACTION_URI_PROPERTY, action);

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -21,18 +21,15 @@
 package com.arjuna.webservices11.wsaddr.client;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.ArrayList;
 import java.util.Map;
 
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.soap.AddressingFeature;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.handler.Handler;
 
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
 import org.jboss.jbossts.xts.soapfault.Fault;
 import org.jboss.jbossts.xts.soapfault.SoapFaultService;

Deleted: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAP.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAP.java	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAP.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,186 +0,0 @@
-package com.arjuna.webservices11.wsaddr.map;
-
-import org.w3c.dom.Element;
-
-import javax.xml.ws.addressing.*;
-import java.net.URISyntaxException;
-import java.net.URI;
-import java.util.Map;
-
-/**
- * Message Addressing Properties is a wrapper class for the stack-specific addressing properties
- * classes implemented by JBossWS Native and CXF. It is used to localize dependence upon the WS
- * stack. This is the JBossWS Native specific implementation
- */
-
-public class MAP
-{
-    /**
-     * JBossWS Native specific constructor
-     * @param implementation
-     */
-    MAP(AddressingProperties implementation)
-    {
-        this.implementation = implementation;
-    }
-
-    public String getTo() {
-        AttributedURI to = implementation.getTo();
-        return (to != null ? to.getURI().toString() : null);
-    }
-
-    public MAPEndpoint getFrom() {
-        EndpointReference from = implementation.getFrom();
-        return (from != null ?  new MAPEndpoint(from) : null);
-    }
-
-    public String getMessageID() {
-        AttributedURI messageId = implementation.getMessageID();
-        return (messageId != null ? messageId.getURI().toString() : null);
-    }
-
-    public String getAction() {
-        AttributedURI action = implementation.getAction();
-        return (action != null ? action.getURI().toString() : null);
-    }
-
-    public MAPEndpoint getFaultTo() {
-        EndpointReference faultTo = implementation.getFaultTo();
-        return (faultTo != null ?  new MAPEndpoint(faultTo) : null);
-    }
-
-    public MAPEndpoint getReplyTo()
-    {
-        EndpointReference replyTo = implementation.getReplyTo();
-        return (replyTo != null ?  new MAPEndpoint(replyTo) : null);
-    }
-
-    public MAPRelatesTo getRelatesTo()
-    {
-        MAPBuilder builder = MAPBuilder.getBuilder();
-        Relationship[] relationship = implementation.getRelatesTo();
-        if (relationship != null) {
-            Relationship relatesTo = relationship[0];
-            return builder.newRelatesTo(relatesTo.getID().toString(), relatesTo.getType());
-        } else {
-            return null;
-        }
-    }
-
-    public void setTo(String address)
-    {
-        if (address != null) {
-            try {
-                AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-                AttributedURI uri = builder.newURI(address);
-                implementation.setTo(uri);
-            } catch (URISyntaxException e) {
-                // should not happen
-            }
-        } else {
-            implementation.setTo(null);
-        }
-    }
-
-    public void setFrom(MAPEndpoint epref)
-    {
-        if (epref != null) {
-            implementation.setFrom(epref.getImplementation());
-        } else {
-            implementation.setFrom(null);
-        }
-    }
-
-    public void setMessageID(String messageID)
-    {
-        if (messageID != null) {
-            try {
-                AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-                AttributedURI uri = builder.newURI(messageID);
-                implementation.setMessageID(uri);
-            } catch (URISyntaxException e) {
-                // should not happen
-            }
-        } else {
-            implementation.setMessageID(null);
-        }
-    }
-
-    public void setAction(String action)
-    {
-        if (action != null) {
-        try {
-            AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-            AttributedURI uri = builder.newURI(action);
-            implementation.setAction(uri);
-        } catch (URISyntaxException e) {
-            // should not happen
-        }
-        } else {
-            implementation.setAction(null);
-        }
-    }
-
-    public void setReplyTo(MAPEndpoint epref)
-    {
-        if (epref != null) {
-            implementation.setReplyTo(epref.getImplementation());
-        } else {
-            implementation.setReplyTo(null);
-        }
-    }
-
-    public void setFaultTo(MAPEndpoint epref)
-    {
-        if (epref != null) {
-            implementation.setFaultTo(epref.getImplementation());
-        } else {
-            implementation.setFaultTo(null);
-        }
-    }
-
-    public void setRelatesTo(MAPRelatesTo relatesTo)
-    {
-        if (relatesTo != null) {
-            try {
-                AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-                Relationship[] relationships = new Relationship[1];
-                String relatesToId = relatesTo.getRelatesTo();
-                URI uri = new URI(relatesToId);
-                Relationship relationship = builder.newRelationship(uri);
-                relationship.setType(relatesTo.getType());
-                relationships[0] = relationship;
-                implementation.setRelatesTo(relationships);
-            } catch (URISyntaxException e) {
-                // should not happen
-            }
-        } else {
-            implementation.setRelatesTo(null);
-        }
-    }
-
-    public void addReferenceParameter(Element refParam)
-    {
-        implementation.getReferenceParameters().addElement(refParam);
-        // cxf needs to do
-        // implementtaion.getToEndpointReference().getReferenceParameters().getAny().add(refParam);
-    }
-
-    public void initializeAsDestination(MAPEndpoint epref)
-    {
-        implementation.initializeAsDestination(epref.getImplementation());
-    }
-
-
-    public void installOutboundMap(Map<String, Object> requestContext, MAP map)
-    {
-        AddressingProperties addressingProperties = map.implementation;
-
-        requestContext.put(MAPConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
-	    requestContext.put(MAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
-    }
-    /**
-     * the wrapped instance which this class delegates to
-     */
-    private AddressingProperties implementation;
-}

Deleted: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPBuilder.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPBuilder.java	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPBuilder.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,79 +0,0 @@
-package com.arjuna.webservices11.wsaddr.map;
-
-import javax.xml.ws.addressing.*;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.namespace.QName;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-
-/**
- * MAPBuilder is a helper class used to create objects used with class MAP. This is the JBossWS Native
- * implementation
- */
-public class MAPBuilder
-{
-    public static MAPBuilder getBuilder() {
-        return theBuilder;
-    }
-
-    public MAP newMap() {
-        AddressingProperties implementation = addressingBuilder.newAddressingProperties();
-        return new MAP(implementation);
-    }
-
-    /**
-     * retrieve the inbound server message address properties attached to a message context
-     * @param ctx the server message context
-     * @return
-     */
-    public MAP inboundMap(MessageContext ctx)
-    {
-        AddressingProperties implementation = (AddressingProperties)ctx.get(MAPConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        return newMap(implementation);
-    }
-
-    /**
-     * retrieve the outbound client message address properties attached to a message request map
-     * @param ctx the client request properties map
-     * @return
-     */
-    public MAP outboundMap(Map<String, Object> ctx) {
-        AddressingProperties implementation = (AddressingProperties)ctx.get(MAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
-        return newMap(implementation);
-    }
-
-    // n.b. this is package public only!
-    MAP newMap(AddressingProperties implementation) {
-        return new MAP(implementation);
-    }
-
-    public MAPConstants newConstants() {
-        AddressingConstants implementation = addressingBuilder.newAddressingConstants();
-        return new MAPConstants(implementation);
-    }
-
-    public MAPEndpoint newEndpoint(String address) {
-        try {
-            URI uri = new URI(address);
-            EndpointReference implementation = addressingBuilder.newEndpointReference(uri);
-            return new MAPEndpoint(implementation);
-        } catch (URISyntaxException e) {
-            return null;
-        }
-    }
-
-    public MAPRelatesTo newRelatesTo(String id, QName type) {
-        return new MAPRelatesTo(id, type);
-    }
-
-    private MAPBuilder()
-    {
-        AddressingBuilder implementation = AddressingBuilder.getAddressingBuilder();
-        this.addressingBuilder = implementation;
-    }
-
-    private AddressingBuilder addressingBuilder;
-
-    private static MAPBuilder theBuilder = new MAPBuilder();
-}

Deleted: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPConstants.java	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPConstants.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,32 +0,0 @@
-package com.arjuna.webservices11.wsaddr.map;
-
-import javax.xml.ws.addressing.AddressingConstants;
-import javax.xml.ws.addressing.JAXWSAConstants;
-import javax.xml.namespace.QName;
-
-/**
- * MAPConstants is a wrapper class which works with class MAP
- */
-public class MAPConstants
-{
-    MAPConstants(AddressingConstants implementation)
-    {
-        this.implementation = implementation;
-    }
-
-    public String getNoneURI() {
-        return implementation.getNoneURI();
-    }
-
-    public static final String CLIENT_ADDRESSING_PROPERTIES = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES;
-
-    public static final String CLIENT_ADDRESSING_PROPERTIES_INBOUND = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND;
-
-    public static final String CLIENT_ADDRESSING_PROPERTIES_OUTBOUND = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND;
-
-    public static final String SERVER_ADDRESSING_PROPERTIES_INBOUND = JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND;
-
-    public static final String SERVER_ADDRESSING_PROPERTIES_OUTBOUND = JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND;
-
-    private AddressingConstants implementation;
-}

Deleted: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPEndpoint.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPEndpoint.java	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPEndpoint.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,33 +0,0 @@
-package com.arjuna.webservices11.wsaddr.map;
-
-import org.w3c.dom.Element;
-
-import javax.xml.ws.addressing.EndpointReference;
-
-/**
- * MAPEndpoint is a wrapper class which works with class MAP. This is the JBossWS Native implementation.
- */
-public class MAPEndpoint
-{
-    MAPEndpoint(EndpointReference implementation)
-    {
-        this.implementation = implementation;
-    }
-
-    public String getAddress()
-    {
-        return implementation.getAddress().getURI().toString();
-    }
-
-    public void addReferenceParameter(Element element)
-    {
-        implementation.getReferenceParameters().addElement(element);
-    }
-
-    EndpointReference getImplementation()
-    {
-        return implementation;
-    }
-
-    private EndpointReference implementation;
-}

Deleted: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPRelatesTo.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPRelatesTo.java	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPRelatesTo.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,34 +0,0 @@
-package com.arjuna.webservices11.wsaddr.map;
-
-import javax.xml.ws.addressing.Relationship;
-import javax.xml.namespace.QName;
-
-/**
- * MAPRelationship is a wrapper class which works with class MAP. This is the JBossWS Native implementation.
- */
-public class MAPRelatesTo
-{
-    MAPRelatesTo(String relatesTo, QName type)
-    {
-        this.relatesTo = relatesTo;
-        this.type = type;
-    }
-
-    public String getRelatesTo()
-    {
-        return relatesTo;
-    }
-
-    public QName getType()
-    {
-        return type;
-    }
-
-    public void setType(QName type)
-    {
-        this.type = type;
-    }
-
-    private String relatesTo;
-    private QName type;
-}

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/processor/BaseWSAddrResponseProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -21,8 +21,8 @@
 package com.arjuna.webservices11.wsaddr.processor;
 
 import com.arjuna.webservices.base.processors.BaseProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
-import com.arjuna.webservices11.wsaddr.map.MAPRelatesTo;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/InstanceIdentifier.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -29,7 +29,7 @@
 import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
 
 import com.arjuna.webservices.wsarj.ArjunaConstants;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/ActivationCoordinatorClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,7 +1,7 @@
 package com.arjuna.webservices11.wscoor.client;
 
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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;
@@ -9,10 +9,7 @@
 
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.soap.AddressingFeature;
-import javax.xml.ws.handler.Handler;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 /**

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/ActivationCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -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 com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/RegistrationCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -21,7 +21,7 @@
 package com.arjuna.webservices11.wscoor.processors;
 
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,8 +1,7 @@
 package com.arjuna.webservices11.wscoor.sei;
 
-import com.arjuna.webservices11.wscoor.CoordinationConstants;
 import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,6 +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.ws.annotation.EndpointConfig;
 
@@ -14,8 +15,6 @@
 
 import com.arjuna.webservices11.wscoor.processors.RegistrationCoordinatorProcessor;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 
 /**

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/ActivationCoordinator.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.logging.WSCLogger;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
 import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -26,7 +26,7 @@
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
 import com.arjuna.webservices11.wscoor.processors.RegistrationCoordinatorProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 import com.arjuna.wsc.*;
 import com.arjuna.wsc11.RegistrarMapper;
 import com.arjuna.wsc11.Registrar;

Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAP.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAP.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAP.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -0,0 +1,172 @@
+package org.jboss.jbossts.xts.wsaddr.map;
+
+import org.w3c.dom.Element;
+
+import org.apache.cxf.ws.addressing.*;
+
+import javax.xml.namespace.QName;
+import java.util.Map;
+
+/**
+ * Message Addressing Properties is a wrapper class for the stack-specific addressing properties
+ * classes implemented by JBossWS Native and CXF. It is used to localize dependence upon the WS
+ * stack. This is the JBossWS CXF specific implementation
+ */
+
+public class MAP
+{
+    /**
+     * JBossWS Native specific constructor
+     * @param implementation
+     */
+    MAP(AddressingProperties implementation)
+    {
+        this.implementation = implementation;
+    }
+
+    public String getTo() {
+        AttributedURIType to = implementation.getTo();
+        return (to != null ? to.getValue() : null);
+    }
+
+    public MAPEndpoint getFrom() {
+        EndpointReferenceType from = implementation.getFrom();
+        return (from != null ?  new MAPEndpoint(from) : null);
+    }
+
+    public String getMessageID() {
+        AttributedURIType messageId = implementation.getMessageID();
+        return (messageId != null ? messageId.getValue() : null);
+    }
+
+    public String getAction() {
+        AttributedURIType action = implementation.getAction();
+        return (action != null ? action.getValue() : null);
+    }
+
+    public MAPEndpoint getFaultTo() {
+        EndpointReferenceType faultTo = implementation.getFaultTo();
+        return (faultTo != null ?  new MAPEndpoint(faultTo) : null);
+    }
+
+    public MAPEndpoint getReplyTo()
+    {
+        EndpointReferenceType replyTo = implementation.getReplyTo();
+        return (replyTo != null ?  new MAPEndpoint(replyTo) : null);
+    }
+
+    public MAPRelatesTo getRelatesTo()
+    {
+        MAPBuilder builder = MAPBuilder.getBuilder();
+        RelatesToType relatesTo = implementation.getRelatesTo();
+        if (relatesTo != null) {
+            String type = relatesTo.getRelationshipType();
+            int index = type.indexOf("}");
+            String ns = type.substring(1, index+1);
+            String name = type.substring(index+1);
+            return builder.newRelatesTo(relatesTo.getValue(), new QName(ns, name));
+        } else {
+            return null;
+        }
+    }
+
+    public void setTo(String address)
+    {
+        if (address != null) {
+            EndpointReferenceType epref = new EndpointReferenceType();
+            AttributedURIType uri = new AttributedURIType();
+            uri.setValue(address);
+            epref.setAddress(uri);
+            implementation.setTo(epref);
+        } else {
+            implementation.setTo(null);
+        }
+    }
+
+    public void setFrom(MAPEndpoint epref)
+    {
+        if (epref != null) {
+            implementation.setFrom(epref.getImplementation());
+        } else {
+            implementation.setFrom(null);
+        }
+    }
+
+    public void setMessageID(String messageID)
+    {
+        if (messageID != null) {
+            AttributedURIType uri = new AttributedURIType();
+            uri.setValue(messageID);
+            implementation.setMessageID(uri);
+        } else {
+            implementation.setMessageID(null);
+        }
+    }
+
+    public void setAction(String action)
+    {
+        if (action != null) {
+            AttributedURIType uri = new AttributedURIType();
+            uri.setValue(action);
+            implementation.setAction(uri);
+        } else {
+            implementation.setAction(null);
+        }
+    }
+
+    public void setReplyTo(MAPEndpoint epref)
+    {
+        if (epref != null) {
+            implementation.setReplyTo(epref.getImplementation());
+        } else {
+            implementation.setReplyTo(null);
+        }
+    }
+
+    public void setFaultTo(MAPEndpoint epref)
+    {
+        if (epref != null) {
+            implementation.setFaultTo(epref.getImplementation());
+        } else {
+            implementation.setFaultTo(null);
+        }
+    }
+
+    public void setRelatesTo(MAPRelatesTo relatesTo)
+    {
+        if (relatesTo != null) {
+            RelatesToType relatesToImpl = new RelatesToType();
+            relatesToImpl.setValue(relatesTo.getRelatesTo());
+            relatesToImpl.setRelationshipType(relatesTo.getType().toString());
+            implementation.setRelatesTo(relatesToImpl);
+        } else {
+            implementation.setRelatesTo(null);
+        }
+    }
+
+    public void addReferenceParameter(Element refParam)
+    {
+        implementation.getToEndpointReference().getReferenceParameters().getAny().add(refParam);
+    }
+
+    public void initializeAsDestination(MAPEndpoint epref)
+    {
+        if (epref == null)
+         throw new IllegalArgumentException("Invalid null endpoint reference");
+
+        implementation.setTo(epref.getImplementation());
+    }
+
+
+    public void installOutboundMap(Map<String, Object> requestContext, MAP map)
+    {
+        AddressingProperties addressingProperties = map.implementation;
+
+        requestContext.put(MAPConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
+	    requestContext.put(MAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
+    }
+    /**
+     * the wrapped instance which this class delegates to
+     */
+    private AddressingProperties implementation;
+}

Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPBuilder.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPBuilder.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPBuilder.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -0,0 +1,80 @@
+package org.jboss.jbossts.xts.wsaddr.map;
+
+import org.apache.cxf.ws.addressing.*;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.namespace.QName;
+import java.util.Map;
+
+/**
+ * MAPBuilder is a helper class used to create objects used with class MAP. This is the JBossWS CXF
+ * implementation
+ */
+public class MAPBuilder
+{
+    public static MAPBuilder getBuilder() {
+        return theBuilder;
+    }
+
+    public MAP newMap() {
+        AddressingProperties implementation = addressingBuilder.newAddressingProperties();
+        return new MAP(implementation);
+    }
+
+    /**
+     * retrieve the inbound server message address properties attached to a message context
+     * @param ctx the server message context
+     * @return
+     */
+    public MAP inboundMap(MessageContext ctx)
+    {
+        AddressingProperties implementation = (AddressingProperties)ctx.get(MAPConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        return newMap(implementation);
+    }
+
+    /**
+     * retrieve the outbound client message address properties attached to a message request map
+     * @param ctx the client request properties map
+     * @return
+     */
+    public MAP outboundMap(Map<String, Object> ctx) {
+        AddressingProperties implementation = (AddressingProperties)ctx.get(MAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
+        if (implementation == null) {
+            implementation = addressingBuilder.newAddressingProperties();
+            ctx.put(MAPConstants.CLIENT_ADDRESSING_PROPERTIES, implementation);
+            ctx.put(MAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, implementation);
+        }
+        return newMap(implementation);
+    }
+
+    // n.b. this is package public only!
+    MAP newMap(AddressingProperties implementation) {
+        return new MAP(implementation);
+    }
+
+    public MAPConstants newConstants() {
+        AddressingConstants implementation = addressingBuilder.newAddressingConstants();
+        return new MAPConstants(implementation);
+    }
+
+    public MAPEndpoint newEndpoint(String address) {
+        EndpointReferenceType implementation = new EndpointReferenceType();
+        AttributedURIType uri = new AttributedURIType();
+        uri.setValue(address);
+        implementation.setAddress(uri);
+        return new MAPEndpoint(implementation);
+    }
+
+    public MAPRelatesTo newRelatesTo(String id, QName type) {
+        return new MAPRelatesTo(id, type);
+    }
+
+    private MAPBuilder()
+    {
+        AddressingBuilder implementation = AddressingBuilder.getAddressingBuilder();
+        this.addressingBuilder = implementation;
+    }
+
+    private AddressingBuilder addressingBuilder;
+
+    private static MAPBuilder theBuilder = new MAPBuilder();
+}

Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPConstants.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPConstants.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -0,0 +1,31 @@
+package org.jboss.jbossts.xts.wsaddr.map;
+
+import org.apache.cxf.ws.addressing.AddressingConstants;
+import org.apache.cxf.ws.addressing.JAXWSAConstants;
+
+/**
+ * MAPConstants is a wrapper class which works with class MAP. This is the JBossWS CXF version
+ */
+public class MAPConstants
+{
+    MAPConstants(AddressingConstants implementation)
+    {
+        this.implementation = implementation;
+    }
+
+    public String getNoneURI() {
+        return implementation.getNoneURI();
+    }
+
+    public static final String CLIENT_ADDRESSING_PROPERTIES = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES;
+
+    public static final String CLIENT_ADDRESSING_PROPERTIES_INBOUND = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND;
+
+    public static final String CLIENT_ADDRESSING_PROPERTIES_OUTBOUND = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND;
+
+    public static final String SERVER_ADDRESSING_PROPERTIES_INBOUND = JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND;
+
+    public static final String SERVER_ADDRESSING_PROPERTIES_OUTBOUND = JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND;
+
+    private AddressingConstants implementation;
+}

Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPEndpoint.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPEndpoint.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPEndpoint.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -0,0 +1,39 @@
+package org.jboss.jbossts.xts.wsaddr.map;
+
+import org.w3c.dom.Element;
+
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.ReferenceParametersType;
+
+/**
+ * MAPEndpoint is a wrapper class which works with class MAP. This is the JBossWS CXF implementation.
+ */
+public class MAPEndpoint
+{
+    MAPEndpoint(EndpointReferenceType implementation)
+    {
+        this.implementation = implementation;
+    }
+
+    public String getAddress()
+    {
+        return implementation.getAddress().getValue();
+    }
+
+    public void addReferenceParameter(Element element)
+    {
+        ReferenceParametersType refParams = implementation.getReferenceParameters();
+        if (refParams == null) {
+            refParams = new ReferenceParametersType();
+            implementation.setReferenceParameters(refParams);
+        }
+        refParams.getAny().add(element);
+    }
+
+    EndpointReferenceType getImplementation()
+    {
+        return implementation;
+    }
+
+    private EndpointReferenceType implementation;
+}

Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPRelatesTo.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPRelatesTo.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11-cxf/org/jboss/jbossts/xts/wsaddr/map/MAPRelatesTo.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -0,0 +1,33 @@
+package org.jboss.jbossts.xts.wsaddr.map;
+
+import javax.xml.namespace.QName;
+
+/**
+ * MAPRelationship is a wrapper class which works with class MAP. This is the JBossWS CXF implementation.
+ */
+public class MAPRelatesTo
+{
+    MAPRelatesTo(String relatesTo, QName type)
+    {
+        this.relatesTo = relatesTo;
+        this.type = type;
+    }
+
+    public String getRelatesTo()
+    {
+        return relatesTo;
+    }
+
+    public QName getType()
+    {
+        return type;
+    }
+
+    public void setType(QName type)
+    {
+        this.type = type;
+    }
+
+    private String relatesTo;
+    private QName type;
+}

Copied: labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAP.java (from rev 26502, labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAP.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAP.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAP.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -0,0 +1,186 @@
+package org.jboss.jbossts.xts.wsaddr.map;
+
+import org.w3c.dom.Element;
+
+import javax.xml.ws.addressing.*;
+import java.net.URISyntaxException;
+import java.net.URI;
+import java.util.Map;
+
+/**
+ * Message Addressing Properties is a wrapper class for the stack-specific addressing properties
+ * classes implemented by JBossWS Native and CXF. It is used to localize dependence upon the WS
+ * stack. This is the JBossWS Native specific implementation
+ */
+
+public class MAP
+{
+    /**
+     * JBossWS Native specific constructor
+     * @param implementation
+     */
+    MAP(AddressingProperties implementation)
+    {
+        this.implementation = implementation;
+    }
+
+    public String getTo() {
+        AttributedURI to = implementation.getTo();
+        return (to != null ? to.getURI().toString() : null);
+    }
+
+    public MAPEndpoint getFrom() {
+        EndpointReference from = implementation.getFrom();
+        return (from != null ?  new MAPEndpoint(from) : null);
+    }
+
+    public String getMessageID() {
+        AttributedURI messageId = implementation.getMessageID();
+        return (messageId != null ? messageId.getURI().toString() : null);
+    }
+
+    public String getAction() {
+        AttributedURI action = implementation.getAction();
+        return (action != null ? action.getURI().toString() : null);
+    }
+
+    public MAPEndpoint getFaultTo() {
+        EndpointReference faultTo = implementation.getFaultTo();
+        return (faultTo != null ?  new MAPEndpoint(faultTo) : null);
+    }
+
+    public MAPEndpoint getReplyTo()
+    {
+        EndpointReference replyTo = implementation.getReplyTo();
+        return (replyTo != null ?  new MAPEndpoint(replyTo) : null);
+    }
+
+    public MAPRelatesTo getRelatesTo()
+    {
+        MAPBuilder builder = MAPBuilder.getBuilder();
+        Relationship[] relationship = implementation.getRelatesTo();
+        if (relationship != null) {
+            Relationship relatesTo = relationship[0];
+            return builder.newRelatesTo(relatesTo.getID().toString(), relatesTo.getType());
+        } else {
+            return null;
+        }
+    }
+
+    public void setTo(String address)
+    {
+        if (address != null) {
+            try {
+                AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+                AttributedURI uri = builder.newURI(address);
+                implementation.setTo(uri);
+            } catch (URISyntaxException e) {
+                // should not happen
+            }
+        } else {
+            implementation.setTo(null);
+        }
+    }
+
+    public void setFrom(MAPEndpoint epref)
+    {
+        if (epref != null) {
+            implementation.setFrom(epref.getImplementation());
+        } else {
+            implementation.setFrom(null);
+        }
+    }
+
+    public void setMessageID(String messageID)
+    {
+        if (messageID != null) {
+            try {
+                AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+                AttributedURI uri = builder.newURI(messageID);
+                implementation.setMessageID(uri);
+            } catch (URISyntaxException e) {
+                // should not happen
+            }
+        } else {
+            implementation.setMessageID(null);
+        }
+    }
+
+    public void setAction(String action)
+    {
+        if (action != null) {
+        try {
+            AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+            AttributedURI uri = builder.newURI(action);
+            implementation.setAction(uri);
+        } catch (URISyntaxException e) {
+            // should not happen
+        }
+        } else {
+            implementation.setAction(null);
+        }
+    }
+
+    public void setReplyTo(MAPEndpoint epref)
+    {
+        if (epref != null) {
+            implementation.setReplyTo(epref.getImplementation());
+        } else {
+            implementation.setReplyTo(null);
+        }
+    }
+
+    public void setFaultTo(MAPEndpoint epref)
+    {
+        if (epref != null) {
+            implementation.setFaultTo(epref.getImplementation());
+        } else {
+            implementation.setFaultTo(null);
+        }
+    }
+
+    public void setRelatesTo(MAPRelatesTo relatesTo)
+    {
+        if (relatesTo != null) {
+            try {
+                AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+                Relationship[] relationships = new Relationship[1];
+                String relatesToId = relatesTo.getRelatesTo();
+                URI uri = new URI(relatesToId);
+                Relationship relationship = builder.newRelationship(uri);
+                relationship.setType(relatesTo.getType());
+                relationships[0] = relationship;
+                implementation.setRelatesTo(relationships);
+            } catch (URISyntaxException e) {
+                // should not happen
+            }
+        } else {
+            implementation.setRelatesTo(null);
+        }
+    }
+
+    public void addReferenceParameter(Element refParam)
+    {
+        implementation.getReferenceParameters().addElement(refParam);
+        // cxf needs to do
+        // implementtaion.getToEndpointReference().getReferenceParameters().getAny().add(refParam);
+    }
+
+    public void initializeAsDestination(MAPEndpoint epref)
+    {
+        implementation.initializeAsDestination(epref.getImplementation());
+    }
+
+
+    public void installOutboundMap(Map<String, Object> requestContext, MAP map)
+    {
+        AddressingProperties addressingProperties = map.implementation;
+
+        requestContext.put(MAPConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
+	    requestContext.put(MAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
+    }
+    /**
+     * the wrapped instance which this class delegates to
+     */
+    private AddressingProperties implementation;
+}

Copied: labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPBuilder.java (from rev 26502, labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPBuilder.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPBuilder.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPBuilder.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -0,0 +1,79 @@
+package org.jboss.jbossts.xts.wsaddr.map;
+
+import javax.xml.ws.addressing.*;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.namespace.QName;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+
+/**
+ * MAPBuilder is a helper class used to create objects used with class MAP. This is the JBossWS Native
+ * implementation
+ */
+public class MAPBuilder
+{
+    public static MAPBuilder getBuilder() {
+        return theBuilder;
+    }
+
+    public MAP newMap() {
+        AddressingProperties implementation = addressingBuilder.newAddressingProperties();
+        return new MAP(implementation);
+    }
+
+    /**
+     * retrieve the inbound server message address properties attached to a message context
+     * @param ctx the server message context
+     * @return
+     */
+    public MAP inboundMap(MessageContext ctx)
+    {
+        AddressingProperties implementation = (AddressingProperties)ctx.get(MAPConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        return newMap(implementation);
+    }
+
+    /**
+     * retrieve the outbound client message address properties attached to a message request map
+     * @param ctx the client request properties map
+     * @return
+     */
+    public MAP outboundMap(Map<String, Object> ctx) {
+        AddressingProperties implementation = (AddressingProperties)ctx.get(MAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
+        return newMap(implementation);
+    }
+
+    // n.b. this is package public only!
+    MAP newMap(AddressingProperties implementation) {
+        return new MAP(implementation);
+    }
+
+    public MAPConstants newConstants() {
+        AddressingConstants implementation = addressingBuilder.newAddressingConstants();
+        return new MAPConstants(implementation);
+    }
+
+    public MAPEndpoint newEndpoint(String address) {
+        try {
+            URI uri = new URI(address);
+            EndpointReference implementation = addressingBuilder.newEndpointReference(uri);
+            return new MAPEndpoint(implementation);
+        } catch (URISyntaxException e) {
+            return null;
+        }
+    }
+
+    public MAPRelatesTo newRelatesTo(String id, QName type) {
+        return new MAPRelatesTo(id, type);
+    }
+
+    private MAPBuilder()
+    {
+        AddressingBuilder implementation = AddressingBuilder.getAddressingBuilder();
+        this.addressingBuilder = implementation;
+    }
+
+    private AddressingBuilder addressingBuilder;
+
+    private static MAPBuilder theBuilder = new MAPBuilder();
+}

Copied: labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPConstants.java (from rev 26502, labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPConstants.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPConstants.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPConstants.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -0,0 +1,32 @@
+package org.jboss.jbossts.xts.wsaddr.map;
+
+import javax.xml.ws.addressing.AddressingConstants;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.namespace.QName;
+
+/**
+ * MAPConstants is a wrapper class which works with class MAP
+ */
+public class MAPConstants
+{
+    MAPConstants(AddressingConstants implementation)
+    {
+        this.implementation = implementation;
+    }
+
+    public String getNoneURI() {
+        return implementation.getNoneURI();
+    }
+
+    public static final String CLIENT_ADDRESSING_PROPERTIES = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES;
+
+    public static final String CLIENT_ADDRESSING_PROPERTIES_INBOUND = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND;
+
+    public static final String CLIENT_ADDRESSING_PROPERTIES_OUTBOUND = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND;
+
+    public static final String SERVER_ADDRESSING_PROPERTIES_INBOUND = JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND;
+
+    public static final String SERVER_ADDRESSING_PROPERTIES_OUTBOUND = JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND;
+
+    private AddressingConstants implementation;
+}

Copied: labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPEndpoint.java (from rev 26502, labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPEndpoint.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPEndpoint.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPEndpoint.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -0,0 +1,33 @@
+package org.jboss.jbossts.xts.wsaddr.map;
+
+import org.w3c.dom.Element;
+
+import javax.xml.ws.addressing.EndpointReference;
+
+/**
+ * MAPEndpoint is a wrapper class which works with class MAP. This is the JBossWS Native implementation.
+ */
+public class MAPEndpoint
+{
+    MAPEndpoint(EndpointReference implementation)
+    {
+        this.implementation = implementation;
+    }
+
+    public String getAddress()
+    {
+        return implementation.getAddress().getURI().toString();
+    }
+
+    public void addReferenceParameter(Element element)
+    {
+        implementation.getReferenceParameters().addElement(element);
+    }
+
+    EndpointReference getImplementation()
+    {
+        return implementation;
+    }
+
+    private EndpointReference implementation;
+}

Copied: labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPRelatesTo.java (from rev 26502, labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPRelatesTo.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPRelatesTo.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11-native/org/jboss/jbossts/xts/wsaddr/map/MAPRelatesTo.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -0,0 +1,34 @@
+package org.jboss.jbossts.xts.wsaddr.map;
+
+import javax.xml.ws.addressing.Relationship;
+import javax.xml.namespace.QName;
+
+/**
+ * MAPRelationship is a wrapper class which works with class MAP. This is the JBossWS Native implementation.
+ */
+public class MAPRelatesTo
+{
+    MAPRelatesTo(String relatesTo, QName type)
+    {
+        this.relatesTo = relatesTo;
+        this.type = type;
+    }
+
+    public String getRelatesTo()
+    {
+        return relatesTo;
+    }
+
+    public QName getType()
+    {
+        return type;
+    }
+
+    public void setType(QName type)
+    {
+        this.type = type;
+    }
+
+    private String relatesTo;
+    private QName type;
+}

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/ActivationTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -28,7 +28,7 @@
 
 import com.arjuna.webservices11.ServiceRegistry;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -27,7 +27,7 @@
 package com.arjuna.wsc11.tests.junit;
 
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -27,7 +27,7 @@
 package com.arjuna.wsc11.tests.junit;
 
 import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFaultType;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
 import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wscoor.CoordinationConstants;
 import com.arjuna.webservices11.wscoor.processors.RegistrationCoordinatorProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml	2009-05-15 10:29:10 UTC (rev 26549)
@@ -99,9 +99,13 @@
 
     <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
     <property name="jta.ext.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+    <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+            geronimo-ws-metadata_2.0_spec.jar">
+        <isset property="cxf.build"/>
+    </condition>
     <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
             jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
-            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar"/>
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
     <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
     <property name="jboss.lib.jars" value="dom4j.jar"/>
 

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,7 +1,7 @@
 package com.arjuna.webservices11.wsarjtx.client;
 
 import com.arjuna.schemas.ws._2005._10.wsarjtx.*;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -29,17 +29,15 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+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 com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.ServiceRegistry;
 import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
 
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
 
 /**
  * The Client side of the Terminator Participant.

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationParticipantClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -29,15 +29,16 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import org.jboss.jbossts.xts.wsaddr.map.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;
+
 /**
  * The Client side of the Terminator Coordinator.
  * @author kevin

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -6,16 +6,12 @@
 import com.arjuna.schemas.ws._2005._10.wsarjtx.TerminationParticipantService;
 import com.arjuna.webservices11.wsarj.InstanceIdentifier;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
-import com.arjuna.webservices11.wsaddr.map.MAPConstants;
+import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.soap.AddressingFeature;
-import javax.xml.ws.handler.Handler;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import org.w3c.dom.Element;
 

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -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 com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantCallback.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,7 +24,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -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 com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -8,8 +8,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsarjtx.processors.TerminationCoordinatorProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
-import com.arjuna.webservices11.wsaddr.map.MAPConstants;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -10,7 +10,7 @@
 import com.arjuna.webservices.SoapFaultType;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/CoordinatorInboundEvents.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,7 +1,7 @@
 package com.arjuna.webservices11.wsat;
 
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/ParticipantInboundEvents.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,7 +1,7 @@
 package com.arjuna.webservices11.wsat;
 
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionCoordinatorClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -7,9 +7,9 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+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.oasis_open.docs.ws_tx.wsat._2006._06.CompletionCoordinatorPortType;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -9,9 +9,9 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+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.oasis_open.docs.ws_tx.wsat._2006._06.CompletionInitiatorPortType;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -9,9 +9,9 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+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.oasis_open.docs.ws_tx.wsat._2006._06.CoordinatorPortType;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -9,9 +9,9 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+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.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.ParticipantPortType;
 

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,16 +1,13 @@
 package com.arjuna.webservices11.wsat.client;
 
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 import org.oasis_open.docs.ws_tx.wsat._2006._06.*;
 
-import javax.xml.ws.handler.Handler;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.soap.AddressingFeature;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 /**

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -2,7 +2,7 @@
 
 import com.arjuna.wst11.CompletionCoordinatorParticipant;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorCallback.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -2,7 +2,7 @@
 
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -2,7 +2,7 @@
 
 import com.arjuna.webservices11.wsarj.processor.BaseNotificationProcessor;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -2,7 +2,7 @@
 
 import com.arjuna.webservices11.wsat.CoordinatorInboundEvents;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/ParticipantProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -2,7 +2,7 @@
 
 import com.arjuna.webservices11.wsat.ParticipantInboundEvents;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -2,6 +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 javax.jws.*;
 import javax.jws.soap.SOAPBinding;
@@ -12,7 +13,6 @@
 
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.processors.CompletionCoordinatorProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.services.framework.task.TaskManager;
 import com.arjuna.services.framework.task.Task;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -3,6 +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 javax.jws.*;
 import javax.jws.soap.SOAPBinding;
@@ -14,7 +15,6 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.processors.CompletionInitiatorProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.services.framework.task.TaskManager;
 import com.arjuna.services.framework.task.Task;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -3,6 +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 javax.jws.*;
 import javax.jws.soap.SOAPBinding;
@@ -14,7 +15,6 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.processors.CoordinatorProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.services.framework.task.TaskManager;
 import com.arjuna.services.framework.task.Task;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -3,6 +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 javax.jws.*;
 import javax.jws.soap.SOAPBinding;
@@ -14,7 +15,6 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.services.framework.task.TaskManager;
 import com.arjuna.services.framework.task.Task;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionCoordinatorInboundEvents.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionParticipantInboundEvents.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionCoordinatorInboundEvents.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionParticipantInboundEvents.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -28,13 +28,13 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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 javax.xml.namespace.QName;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -28,12 +28,12 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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 javax.xml.namespace.QName;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -28,13 +28,13 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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 javax.xml.namespace.QName;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -28,12 +28,12 @@
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
 import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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 javax.xml.namespace.QName;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -1,16 +1,13 @@
 package com.arjuna.webservices11.wsba.client;
 
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 import org.oasis_open.docs.ws_tx.wsba._2006._06.*;
 
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.soap.AddressingFeature;
-import javax.xml.ws.handler.Handler;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 /**

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.CoordinatorCompletionCoordinatorInboundEvents;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionParticipantProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.CoordinatorCompletionParticipantInboundEvents;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.ParticipantCompletionCoordinatorInboundEvents;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionParticipantProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.ParticipantCompletionParticipantInboundEvents;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -6,7 +6,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionCoordinatorProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -6,7 +6,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionParticipantProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -6,7 +6,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.processors.ParticipantCompletionCoordinatorProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -6,7 +6,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.processors.ParticipantCompletionParticipantProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -7,7 +7,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorProcessorImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -5,7 +5,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantProcessorImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -4,7 +4,7 @@
 import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/TerminationCoordinatorProcessorImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -28,7 +28,7 @@
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionParticipantEngine.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,7 +24,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorEngine.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -6,7 +6,7 @@
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,7 +24,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionParticipantEngine.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,7 +24,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantEngine.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -5,7 +5,7 @@
 import com.arjuna.webservices.logging.WSTLogger;
 import com.arjuna.webservices.util.TransportTimer;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -33,7 +33,7 @@
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/CompletionStub.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -3,7 +3,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionCoordinatorTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -35,7 +35,7 @@
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionParticipantTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -30,7 +30,7 @@
 
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionCoordinatorTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -36,7 +36,7 @@
 import com.arjuna.webservices11.ServiceRegistry;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionParticipantTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -34,7 +34,7 @@
 import com.arjuna.webservices.SoapFaultType;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -41,7 +41,7 @@
 import com.arjuna.webservices11.wsat.processors.CompletionInitiatorProcessor;
 import com.arjuna.wst11.tests.TestUtil;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionParticipantTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -29,7 +29,7 @@
 import junit.framework.TestCase;
 
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,7 +25,7 @@
 
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.processors.CompletionCoordinatorProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionInitiatorCallback.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.processors.CompletionInitiatorCallback;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -26,7 +26,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.CoordinatorCompletionCoordinatorInboundEvents;
 import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionCoordinatorProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionParticipantProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -26,7 +26,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.CoordinatorCompletionParticipantInboundEvents;
 import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionParticipantProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -27,7 +27,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.CoordinatorInboundEvents;
 import com.arjuna.webservices11.wsat.processors.CoordinatorProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionCoordinatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -26,7 +26,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.ParticipantCompletionCoordinatorInboundEvents;
 import com.arjuna.webservices11.wsba.processors.ParticipantCompletionCoordinatorProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionParticipantProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -26,7 +26,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsba.ParticipantCompletionParticipantInboundEvents;
 import com.arjuna.webservices11.wsba.processors.ParticipantCompletionParticipantProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -27,7 +27,7 @@
 import com.arjuna.webservices11.wsarj.ArjunaContext;
 import com.arjuna.webservices11.wsat.ParticipantInboundEvents;
 import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCCoordinatorTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -38,7 +38,7 @@
 import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -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 com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 
 public class TwoPCParticipantTestCase extends TestCase
 {

Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml	2009-05-15 10:29:10 UTC (rev 26549)
@@ -50,9 +50,13 @@
 
     <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
     <property name="jta.ext.jars" value="jbossts-common.jar"/>
+    <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+            geronimo-ws-metadata_2.0_spec.jar">
+        <isset property="cxf.build"/>
+    </condition>
     <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
             jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
-            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar"/>
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
     <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
     <property name="jboss.lib.jars" value="dom4j.jar"/>
 

Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml	2009-05-15 10:29:10 UTC (rev 26549)
@@ -76,9 +76,13 @@
     <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
     <property name="jta.ext.jars" value="jbossts-common.jar"/>
     <property name="jta.ext.compile.jars" value="commons-logging-1.1.jar jta-1_1-classes.zip"/>
+    <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+            geronimo-ws-metadata_2.0_spec.jar">
+        <isset property="cxf.build"/>
+    </condition>
     <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
             jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
-            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar"/>
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
     <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
     <property name="jboss.lib.jars" value="dom4j.jar"/>
 

Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml	2009-05-15 10:29:10 UTC (rev 26549)
@@ -99,9 +99,13 @@
     <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
     <property name="jta.ext.jars" value="jbossts-common.jar"/>
     <property name="jta.ext.compile.jars" value="commons-logging.jar"/>
+    <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+            geronimo-ws-metadata_2.0_spec.jar">
+        <isset property="cxf.build"/>
+    </condition>
     <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
             jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
-            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar"/>
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
     <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
     <property name="jboss.lib.jars" value="dom4j.jar"/>
 

Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/build.xml	2009-05-15 10:29:10 UTC (rev 26549)
@@ -47,10 +47,13 @@
     <property name="com.arjuna.buildsystem.lib.jars" value="buildsystem.jar"/>
     <property name="com.arjuna.jta.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
     <property name="com.arjuna.jta.install.ext.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+    <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+            geronimo-ws-metadata_2.0_spec.jar">
+        <isset property="cxf.build"/>
+    </condition>
     <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
             jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
-            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar"/>
-
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
     <condition property="jboss.home" value="${env.JBOSS_HOME}">
         <isset property="env.JBOSS_HOME"/>
     </condition>

Modified: labs/jbosstm/trunk/XTS/demo/xts-build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/xts-build.xml	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/demo/xts-build.xml	2009-05-15 10:29:10 UTC (rev 26549)
@@ -76,10 +76,15 @@
 
     <property name="lib.libs" value="jbossxts-api.jar"/>
 
-    <property name="ext.libs" value="jbossjta.jar jbossts-common.jar commons-logging.jar"/>
-    <property name="jboss.client.libs" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+    <property name="ext.libs" value="jbossjta.jar jbossjts.jar jbossts-common.jar commons-logging.jar"/>
+    <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+            geronimo-ws-metadata_2.0_spec.jar">
+        <isset property="cxf.build"/>
+    </condition>
+    <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
             jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
-            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar"/>
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
+    <property name="jboss.client.libs" value="${jboss.client.lib.jars}"/>
 
     <property name="jboss.common.libs" value="servlet-api.jar"/>
 

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml	2009-05-15 10:29:10 UTC (rev 26549)
@@ -61,9 +61,14 @@
 	<property name="xts11.compile.libs" value="ws-c11.jar ws-t11.jar wscf11.jar wstx11.jar"/>
 	<property name="xts.compile.libs" value="jbossxts-api.jar ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar"/>
 	<property name="xts.ext.compile.libs" value="jbossjta.jar jbossjts.jar"/>
-	<property name="jboss.compile.client.libs" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+    <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+            geronimo-ws-metadata_2.0_spec.jar">
+        <isset property="cxf.build"/>
+    </condition>
+    <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
             jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
-            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar"/>
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
+	<property name="jboss.compile.client.libs" value="${jboss.client.lib.jars}"/>
 	<property name="jboss.compile.lib.jars" value="dom4j.jar"/>
 	<property name="jboss.compile.common.lib.jars" value="servlet-api.jar"/>
 

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,9 +25,9 @@
 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 com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 import com.arjuna.webservices11.SoapFault11;
 import com.jboss.transaction.wstf.webservices.sc007.client.AsyncParticipantClient;
 import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorCallback;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,9 +24,9 @@
 
 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 com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,12 +24,12 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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 com.jboss.transaction.wstf.webservices.sc007.generated.ParticipantPortType;
 
 /**

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -27,7 +27,7 @@
 import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -28,9 +28,9 @@
 import java.util.Map;
 
 import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+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 com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.jboss.transaction.wstf.webservices.sc007.generated.Sc007Service;
 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/SyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import java.io.IOException;
 
 import com.arjuna.webservices.*;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,10 +22,10 @@
 
 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 com.arjuna.wst.CompletionCoordinatorParticipant;
 import com.arjuna.wst11.messaging.engines.ParticipantEngine;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 import com.jboss.transaction.wstf.webservices.sc007.InteropUtil;
 import com.jboss.transaction.wstf.webservices.sc007.participant.CommitDurable2PCParticipant;
 import com.jboss.transaction.wstf.webservices.sc007.participant.CommitFailureDurable2PCParticipant;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorProcessor;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,7 +24,7 @@
 import com.jboss.transaction.wstf.webservices.sc007.client.InitiatorClient;
 import com.jboss.transaction.wstf.webservices.CoordinationContextManager;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.wsc11.messaging.MessageId;
 

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml	2009-05-15 10:29:10 UTC (rev 26549)
@@ -53,7 +53,7 @@
 	<property name="xts.ext.lib.dir" location="${xts.lib.dir}/ext"/>
 
 	<echo>jboss.dir = ${jboss.dir}</echo>
-	<echo>xts.home = ${xts.home}</echo>
+	<echo>xts.home = ${xts.homexf}</echo>
 
 	<!--
 	<property name="dist.compile.libs" value="ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar jbossjta.jar jbossts-common.jar stax-api-1.0.jar junit-3.8.1.jar saxon8.jar"/>
@@ -61,9 +61,14 @@
 	<property name="xts11.compile.libs" value="ws-c11.jar ws-t11.jar wscf11.jar wstx11.jar"/>
 	<property name="xts.compile.libs" value="jbossxts-api.jar ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar"/>
 	<property name="xts.ext.compile.libs" value="jbossjta.jar jbossjts.jar"/>
-	<property name="jboss.compile.client.libs" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+    <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+            geronimo-ws-metadata_2.0_spec.jar">
+        <isset property="cxf.build"/>
+    </condition>
+    <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
             jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
-            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar"/>
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
+	<property name="jboss.compile.client.libs" value="${jboss.client.lib.jars}"/>
 	<property name="jboss.compile.lib.jars" value="dom4j.jar"/>
 	<property name="jboss.compile.common.libs" value="servlet-api.jar"/>
 

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,9 +25,9 @@
 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 com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 import com.arjuna.webservices11.SoapFault11;
 import com.jboss.transaction.txinterop.webservices.atinterop.client.AsyncParticipantClient;
 import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorCallback;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,9 +24,9 @@
 
 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 com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -28,9 +28,9 @@
 import java.util.Map;
 
 import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.webservices11.wsaddr.map.MAP;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+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 com.arjuna.webservices11.wsaddr.AddressingHelper;
 import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorService;
 import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantService;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,9 +24,9 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+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 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;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -27,7 +27,7 @@
 import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import java.io.IOException;
 
 import com.arjuna.webservices.*;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,10 +22,10 @@
 
 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 com.arjuna.wst.CompletionCoordinatorParticipant;
 import com.arjuna.wst11.messaging.engines.ParticipantEngine;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropUtil;
 import com.jboss.transaction.txinterop.webservices.atinterop.participant.CommitDurable2PCParticipant;
 import com.jboss.transaction.txinterop.webservices.atinterop.participant.CommitFailureDurable2PCParticipant;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,7 +22,7 @@
 
 import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,7 +24,7 @@
 import com.jboss.transaction.txinterop.webservices.atinterop.client.InitiatorClient;
 import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.wsc11.messaging.MessageId;
 

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,10 +25,10 @@
 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 com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 import com.jboss.transaction.txinterop.webservices.bainterop.client.AsyncParticipantClient;
 import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAInitiatorCallback;
 import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAInitiatorProcessor;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,9 +24,9 @@
 
 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 com.arjuna.wsc11.messaging.MessageId;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,9 +24,9 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
-import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+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 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;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -32,8 +32,8 @@
 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 com.arjuna.webservices11.wsaddr.map.MAPBuilder;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.MAPBuilder;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
 
 /**

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -25,7 +25,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import java.io.IOException;
 
 import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,7 +22,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -23,7 +23,7 @@
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.base.processors.Callback;
 import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,10 +22,10 @@
 
 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 com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine;
 import com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine;
 import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.map.MAP;
 import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropUtil;
 import com.jboss.transaction.txinterop.webservices.bainterop.participant.CancelParticipant;
 import com.jboss.transaction.txinterop.webservices.bainterop.participant.CoordinatorCompleteCloseParticipant;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -22,7 +22,7 @@
 
 import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAInitiatorProcessor;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.WebServiceContext;

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-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java	2009-05-15 10:29:10 UTC (rev 26549)
@@ -24,7 +24,7 @@
 import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAParticipantProcessor;
 import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
 import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.wsaddr.map.MAP;
 import com.arjuna.webservices11.SoapFault11;
 import com.arjuna.wsc11.messaging.MessageId;
 

Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml	2009-05-15 09:46:58 UTC (rev 26548)
+++ labs/jbosstm/trunk/XTS/sar/build.xml	2009-05-15 10:29:10 UTC (rev 26549)
@@ -71,9 +71,13 @@
     <property name="build.metainf.dir"       value="${build.dir}/META-INF"/>
     <property name="build.conf.dir" location="${build.dir}/conf"/>
 
+    <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+            geronimo-ws-metadata_2.0_spec.jar">
+        <isset property="cxf.build"/>
+    </condition>
     <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
             jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
-            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar"/>
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
     <property name="jboss.client.lib.dir" value="${jbossas.home}/client"/>
     <!-- enable debugging of XTS service code -->
 




More information about the jboss-svn-commits mailing list