[jboss-svn-commits] JBL Code SVN: r27022 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP: XTS and 58 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jun 19 06:53:36 EDT 2009


Author: istudens at redhat.com
Date: 2009-06-19 06:53:34 -0400 (Fri, 19 Jun 2009)
New Revision: 27022

Added:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/build.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/sc007.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/commons-logging.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/jaxrpc.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/junit.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/saaj-api.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/saxon.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestCase.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestSuite.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/MessageLogging.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/Sc007TestCase.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/BaseState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/InteropWaitState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007PreparedAfterTimeoutState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedAbortState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedCommitState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingProxySAXHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/BaseHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversationState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyURIRewriting.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/WriterSAXHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/FullTestResult.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogController.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestRunner.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/XMLResultsServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/directoryContents.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/notFoundResponse.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/processor.xsl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/CoordinationContextManager.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/InteropConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/CoordinationContextHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropUtil.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/ParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/InitiatorPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ObjectFactory.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ParticipantPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/Sc007Service.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/TestMessageType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/package-info.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureRecoveryDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitVolatile2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ParticipantAdapter.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ReadonlyDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/RollbackDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableVolatile2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/InitiatorInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/ParticipantInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/details.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/index.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/invalidParameters.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/results.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/README.txt
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/build.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/build.sh
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-initiator-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-participant-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-initiator-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-participant-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/commons-logging.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/jaxrpc.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/junit.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/saaj-api.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/saxon.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/ATTestCase.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/BATestCase.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestCase.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestSuite.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/MessageLogging.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropPreparedAfterTimeoutState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedAbortState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedCommitState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropDroppedParticipantCompletedState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropParticipantCompletedState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropUnsolicitedCompleteState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BaseState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/InteropWaitState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingProxySAXHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/BaseHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversationState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyListenerService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyURIRewriting.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/WriterSAXHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/FullTestResult.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogController.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestRunner.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/XMLResultsServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/directoryContents.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/notFoundResponse.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/processor.xsl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/CoordinationContextManager.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/InteropConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropUtil.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ObjectFactory.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestMessageType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestURLMessageType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/package-info.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureRecoveryDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitVolatile2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ParticipantAdapter.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ReadonlyDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/RollbackDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableVolatile2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATInitiatorInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATParticipantInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropUtil.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/ParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ObjectFactory.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/TestMessageType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/package-info.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CancelParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CannotCompleteParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CompletedParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompleteCloseParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompletionParticipantAdapter.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/DropFirstCompensateParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ExitParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailedCompensateParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ParticipantCompletionParticipantAdapter.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAInitiatorInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAParticipantInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/CoordinationContextHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/details.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/index.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/invalidParameters.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/results.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/run-interop-tests.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java
Removed:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/build.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/sc007.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/commons-logging.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/jaxrpc.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/junit.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/saaj-api.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/saxon.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestCase.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestSuite.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/MessageLogging.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/Sc007TestCase.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/BaseState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/InteropWaitState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007PreparedAfterTimeoutState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedAbortState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedCommitState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingProxySAXHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/BaseHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversationState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyURIRewriting.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/WriterSAXHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/FullTestResult.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogController.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestRunner.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/XMLResultsServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/directoryContents.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/notFoundResponse.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/processor.xsl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/CoordinationContextManager.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/InteropConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/CoordinationContextHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropUtil.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/ParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/InitiatorPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ObjectFactory.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ParticipantPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/Sc007Service.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/TestMessageType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/package-info.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureRecoveryDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitVolatile2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ParticipantAdapter.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ReadonlyDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/RollbackDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableVolatile2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/InitiatorInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/ParticipantInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/details.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/index.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/invalidParameters.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/results.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/README.txt
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/build.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/build.sh
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-initiator-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-participant-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-initiator-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-participant-binding.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba.wsdl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/commons-logging.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/jaxrpc.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/junit.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/saaj-api.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/saxon.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/ATTestCase.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/BATestCase.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestCase.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestSuite.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/MessageLogging.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropPreparedAfterTimeoutState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedAbortState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedCommitState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropDroppedParticipantCompletedState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropParticipantCompletedState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropUnsolicitedCompleteState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BaseState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/InteropWaitState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingProxySAXHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/BaseHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversationState.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyListenerService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyURIRewriting.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/WriterSAXHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/FullTestResult.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogController.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestRunner.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/XMLResultsServlet.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/directoryContents.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/notFoundResponse.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/processor.xsl
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/CoordinationContextManager.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/InteropConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropUtil.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ObjectFactory.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestMessageType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestURLMessageType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/package-info.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureRecoveryDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitVolatile2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ParticipantAdapter.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ReadonlyDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/RollbackDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableDurable2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableVolatile2PCParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATInitiatorInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATParticipantInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropConstants.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropUtil.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/ParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ObjectFactory.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantPortType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/TestMessageType.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/package-info.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CancelParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CannotCompleteParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CompletedParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompleteCloseParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompletionParticipantAdapter.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/DropFirstCompensateParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ExitParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailedCompensateParticipant.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ParticipantCompletionParticipantAdapter.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAInitiatorInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAParticipantInitialisation.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/CoordinationContextHandler.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/details.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/index.jsp
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/invalidParameters.html
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/results.jsp
Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/build.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/run-tests.xml
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitRunner.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/build-release-pkgs.xml
Log:
merge of XTS interop tests from trunk, JBTM-566

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/build.xml	2009-06-19 09:49:54 UTC (rev 27021)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/build.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -167,6 +167,10 @@
 
 	</target>
 
+    <target name="build-interop-tests" depends="install-projects, com.arjuna.mwlabs.xts.interop-tests.build">
+
+	</target>
+
     <target name="htdocs" depends="com.arjuna.mwlabs.xts.init">
 		<echo message="Building htdocs "/>
 		<mkdir dir="${com.arjuna.mwlabs.xts.htdocs.dest}"/>
@@ -288,13 +292,29 @@
 	</zip>
     </target>
 
+    <target name="install-interop-tests" depends="build-interop-tests">   
+        <echo message="Installing service tests"/>
+        <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/interop-tests"/>
+        <copy todir="${com.arjuna.mwlabs.installationdirectory}/interop-tests">
+            <!-- wars providing test servlets -->
+            <fileset dir="interop/WSTFSC07-interop/build/lib" includes="sc007.war"/>
+            <fileset dir="interop/WSTX11-interop/build/lib" includes="interop11.war"/>
+            <!-- ant script and client jar used to exercise servlets-->
+            <fileset dir="localjunit/build/" includes="localjunit.jar"/>
+            <fileset dir="localjunit" includes="run-interop-tests.xml"/>
+        </copy>
+	<zip destfile="${com.arjuna.mwlabs.installationdirectory}/interop-tests/jbossxts-interop-tests.zip">
+	  <fileset dir="${com.arjuna.mwlabs.installationdirectory}/interop-tests" includes="*.war *.jar *.xml"/>
+	</zip>
+    </target>
+
     <!-- build target just builds the main projects but not the sar since
         the latter cannot be built until after the projects have been installed -->
     <target name="build" depends="build-projects"/>
 
     <!-- install target builds and installs the main projects
         then builds and installs the sar then installs the demo -->
-    <target name="install" depends="install-sar, install-tests, install-demo"/>
+    <target name="install" depends="install-sar, install-tests, install-interop-tests, install-demo"/>
 
     <target name="clean" depends="com.arjuna.mwlabs.xts.init,
 		com.arjuna.mwlabs.xts.wsas.clean,
@@ -302,7 +322,8 @@
 		com.arjuna.mwlabs.xts.wscf.clean,
 		com.arjuna.mwlabs.xts.ws-t.clean,
 		com.arjuna.mwlabs.xts.wstx.clean,
-		com.arjuna.mwlabs.xts.sar.clean">
+		com.arjuna.mwlabs.xts.sar.clean,
+		com.arjuna.mwlabs.xts.interop-tests.clean">
 
 		<delete dir="${com.arjuna.mwlabs.xts.htdocs.dest}"/>
 		<delete dir="${com.arjuna.mwlabs.xts.jar.dest}"/>
@@ -357,6 +378,19 @@
         <ant dir="localjunit" target="all"/>
     </target>
 
+    <target name="com.arjuna.mwlabs.xts.interop-tests.build">
+        <property name="xts.home" location="${com.arjuna.mw.installationdirectory}"/>
+        <ant dir="interop/WSTFSC07-interop" target="war"/>
+        <ant dir="interop/WSTX11-interop" target="war"/>
+        <ant dir="localjunit" target="all"/>
+    </target>
+
+    <target name="com.arjuna.mwlabs.xts.interop-tests.clean">
+        <property name="xts.home" location="${com.arjuna.mw.installationdirectory}"/>
+        <ant dir="interop/WSTFSC07-interop" target="clean"/>
+        <ant dir="interop/WSTX11-interop" target="clean"/>
+    </target>
+
 	<target name="com.arjuna.mwlabs.xts.wsas.clean">
 		<ant dir="WSAS" target="clean"/>
 	</target>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop (from rev 26238, labs/jbosstm/trunk/XTS/interop)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/build.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-<project name="project" default="war">
-    <description>
-        JBoss Transactions WS-Addressing interop test
-    </description>
-
-	<property environment="env"/>
-	
-	<property name="host" value="localhost"/>
-	<property name="port" value="8080"/>
-	
-	<property name="jboss.dir" location="${env.JBOSS_HOME}"/>
-	<property name="jboss.deploy.dir" location="${jboss.dir}/server/default/deploy"/>
-
-	<property name="build.dir" location="build"/>
-	<property name="build.classes.dir" location="${build.dir}/classes"/>
-	<property name="build.lib.dir" location="${build.dir}/lib"/>
-	<property name="build.war.file" location="${build.lib.dir}/sc007.war"/>
-	<property name="build.webxml.file" location="${build.lib.dir}/web.xml"/>
-	
-	<property name="src.dir" location="src"/>
-	<property name="dd.dir" location="dd/"/>
-	<property name="webxml.file" location="web.xml"/>
-	<property name="lib.dir" location="lib"/>
-	<property name="web.dir" location="web"/>
-	
-	<property name="jboss.client.lib.dir" location="${jboss.dir}/client"/>
-	<property name="jboss.lib.dir" location="${jboss.dir}/lib"/>
-	<property name="jboss.common.lib.dir" location="${jboss.dir}/common/lib"/>
-	<!-- export XTS_HOME=/home/adinn/jboss/jbossts/trunk/XTS/xts-install -->
-	<property name="xts.home" location="${env.XTS_HOME}"/>
-	<property name="xts.lib.dir" location="${xts.home}/lib"/>
-	<property name="xts.ext.lib.dir" location="${xts.lib.dir}/ext"/>
-
-	<echo>jboss.dir = ${jboss.dir}</echo>
-	<echo>xts.home = ${xts.home}</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"/>
-	-->
-	<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
-            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"/>
-	<property name="jboss.compile.lib.jars" value="dom4j.jar"/>
-	<property name="jboss.compile.common.lib.jars" value="servlet-api.jar"/>
-
-	<property name="dist.compile.libs" value="junit.jar saxon.jar"/>
-
-	<!--
-	<property name="dist.dependency.libs" value="wstx-asl-2.0.3.jar"/>
-	<property name="dist.libs" value="${dist.compile.libs} ${dist.dependency.libs}"/>
-	-->
-	<property name="dist.libs" value="${dist.compile.libs}"/>
-	<property name="dist.xts.libs" value="${xts11.compile.libs} ${xts.compile.libs}"/>
-	<property name="dist.xts.ext.libs" value="${xts.ext.compile.libs}"/>
-
-	<property name="compile.debug" value="true"/>
-	
-	<path id="classpath">
-		<fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
-		<fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
-		<fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
-		<fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
-		<fileset dir="${jboss.lib.dir}" includes="${jboss.compile.lib.jars}"/>
-		<fileset dir="${jboss.common.lib.dir}" includes="${jboss.compile.common.lib.jars}"/>
-	</path>
-	<property name="classpath" refid="classpath"/>
-	
-	<target name="init">
-		<mkdir dir="${build.dir}"/>
-		<mkdir dir="${build.classes.dir}"/>
-		<mkdir dir="${build.lib.dir}"/>
-	</target>
-	
-	<target name="compile" depends="init">
-		<javac classpathref="classpath" destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}"/>
-	</target>
-	
-    <target name="war" depends="compile">
-    	    <copy file="${webxml.file}" tofile="${build.webxml.file}" overwrite="yes">
-    	    		<filterset>
-    	    			<filter token="HOST" value="${host}"/>
-    	    			<filter token="PORT" value="${port}"/>
-    	    		</filterset>
-            </copy>
-        <!-- todo put one copy of each handler file in WEB-INF and refer to it correctly from SEI class annotation-->
-        <copy file="${dd.dir}/sc007/initiatorhandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/wstf/webservices/sc007/sei" overwrite="yes">
-        </copy>
-        <copy file="${dd.dir}/sc007/participanthandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/wstf/webservices/sc007/sei" overwrite="yes">
-        </copy>
-	<!-- wsdl gets loaded relative to service implementation class -->
-        <copy toDir="${build.classes.dir}/com/jboss/transaction/wstf/webservices/sc007/generated"
-	      overwrite="yes">
-            <fileset dir="${dd.dir}/sc007/"
-                    includes="wsdl/sc007.wsdl"/>
-        </copy>
-            <war destfile="${build.war.file}" webxml="${build.webxml.file}">
-    			<classes dir="${build.classes.dir}"/>
-    			<classes dir="${src.dir}" excludes="**/*.java"/>
-                <lib dir="${lib.dir}" includes="${dist.libs}"/>
-                <!--
-		    <lib dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
-		-->
-                <webinf dir="${dd.dir}/sc007" includes="wsdl/sc007.wsdl"/>
-		<fileset dir="${web.dir}"/>
-    		</war>
-    </target>
-	
-	<target name="deploy" depends="war">
-		<copy file="${build.war.file}" todir="${jboss.deploy.dir}"/>
-	</target>
-	
-	<target name="undeploy">
-		<delete file="${jboss.deploy.dir}/sc007.war"/>
-	</target>
-
-	<target name="clean">
-		<delete dir="${build.dir}"/>
-	</target>
-</project>
-

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/build.xml (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/build.xml	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/build.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<project name="project" default="war">
+    <description>
+        JBoss Transactions WS-Addressing interop test
+    </description>
+
+	<property environment="env"/>
+	
+	<property name="host" value="localhost"/>
+	<property name="port" value="8080"/>
+	
+	<property name="jboss.dir" location="${env.JBOSS_HOME}"/>
+	<property name="jboss.deploy.dir" location="${jboss.dir}/server/default/deploy"/>
+
+	<property name="build.dir" location="build"/>
+	<property name="build.classes.dir" location="${build.dir}/classes"/>
+	<property name="build.lib.dir" location="${build.dir}/lib"/>
+	<property name="build.war.file" location="${build.lib.dir}/sc007.war"/>
+	<property name="build.webxml.file" location="${build.lib.dir}/web.xml"/>
+	
+	<property name="src.dir" location="src"/>
+	<property name="dd.dir" location="dd/"/>
+	<property name="webxml.file" location="web.xml"/>
+	<property name="lib.dir" location="lib"/>
+	<property name="web.dir" location="web"/>
+	
+	<property name="jboss.client.lib.dir" location="${jboss.dir}/client"/>
+	<property name="jboss.lib.dir" location="${jboss.dir}/lib"/>
+	<property name="jboss.common.lib.dir" location="${jboss.dir}/common/lib"/>
+	<!-- export XTS_HOME=/home/adinn/jboss/jbossts/trunk/XTS/xts-install -->
+	<property name="xts.home" location="${env.XTS_HOME}"/>
+	<property name="xts.lib.dir" location="${xts.home}/lib"/>
+	<property name="xts.ext.lib.dir" location="${xts.lib.dir}/ext"/>
+
+	<echo>jboss.dir = ${jboss.dir}</echo>
+	<echo>xts.home = ${xts.home}</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"/>
+	-->
+	<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
+            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"/>
+	<property name="jboss.compile.lib.jars" value="dom4j.jar"/>
+	<property name="jboss.compile.common.lib.jars" value="servlet-api.jar"/>
+
+	<property name="dist.compile.libs" value="junit.jar saxon.jar"/>
+
+	<!--
+	<property name="dist.dependency.libs" value="wstx-asl-2.0.3.jar"/>
+	<property name="dist.libs" value="${dist.compile.libs} ${dist.dependency.libs}"/>
+	-->
+	<property name="dist.libs" value="${dist.compile.libs}"/>
+	<property name="dist.xts.libs" value="${xts11.compile.libs} ${xts.compile.libs}"/>
+	<property name="dist.xts.ext.libs" value="${xts.ext.compile.libs}"/>
+
+	<property name="compile.debug" value="true"/>
+	
+	<path id="classpath">
+		<fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
+		<fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
+		<fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
+		<fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
+		<fileset dir="${jboss.lib.dir}" includes="${jboss.compile.lib.jars}"/>
+		<fileset dir="${jboss.common.lib.dir}" includes="${jboss.compile.common.lib.jars}"/>
+	</path>
+	<property name="classpath" refid="classpath"/>
+	
+	<target name="init">
+		<mkdir dir="${build.dir}"/>
+		<mkdir dir="${build.classes.dir}"/>
+		<mkdir dir="${build.lib.dir}"/>
+	</target>
+	
+	<target name="compile" depends="init">
+		<javac classpathref="classpath" destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}"/>
+	</target>
+	
+    <target name="war" depends="compile">
+    	    <copy file="${webxml.file}" tofile="${build.webxml.file}" overwrite="yes">
+    	    		<filterset>
+    	    			<filter token="HOST" value="${host}"/>
+    	    			<filter token="PORT" value="${port}"/>
+    	    		</filterset>
+            </copy>
+        <!-- todo put one copy of each handler file in WEB-INF and refer to it correctly from SEI class annotation-->
+        <copy file="${dd.dir}/sc007/initiatorhandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/wstf/webservices/sc007/sei" overwrite="yes">
+        </copy>
+        <copy file="${dd.dir}/sc007/participanthandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/wstf/webservices/sc007/sei" overwrite="yes">
+        </copy>
+	<!-- wsdl gets loaded relative to service implementation class -->
+        <copy toDir="${build.classes.dir}/com/jboss/transaction/wstf/webservices/sc007/generated"
+	      overwrite="yes">
+            <fileset dir="${dd.dir}/sc007/"
+                    includes="wsdl/sc007.wsdl"/>
+        </copy>
+            <war destfile="${build.war.file}" webxml="${build.webxml.file}">
+    			<classes dir="${build.classes.dir}"/>
+    			<classes dir="${src.dir}" excludes="**/*.java"/>
+                <lib dir="${lib.dir}" includes="${dist.libs}"/>
+                <!--
+		    <lib dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
+		-->
+                <webinf dir="${dd.dir}/sc007" includes="wsdl/sc007.wsdl"/>
+		<fileset dir="${web.dir}"/>
+    		</war>
+    </target>
+	
+	<target name="deploy" depends="war">
+		<copy file="${build.war.file}" todir="${jboss.deploy.dir}"/>
+	</target>
+	
+	<target name="undeploy">
+		<delete file="${jboss.deploy.dir}/sc007.war"/>
+	</target>
+
+	<target name="clean">
+		<delete dir="${build.dir}"/>
+	</target>
+</project>
+

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007 (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,21 +0,0 @@
-#
-#
-#
-
-if [ ! -d tmp ] ; then
-    mkdir tmp
-fi
-
-if [ ! -d tmp/classes ] ; then
-    mkdir tmp/classes
-fi
-
-if [ ! -d tmp/src ] ; then
-    mkdir tmp/src
-fi
-
-# delete old generated versions -- any changes should be made to a copy!
-
-rm -rf tmp/classes/* tmp/src/*
-
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/sc007.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.wstf.webservices.sc007.generated wsdl/sc007.wsdl

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,38 @@
+#---
+# JBoss, Home of Professional Open Source
+# Copyright 2007, Red Hat Middleware LLC, and individual contributors
+# as indicated by the @author tags.
+# See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU Lesser General Public License, v. 2.1.
+# This program is distributed in the hope that it will be useful, but WITHOUT A
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License,
+# v.2.1 along with this distribution; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.
+#
+# (C) 2005-2006,
+# @author JBoss Inc.
+#--- 
+
+if [ ! -d tmp ] ; then
+    mkdir tmp
+fi
+
+if [ ! -d tmp/classes ] ; then
+    mkdir tmp/classes
+fi
+
+if [ ! -d tmp/src ] ; then
+    mkdir tmp/src
+fi
+
+# delete old generated versions -- any changes should be made to a copy!
+
+rm -rf tmp/classes/* tmp/src/*
+
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/sc007.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.wstf.webservices.sc007.generated wsdl/sc007.wsdl

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2007, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU General Public License, v. 2.0.
-  This program is distributed in the hope that it will be useful, but WITHOUT A 
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License,
-  v. 2.0 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-  MA  02110-1301, USA.
-  
-  (C) 2007,
-  @author JBoss Inc.
--->
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" 
-xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
-    <handler-chain>
-	<handler>
-		<handler-name>WS Addressing Server Handler</handler-name>
-		<handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
-	</handler>
-    </handler-chain>
-</handler-chains>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  JBoss, Home of Professional Open Source
+  Copyright 2007, Red Hat Middleware LLC, and individual contributors
+  as indicated by the @author tags. 
+  See the copyright.txt in the distribution for a full listing 
+  of individual contributors.
+  This copyrighted material is made available to anyone wishing to use,
+  modify, copy, or redistribute it subject to the terms and conditions
+  of the GNU General Public License, v. 2.0.
+  This program is distributed in the hope that it will be useful, but WITHOUT A 
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License,
+  v. 2.0 along with this distribution; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+  MA  02110-1301, USA.
+  
+  (C) 2007,
+  @author JBoss Inc.
+-->
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" 
+xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
+    <handler-chain>
+	<handler>
+		<handler-name>WS Addressing Server Handler</handler-name>
+		<handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
+	</handler>
+    </handler-chain>
+</handler-chains>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2007, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU General Public License, v. 2.0.
-  This program is distributed in the hope that it will be useful, but WITHOUT A 
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License,
-  v. 2.0 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-  MA  02110-1301, USA.
-  
-  (C) 2007,
-  @author JBoss Inc.
--->
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" 
-xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
-    <handler-chain>
-	<handler>
-		<handler-name>Coordination Context Handler</handler-name>
-		<handler-class>com.jboss.transaction.wstf.webservices.handlers.CoordinationContextHandler</handler-class>
-	</handler>
-	<handler>
-		<handler-name>WS Addressing Server Handler</handler-name>
-		<handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
-	</handler>
-    </handler-chain>
-</handler-chains>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  JBoss, Home of Professional Open Source
+  Copyright 2007, Red Hat Middleware LLC, and individual contributors
+  as indicated by the @author tags. 
+  See the copyright.txt in the distribution for a full listing 
+  of individual contributors.
+  This copyrighted material is made available to anyone wishing to use,
+  modify, copy, or redistribute it subject to the terms and conditions
+  of the GNU General Public License, v. 2.0.
+  This program is distributed in the hope that it will be useful, but WITHOUT A 
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License,
+  v. 2.0 along with this distribution; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+  MA  02110-1301, USA.
+  
+  (C) 2007,
+  @author JBoss Inc.
+-->
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" 
+xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
+    <handler-chain>
+	<handler>
+		<handler-name>Coordination Context Handler</handler-name>
+		<handler-class>com.jboss.transaction.wstf.webservices.handlers.CoordinationContextHandler</handler-class>
+	</handler>
+	<handler>
+		<handler-name>WS Addressing Server Handler</handler-name>
+		<handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
+	</handler>
+    </handler-chain>
+</handler-chains>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/sc007.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/sc007.wsdl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/sc007.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-  xmlns:s="http://www.w3.org/2001/XMLSchema" 
-  xmlns:tns="http://www.wstf.org/sc007" 
-  targetNamespace="http://www.wstf.org/sc007">
-  <types>
-    <s:schema elementFormDefault="qualified" 
-      targetNamespace="http://www.wstf.org/sc007">
-      <s:complexType name="TestMessageType">
-        <s:sequence />
-      </s:complexType>
-      <s:element name="Response" type="tns:TestMessageType" />
-      <s:element name="CompletionCommit" type="s:string" />
-      <s:element name="CompletionRollback" type="s:string" />
-      <s:element name="Commit" type="tns:TestMessageType" />
-      <s:element name="Rollback" type="tns:TestMessageType" />
-      <s:element name="Phase2Rollback" type="tns:TestMessageType" />
-      <s:element name="Readonly" type="tns:TestMessageType" />
-      <s:element name="VolatileAndDurable" type="tns:TestMessageType" />
-      <s:element name="EarlyReadonly" type="tns:TestMessageType" />
-      <s:element name="EarlyAborted" type="tns:TestMessageType" />
-      <s:element name="ReplayCommit" type="tns:TestMessageType" />
-      <s:element name="RetryPreparedCommit" type="tns:TestMessageType" />
-      <s:element name="RetryPreparedAbort" type="tns:TestMessageType" />
-      <s:element name="RetryCommit" type="tns:TestMessageType" />
-      <s:element name="PreparedAfterTimeout" type="tns:TestMessageType" />
-      <s:element name="LostCommitted" type="tns:TestMessageType" />       
-    </s:schema>
-  </types>
-  <message name="CompletionCommit">
-    <part name="parameters" element="tns:CompletionCommit" />
-  </message>
-  <message name="CompletionRollback">
-    <part name="parameters" element="tns:CompletionRollback" />
-  </message>
-  <message name="Commit">
-    <part name="parameters" element="tns:Commit" />
-  </message>
-  <message name="Rollback">
-    <part name="parameters" element="tns:Rollback" />
-  </message>
-  <message name="Phase2Rollback">
-    <part name="parameters" element="tns:Phase2Rollback" />
-  </message>
-  <message name="Readonly">
-    <part name="parameters" element="tns:Readonly" />
-  </message>
-  <message name="VolatileAndDurable">
-    <part name="parameters" element="tns:VolatileAndDurable" />
-  </message>
-  <message name="EarlyReadonly">
-    <part name="parameters" element="tns:EarlyReadonly" />
-  </message>
-  <message name="EarlyAborted">
-    <part name="parameters" element="tns:EarlyAborted" />
-  </message>
-  <message name="ReplayCommit">
-    <part name="parameters" element="tns:ReplayCommit" />
-  </message>
-  <message name="RetryPreparedCommit">
-    <part name="parameters" element="tns:RetryPreparedCommit" />
-  </message>
-  <message name="RetryPreparedAbort">
-    <part name="parameters" element="tns:RetryPreparedAbort" />
-  </message>
-  <message name="RetryCommit">
-    <part name="parameters" element="tns:RetryCommit" />
-  </message>
-  <message name="PreparedAfterTimeout">
-    <part name="parameters" element="tns:PreparedAfterTimeout" />
-  </message>
-  <message name="LostCommitted">
-    <part name="parameters" element="tns:LostCommitted" />
-  </message>
-  <message name="Response">
-    <part name="parameters" element="tns:Response" />
-  </message>
-
-  <portType name="InitiatorPortType">
-    <operation name="Response">
-      <input name="Response" message="tns:Response" />
-    </operation>
-  </portType>
-
-  <portType name="ParticipantPortType">
-    <operation name="CompletionCommit"><!-- Scenario 1.1 -->
-      <input name="CompletionCommit" message="tns:CompletionCommit" />
-    </operation>
-    <operation name="CompletionRollback"><!-- Scenario 1.2 -->
-      <input name="CompletionRollback" message="tns:CompletionRollback" />
-    </operation>
-    <operation name="Commit"><!-- Scenario 2.1 -->
-      <input name="Commit" message="tns:Commit" />
-    </operation>
-    <operation name="Rollback"><!-- Scenario 2.2 -->
-      <input name="Rollback" message="tns:Rollback" />
-    </operation>
-    <operation name="Phase2Rollback"><!-- Scenario 3.1 -->
-      <input name="Phase2Rollback" message="tns:Phase2Rollback" />
-    </operation>
-    <operation name="Readonly"><!-- Scenario 3.2 -->
-      <input name="Readonly" message="tns:Readonly" />
-    </operation>
-    <operation name="VolatileAndDurable"><!-- Scenario 3.3 -->
-      <input name="VolatileAndDurable" message="tns:VolatileAndDurable" />
-    </operation>
-    <operation name="EarlyReadonly"><!-- Scenario 4.1 -->
-      <input name="EarlyReadonly" message="tns:EarlyReadonly" />
-    </operation>
-    <operation name="EarlyAborted"><!-- Scenario 4.2 -->
-      <input name="EarlyAborted" message="tns:EarlyAborted" />
-    </operation>
-    <operation name="ReplayCommit"><!-- Scenario 5.1 -->
-      <input name="ReplayCommit" message="tns:ReplayCommit" />
-    </operation>
-    <operation name="RetryPreparedCommit"><!-- Scenario 5.2 -->
-      <input name="RetryPreparedCommit" message="tns:RetryPreparedCommit" />
-    </operation>
-    <operation name="RetryPreparedAbort"><!-- Scenario 5.3 -->
-      <input name="RetryPreparedAbort" message="tns:RetryPreparedAbort" />
-    </operation>    
-    <operation name="RetryCommit"><!-- Scenario 5.4 -->
-      <input name="RetryCommit" message="tns:RetryCommit" />
-    </operation>
-    <operation name="PreparedAfterTimeout"><!-- Scenario 5.5 -->
-      <input name="PreparedAfterTimeout" message="tns:PreparedAfterTimeout" />
-    </operation>
-    <operation name="LostCommitted"><!-- Scenario 5.6 -->
-      <input name="LostCommitted" message="tns:LostCommitted" />
-    </operation>
-  </portType>
-
-  <binding name="sc007InitiatorBinding" type="tns:InitiatorPortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="Response">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/Response"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-  </binding>
-
-  <binding name="sc007ParticipantBinding" type="tns:ParticipantPortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="CompletionCommit">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/CompletionCommit"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="CompletionRollback">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/CompletionRollback"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="Commit">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/Commit"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="Rollback">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/Rollback"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="Phase2Rollback">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/Phase2Rollback"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="Readonly">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/Readonly"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="VolatileAndDurable">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/VolatileAndDurable"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="EarlyReadonly">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/EarlyReadonly"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="EarlyAborted">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/EarlyAborted"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="ReplayCommit">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/ReplayCommit"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="RetryPreparedCommit">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/RetryPreparedCommit"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="RetryPreparedAbort">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/RetryPreparedAbort"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="RetryCommit">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/RetryCommit"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="PreparedAfterTimeout">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/PreparedAfterTimeout"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-    <operation name="LostCommitted">
-      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/LostCommitted"/>
-      <input> <soap:body use="literal"/> </input>
-    </operation>
-  </binding>
-
-  <service name="sc007Service">
-    <port name="sc007InitiatorPort" binding="tns:sc007InitiatorBinding">
-      <soap:address location="http://www.wstf.org/sc007/sc007"/>
-    </port>
-    <port name="sc007ParticipantPort" binding="tns:sc007ParticipantBinding">
-      <soap:address location="http://www.wstf.org/sc007/sc007"/>
-    </port>
-  </service>
-
-</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/sc007.wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/sc007.wsdl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/sc007.wsdl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/dd/sc007/wsdl/sc007.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file (sc007.wsdl) belongs to the WSTF
+ and resides at http://www.wstf.org/docs/scenarios/sc007/sc007.wsdl .     
+-->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+  xmlns:s="http://www.w3.org/2001/XMLSchema" 
+  xmlns:tns="http://www.wstf.org/sc007" 
+  targetNamespace="http://www.wstf.org/sc007">
+  <types>
+    <s:schema elementFormDefault="qualified" 
+      targetNamespace="http://www.wstf.org/sc007">
+      <s:complexType name="TestMessageType">
+        <s:sequence />
+      </s:complexType>
+      <s:element name="Response" type="tns:TestMessageType" />
+      <s:element name="CompletionCommit" type="s:string" />
+      <s:element name="CompletionRollback" type="s:string" />
+      <s:element name="Commit" type="tns:TestMessageType" />
+      <s:element name="Rollback" type="tns:TestMessageType" />
+      <s:element name="Phase2Rollback" type="tns:TestMessageType" />
+      <s:element name="Readonly" type="tns:TestMessageType" />
+      <s:element name="VolatileAndDurable" type="tns:TestMessageType" />
+      <s:element name="EarlyReadonly" type="tns:TestMessageType" />
+      <s:element name="EarlyAborted" type="tns:TestMessageType" />
+      <s:element name="ReplayCommit" type="tns:TestMessageType" />
+      <s:element name="RetryPreparedCommit" type="tns:TestMessageType" />
+      <s:element name="RetryPreparedAbort" type="tns:TestMessageType" />
+      <s:element name="RetryCommit" type="tns:TestMessageType" />
+      <s:element name="PreparedAfterTimeout" type="tns:TestMessageType" />
+      <s:element name="LostCommitted" type="tns:TestMessageType" />       
+    </s:schema>
+  </types>
+  <message name="CompletionCommit">
+    <part name="parameters" element="tns:CompletionCommit" />
+  </message>
+  <message name="CompletionRollback">
+    <part name="parameters" element="tns:CompletionRollback" />
+  </message>
+  <message name="Commit">
+    <part name="parameters" element="tns:Commit" />
+  </message>
+  <message name="Rollback">
+    <part name="parameters" element="tns:Rollback" />
+  </message>
+  <message name="Phase2Rollback">
+    <part name="parameters" element="tns:Phase2Rollback" />
+  </message>
+  <message name="Readonly">
+    <part name="parameters" element="tns:Readonly" />
+  </message>
+  <message name="VolatileAndDurable">
+    <part name="parameters" element="tns:VolatileAndDurable" />
+  </message>
+  <message name="EarlyReadonly">
+    <part name="parameters" element="tns:EarlyReadonly" />
+  </message>
+  <message name="EarlyAborted">
+    <part name="parameters" element="tns:EarlyAborted" />
+  </message>
+  <message name="ReplayCommit">
+    <part name="parameters" element="tns:ReplayCommit" />
+  </message>
+  <message name="RetryPreparedCommit">
+    <part name="parameters" element="tns:RetryPreparedCommit" />
+  </message>
+  <message name="RetryPreparedAbort">
+    <part name="parameters" element="tns:RetryPreparedAbort" />
+  </message>
+  <message name="RetryCommit">
+    <part name="parameters" element="tns:RetryCommit" />
+  </message>
+  <message name="PreparedAfterTimeout">
+    <part name="parameters" element="tns:PreparedAfterTimeout" />
+  </message>
+  <message name="LostCommitted">
+    <part name="parameters" element="tns:LostCommitted" />
+  </message>
+  <message name="Response">
+    <part name="parameters" element="tns:Response" />
+  </message>
+
+  <portType name="InitiatorPortType">
+    <operation name="Response">
+      <input name="Response" message="tns:Response" />
+    </operation>
+  </portType>
+
+  <portType name="ParticipantPortType">
+    <operation name="CompletionCommit"><!-- Scenario 1.1 -->
+      <input name="CompletionCommit" message="tns:CompletionCommit" />
+    </operation>
+    <operation name="CompletionRollback"><!-- Scenario 1.2 -->
+      <input name="CompletionRollback" message="tns:CompletionRollback" />
+    </operation>
+    <operation name="Commit"><!-- Scenario 2.1 -->
+      <input name="Commit" message="tns:Commit" />
+    </operation>
+    <operation name="Rollback"><!-- Scenario 2.2 -->
+      <input name="Rollback" message="tns:Rollback" />
+    </operation>
+    <operation name="Phase2Rollback"><!-- Scenario 3.1 -->
+      <input name="Phase2Rollback" message="tns:Phase2Rollback" />
+    </operation>
+    <operation name="Readonly"><!-- Scenario 3.2 -->
+      <input name="Readonly" message="tns:Readonly" />
+    </operation>
+    <operation name="VolatileAndDurable"><!-- Scenario 3.3 -->
+      <input name="VolatileAndDurable" message="tns:VolatileAndDurable" />
+    </operation>
+    <operation name="EarlyReadonly"><!-- Scenario 4.1 -->
+      <input name="EarlyReadonly" message="tns:EarlyReadonly" />
+    </operation>
+    <operation name="EarlyAborted"><!-- Scenario 4.2 -->
+      <input name="EarlyAborted" message="tns:EarlyAborted" />
+    </operation>
+    <operation name="ReplayCommit"><!-- Scenario 5.1 -->
+      <input name="ReplayCommit" message="tns:ReplayCommit" />
+    </operation>
+    <operation name="RetryPreparedCommit"><!-- Scenario 5.2 -->
+      <input name="RetryPreparedCommit" message="tns:RetryPreparedCommit" />
+    </operation>
+    <operation name="RetryPreparedAbort"><!-- Scenario 5.3 -->
+      <input name="RetryPreparedAbort" message="tns:RetryPreparedAbort" />
+    </operation>    
+    <operation name="RetryCommit"><!-- Scenario 5.4 -->
+      <input name="RetryCommit" message="tns:RetryCommit" />
+    </operation>
+    <operation name="PreparedAfterTimeout"><!-- Scenario 5.5 -->
+      <input name="PreparedAfterTimeout" message="tns:PreparedAfterTimeout" />
+    </operation>
+    <operation name="LostCommitted"><!-- Scenario 5.6 -->
+      <input name="LostCommitted" message="tns:LostCommitted" />
+    </operation>
+  </portType>
+
+  <binding name="sc007InitiatorBinding" type="tns:InitiatorPortType">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="Response">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/Response"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+  </binding>
+
+  <binding name="sc007ParticipantBinding" type="tns:ParticipantPortType">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="CompletionCommit">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/CompletionCommit"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="CompletionRollback">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/CompletionRollback"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="Commit">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/Commit"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="Rollback">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/Rollback"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="Phase2Rollback">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/Phase2Rollback"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="Readonly">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/Readonly"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="VolatileAndDurable">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/VolatileAndDurable"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="EarlyReadonly">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/EarlyReadonly"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="EarlyAborted">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/EarlyAborted"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="ReplayCommit">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/ReplayCommit"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="RetryPreparedCommit">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/RetryPreparedCommit"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="RetryPreparedAbort">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/RetryPreparedAbort"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="RetryCommit">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/RetryCommit"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="PreparedAfterTimeout">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/PreparedAfterTimeout"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+    <operation name="LostCommitted">
+      <soap:operation soapAction="http://www.wstf.org/docs/scenarios/sc007/LostCommitted"/>
+      <input> <soap:body use="literal"/> </input>
+    </operation>
+  </binding>
+
+  <service name="sc007Service">
+    <port name="sc007InitiatorPort" binding="tns:sc007InitiatorBinding">
+      <soap:address location="http://www.wstf.org/sc007/sc007"/>
+    </port>
+    <port name="sc007ParticipantPort" binding="tns:sc007ParticipantBinding">
+      <soap:address location="http://www.wstf.org/sc007/sc007"/>
+    </port>
+  </service>
+
+</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/lib)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/commons-logging.jar
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/commons-logging.jar (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/lib/commons-logging.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/jaxrpc.jar
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/jaxrpc.jar (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/lib/jaxrpc.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/junit.jar
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/junit.jar (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/lib/junit.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/saaj-api.jar
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/saaj-api.jar (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/lib/saaj-api.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/saxon.jar
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/lib/saxon.jar (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/lib/saxon.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestCase.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestCase.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,162 +0,0 @@
-package com.jboss.transaction.wstf.interop;
-
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-
-import com.jboss.transaction.wstf.proxy.ProxyConversation;
-
-/**
- * Base class for interop tests.
- * @author kevin
- */
-public class InteropTestCase extends TestCase
-{
-    /**
-     * The log message prefix start.
-     */
-    private static final String LOG_MESSAGE_PREFIX_START = "<log:message testcase=\"" ;
-    /**
-     * The log message prefix centre.
-     */
-    private static final String LOG_MESSAGE_PREFIX_CENTRE = "\" message=\"" ;
-    /**
-     * The log message prefix end.
-     */
-    private static final String LOG_MESSAGE_PREFIX_END = "\"><log:content>" ;
-    /**
-     * The log message suffix.
-     */
-    private static final String LOG_MESSAGE_SUFFIX = "</log:content></log:message>" ;
-    
-    /**
-     * The URI of the participant.
-     */
-    private String participantURI ;
-    
-    /**
-     * The conversation id for the test.
-     */
-    private String conversationId ;
-    
-    /**
-     * The test timeout value.
-     */
-    private long testTimeout ;
-    /**
-     * The asynchronous test flag.
-     */
-    private boolean asyncTest ;
-    
-    /**
-     * Set the participant URI.
-     * @param participantURI The participant URI.
-     */
-    public void setParticipantURI(final String participantURI)
-    {
-        this.participantURI = participantURI ;
-    }
-    
-    /**
-     * Get the participant URI.
-     * @return The participant URI.
-     */
-    protected String getParticipantURI()
-    {
-        return participantURI ;
-    }
-    
-    /**
-     * Set the test timeout value.
-     * testTimeout The test timeout value.
-     */
-    public void setTestTimeout(final long testTimeout)
-    {
-        this.testTimeout = testTimeout ;
-    }
-    
-    /**
-     * Get the asynchronous test flag.
-     * @return The asynchronous test flag.
-     */
-    protected boolean getAsyncTest()
-    {
-        return asyncTest ;
-    }
-    
-    /**
-     * Set the asynchronous test flag.
-     * asyncTest The asynchronous test flag.
-     */
-    public void setAsyncTest(final boolean asyncTest)
-    {
-        this.asyncTest = asyncTest ;
-    }
-    
-    /**
-     * Get the test timeout value.
-     * @return The test timeout value.
-     */
-    protected long getTestTimeout()
-    {
-        return testTimeout ;
-    }
-    
-    /**
-     * Get the conversation id.
-     * @return The conversation id.
-     */
-    protected String getConversationId()
-    {
-        return conversationId ;
-    }
-    
-    /**
-     * Wraps the run method to include logging of message interactions.
-     * @param result The test result. 
-     */
-    public void run(final TestResult result)
-    {
-        // get a conversation id, start the log, clear it on finish.
-        conversationId = ProxyConversation.createConversation() ;
-        try
-        {
-            super.run(result) ;
-        }
-        finally
-        {
-            final String[] messages = ProxyConversation.removeConversation(conversationId) ;
-            conversationId = null ;
-            if (messages != null)
-            {
-                final int numMessages = messages.length ;
-                final StringBuffer buffer = new StringBuffer() ;
-                int count = 0 ;
-                while(count < numMessages)
-                {
-                    final String message = messages[count] ;
-                    count++ ;
-                    if (message != null)
-                    {
-                        buffer.append(LOG_MESSAGE_PREFIX_START) ;
-                        buffer.append(getName()) ;
-                        buffer.append(LOG_MESSAGE_PREFIX_CENTRE) ;
-                        buffer.append(count) ;
-                        buffer.append(LOG_MESSAGE_PREFIX_END) ;
-                        buffer.append(message) ;
-                        buffer.append(LOG_MESSAGE_SUFFIX) ;
-                    }
-                }
-                MessageLogging.appendThreadLog(buffer.toString()) ;
-            }
-        }
-    }
-    
-    /**
-     * Return the string represenation of this test.
-     * @return the string representation.
-     */
-    public String toString()
-    {
-        return getName() ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestCase.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestCase.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestCase.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestCase.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,182 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.interop;
+
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+
+import com.jboss.transaction.wstf.proxy.ProxyConversation;
+
+/**
+ * Base class for interop tests.
+ * @author kevin
+ */
+public class InteropTestCase extends TestCase
+{
+    /**
+     * The log message prefix start.
+     */
+    private static final String LOG_MESSAGE_PREFIX_START = "<log:message testcase=\"" ;
+    /**
+     * The log message prefix centre.
+     */
+    private static final String LOG_MESSAGE_PREFIX_CENTRE = "\" message=\"" ;
+    /**
+     * The log message prefix end.
+     */
+    private static final String LOG_MESSAGE_PREFIX_END = "\"><log:content>" ;
+    /**
+     * The log message suffix.
+     */
+    private static final String LOG_MESSAGE_SUFFIX = "</log:content></log:message>" ;
+    
+    /**
+     * The URI of the participant.
+     */
+    private String participantURI ;
+    
+    /**
+     * The conversation id for the test.
+     */
+    private String conversationId ;
+    
+    /**
+     * The test timeout value.
+     */
+    private long testTimeout ;
+    /**
+     * The asynchronous test flag.
+     */
+    private boolean asyncTest ;
+    
+    /**
+     * Set the participant URI.
+     * @param participantURI The participant URI.
+     */
+    public void setParticipantURI(final String participantURI)
+    {
+        this.participantURI = participantURI ;
+    }
+    
+    /**
+     * Get the participant URI.
+     * @return The participant URI.
+     */
+    protected String getParticipantURI()
+    {
+        return participantURI ;
+    }
+    
+    /**
+     * Set the test timeout value.
+     * testTimeout The test timeout value.
+     */
+    public void setTestTimeout(final long testTimeout)
+    {
+        this.testTimeout = testTimeout ;
+    }
+    
+    /**
+     * Get the asynchronous test flag.
+     * @return The asynchronous test flag.
+     */
+    protected boolean getAsyncTest()
+    {
+        return asyncTest ;
+    }
+    
+    /**
+     * Set the asynchronous test flag.
+     * asyncTest The asynchronous test flag.
+     */
+    public void setAsyncTest(final boolean asyncTest)
+    {
+        this.asyncTest = asyncTest ;
+    }
+    
+    /**
+     * Get the test timeout value.
+     * @return The test timeout value.
+     */
+    protected long getTestTimeout()
+    {
+        return testTimeout ;
+    }
+    
+    /**
+     * Get the conversation id.
+     * @return The conversation id.
+     */
+    protected String getConversationId()
+    {
+        return conversationId ;
+    }
+    
+    /**
+     * Wraps the run method to include logging of message interactions.
+     * @param result The test result. 
+     */
+    public void run(final TestResult result)
+    {
+        // get a conversation id, start the log, clear it on finish.
+        conversationId = ProxyConversation.createConversation() ;
+        try
+        {
+            super.run(result) ;
+        }
+        finally
+        {
+            final String[] messages = ProxyConversation.removeConversation(conversationId) ;
+            conversationId = null ;
+            if (messages != null)
+            {
+                final int numMessages = messages.length ;
+                final StringBuffer buffer = new StringBuffer() ;
+                int count = 0 ;
+                while(count < numMessages)
+                {
+                    final String message = messages[count] ;
+                    count++ ;
+                    if (message != null)
+                    {
+                        buffer.append(LOG_MESSAGE_PREFIX_START) ;
+                        buffer.append(getName()) ;
+                        buffer.append(LOG_MESSAGE_PREFIX_CENTRE) ;
+                        buffer.append(count) ;
+                        buffer.append(LOG_MESSAGE_PREFIX_END) ;
+                        buffer.append(message) ;
+                        buffer.append(LOG_MESSAGE_SUFFIX) ;
+                    }
+                }
+                MessageLogging.appendThreadLog(buffer.toString()) ;
+            }
+        }
+    }
+    
+    /**
+     * Return the string represenation of this test.
+     * @return the string representation.
+     */
+    public String toString()
+    {
+        return getName() ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestSuite.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestSuite.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestSuite.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,111 +0,0 @@
-package com.jboss.transaction.wstf.interop;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Interop testsuite to initialise the participant uri on addition.
- * @author kevin
- */
-public class InteropTestSuite extends TestSuite
-{
-    /**
-     * The participant URI for this test.
-     */
-    private final String participantURI ;
-    /**
-     * The test timeout.
-     */
-    private final long testTimeout ;
-    /**
-     * The asynchronous test flag.
-     */
-    private final boolean asyncTest ;
-    
-    /**
-     * Construct an empty test suite with the specified participant URI.
-     * @param testTimeout The test timeout.
-     * @param participantURI The participant URI.
-     */
-    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest)
-    {
-        super() ;
-        this.participantURI = participantURI ;
-        this.testTimeout = testTimeout ;
-        this.asyncTest = asyncTest ;
-    }
-    
-    /**
-     * Construct an empty test suite with the specified participant URI and name.
-     * @param participantURI The participant URI.
-     * @param testTimeout The test timeout.
-     * @param name The name of the test suite.
-     */
-    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final String name)
-    {
-        super(name) ;
-        this.participantURI = participantURI ;
-        this.testTimeout = testTimeout ;
-        this.asyncTest = asyncTest ;
-    }
-
-    /**
-     * Constructs a TestSuite from the given class using the specified participant URI.
-     * @param participantURI The participant URI.
-     * @param testTimeout The test timeout.
-     * @param clazz The class containing the tests.
-     */
-    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final Class clazz)
-    {
-        super(clazz) ;
-        this.participantURI = participantURI ;
-        this.testTimeout = testTimeout ;
-        this.asyncTest = asyncTest ;
-        final int numTests = countTestCases() ;
-        for(int count = 0 ; count < numTests ; count++)
-        {
-            initialiseTest(testAt(count)) ;
-        }
-    }
-    
-    /**
-     * Constructs a TestSuite from the given class using the specified participant URI and name.
-     * @param participantURI The participant URI.
-     * @param testTimeout The test timeout.
-     * @param clazz The class containing the tests.
-     * @param name The name of the test suite.
-     */
-    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final Class clazz, final String name)
-    {
-        super(clazz, name) ;
-        this.participantURI = participantURI ;
-        this.testTimeout = testTimeout ;
-        this.asyncTest = asyncTest ;
-    }
-
-    /**
-     * Add a test to the test suite.
-     * @param test The test to add.
-     */
-    public void addTest(final Test test)
-    {
-        initialiseTest(test) ;
-        super.addTest(test) ;
-    }
-    
-    /**
-     * Perform initialisation on the test.
-     * @param test The test to initialise.
-     */
-    private void initialiseTest(final Test test)
-    {
-        if (test instanceof InteropTestCase)
-        {
-            final InteropTestCase interopTestCase = (InteropTestCase)test ;
-            interopTestCase.setParticipantURI(participantURI) ;
-            interopTestCase.setTestTimeout(testTimeout) ;
-            interopTestCase.setAsyncTest(asyncTest) ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestSuite.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestSuite.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestSuite.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/InteropTestSuite.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,131 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.interop;
+
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Interop testsuite to initialise the participant uri on addition.
+ * @author kevin
+ */
+public class InteropTestSuite extends TestSuite
+{
+    /**
+     * The participant URI for this test.
+     */
+    private final String participantURI ;
+    /**
+     * The test timeout.
+     */
+    private final long testTimeout ;
+    /**
+     * The asynchronous test flag.
+     */
+    private final boolean asyncTest ;
+    
+    /**
+     * Construct an empty test suite with the specified participant URI.
+     * @param testTimeout The test timeout.
+     * @param participantURI The participant URI.
+     */
+    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest)
+    {
+        super() ;
+        this.participantURI = participantURI ;
+        this.testTimeout = testTimeout ;
+        this.asyncTest = asyncTest ;
+    }
+    
+    /**
+     * Construct an empty test suite with the specified participant URI and name.
+     * @param participantURI The participant URI.
+     * @param testTimeout The test timeout.
+     * @param name The name of the test suite.
+     */
+    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final String name)
+    {
+        super(name) ;
+        this.participantURI = participantURI ;
+        this.testTimeout = testTimeout ;
+        this.asyncTest = asyncTest ;
+    }
+
+    /**
+     * Constructs a TestSuite from the given class using the specified participant URI.
+     * @param participantURI The participant URI.
+     * @param testTimeout The test timeout.
+     * @param clazz The class containing the tests.
+     */
+    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final Class clazz)
+    {
+        super(clazz) ;
+        this.participantURI = participantURI ;
+        this.testTimeout = testTimeout ;
+        this.asyncTest = asyncTest ;
+        final int numTests = countTestCases() ;
+        for(int count = 0 ; count < numTests ; count++)
+        {
+            initialiseTest(testAt(count)) ;
+        }
+    }
+    
+    /**
+     * Constructs a TestSuite from the given class using the specified participant URI and name.
+     * @param participantURI The participant URI.
+     * @param testTimeout The test timeout.
+     * @param clazz The class containing the tests.
+     * @param name The name of the test suite.
+     */
+    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final Class clazz, final String name)
+    {
+        super(clazz, name) ;
+        this.participantURI = participantURI ;
+        this.testTimeout = testTimeout ;
+        this.asyncTest = asyncTest ;
+    }
+
+    /**
+     * Add a test to the test suite.
+     * @param test The test to add.
+     */
+    public void addTest(final Test test)
+    {
+        initialiseTest(test) ;
+        super.addTest(test) ;
+    }
+    
+    /**
+     * Perform initialisation on the test.
+     * @param test The test to initialise.
+     */
+    private void initialiseTest(final Test test)
+    {
+        if (test instanceof InteropTestCase)
+        {
+            final InteropTestCase interopTestCase = (InteropTestCase)test ;
+            interopTestCase.setParticipantURI(participantURI) ;
+            interopTestCase.setTestTimeout(testTimeout) ;
+            interopTestCase.setAsyncTest(asyncTest) ;
+        }
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/MessageLogging.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/MessageLogging.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/MessageLogging.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,51 +0,0 @@
-package com.jboss.transaction.wstf.interop;
-
-/**
- * Class providing test message logging.
- * @author kevin
- */
-public class MessageLogging
-{
-    /**
-     * The thread local message log.
-     */
-    private static final ThreadLocal MESSAGE_LOG = new ThreadLocal() ;
-    
-    /**
-     * Clear the log for the current thread.
-     */
-    public static void clearThreadLog()
-    {
-        MESSAGE_LOG.set(null) ;
-    }
-    
-    /**
-     * Get the thread log.
-     * @return The thread log.
-     */
-    public static String getThreadLog()
-    {
-        final Object value = MESSAGE_LOG.get() ;
-        return (value == null ? "" : value.toString()) ;
-    }
-    
-    /**
-     * Append a message to the thread log.
-     * @param message The thread message to append.
-     */
-    public static void appendThreadLog(final String message)
-    {
-        final Object value = MESSAGE_LOG.get() ;
-        final StringBuffer buffer ;
-        if (value == null)
-        {
-            buffer = new StringBuffer(message) ;
-            MESSAGE_LOG.set(buffer) ;
-        }
-        else
-        {
-            buffer = (StringBuffer)value ;
-            buffer.append(message) ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/MessageLogging.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/MessageLogging.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/MessageLogging.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/MessageLogging.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.interop;
+
+/**
+ * Class providing test message logging.
+ * @author kevin
+ */
+public class MessageLogging
+{
+    /**
+     * The thread local message log.
+     */
+    private static final ThreadLocal MESSAGE_LOG = new ThreadLocal() ;
+    
+    /**
+     * Clear the log for the current thread.
+     */
+    public static void clearThreadLog()
+    {
+        MESSAGE_LOG.set(null) ;
+    }
+    
+    /**
+     * Get the thread log.
+     * @return The thread log.
+     */
+    public static String getThreadLog()
+    {
+        final Object value = MESSAGE_LOG.get() ;
+        return (value == null ? "" : value.toString()) ;
+    }
+    
+    /**
+     * Append a message to the thread log.
+     * @param message The thread message to append.
+     */
+    public static void appendThreadLog(final String message)
+    {
+        final Object value = MESSAGE_LOG.get() ;
+        final StringBuffer buffer ;
+        if (value == null)
+        {
+            buffer = new StringBuffer(message) ;
+            MESSAGE_LOG.set(buffer) ;
+        }
+        else
+        {
+            buffer = (StringBuffer)value ;
+            buffer.append(message) ;
+        }
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/Sc007TestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/Sc007TestCase.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/Sc007TestCase.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,519 +0,0 @@
-package com.jboss.transaction.wstf.interop;
-
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wscoor.CoordinationConstants;
-import com.arjuna.webservices11.ServiceRegistry;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wst.CompletionCoordinatorParticipant;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.TransactionRolledBackException;
-import com.jboss.transaction.wstf.interop.states.Sc007PreparedAfterTimeoutState;
-import com.jboss.transaction.wstf.interop.states.Sc007RetryPreparedAbortState;
-import com.jboss.transaction.wstf.interop.states.Sc007RetryPreparedCommitState;
-import com.jboss.transaction.wstf.interop.states.InteropWaitState;
-import com.jboss.transaction.wstf.proxy.ProxyConversation;
-import com.jboss.transaction.wstf.proxy.ProxyURIRewriting;
-import com.jboss.transaction.wstf.webservices.sc007.InteropUtil;
-import com.jboss.transaction.wstf.webservices.sc007.ParticipantStub;
-import com.jboss.transaction.wstf.webservices.sc007.*;
-import com.jboss.transaction.wstf.webservices.sc007.SyncParticipantStub;
-
-/**
- * The AT endpoint test case
- * @author kevin
- */
-public class Sc007TestCase extends InteropTestCase
-{
-    /**
-     * The coordinator URI of the source.
-     */
-    private static final String SOURCE_COORDINATOR_URI ;
-    /**
-     * The service URI of the participant.
-     */
-    private static final String SOURCE_PARTICIPANT_URI ;
-    
-    /**
-     * Construct the named test case.
-     */
-    public Sc007TestCase()
-    {
-        // Default the service to the local service.
-        setParticipantURI(getSourceParticipantURI()) ;
-        setTestTimeout(120000) ;
-        setAsyncTest(true) ;
-    }
-
-    /**
-     * test1_1 - 1.1 CompletionCommit
-     * Participant creates and commits a transaction using the initiator's coordinator.
-     * @throws Exception on failure.
-     */
-    public void test1_1()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final String coordinatorURI = ProxyURIRewriting.rewriteURI(ProxyConversation.getAlternateConversationId(conversationId), getSourceCoordinatorURI()) ;
-            getParticipantStub().completionCommit(serviceURI, coordinatorURI) ;
-            state.waitForCompletion(getTestTimeout()) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test1_2 - 1.2 CompletionRollback
-     * Participant creates and rolls back a transaction using the initiator's coordinator.
-     * @throws Exception on failure.
-     */
-    public void test1_2()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final String coordinatorURI = ProxyURIRewriting.rewriteURI(ProxyConversation.getAlternateConversationId(conversationId), getSourceCoordinatorURI()) ;
-            getParticipantStub().completionRollback(serviceURI, coordinatorURI) ;
-            state.waitForCompletion(getTestTimeout()) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT2_1 - 2.1 Commit
-     * Participant registers for Durable2PC, initiator commits, transaction commits successfully.
-     * @throws Exception on failure.
-     */
-    public void test2_1()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().commit(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test2_2 - 2.2 Rollback
-     * Participant registers for Durable2PC, initiator rolls back.
-     * @throws Exception on failure.
-     */
-    public void test2_2()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().rollback(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.rollback() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_1 - 3.1 Phase2Rollback
-     * Coordinator aborts the transaction due to an Aborted vote during the prepare phase. 
-     * @throws Exception on failure.
-     */
-    public void test3_1()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED, 2) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().phase2Rollback(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            fail("Transaction rollback expected") ;
-        }
-        catch (final TransactionRolledBackException trbe)
-        {
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_2 - 3.2 Readonly
-     * Tests coordinator committing a transaction with a read only participant. 
-     * @throws Exception on failure.
-     */
-    public void test3_2()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().readonly(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_3 - 3.3 VolatileAndDurable
-     * Tests registration during the volatile prepare phase. 
-     * @throws Exception on failure.
-     */
-    public void test3_3()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().volatileAndDurable(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_4 - 3.4 EarlyReadonly
-     * Tests the case of a participant initiated ReadOnly message occurring prior to the prepare phase. 
-     * @throws Exception on failure.
-     */
-    public void test3_4()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().earlyReadonly(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_5 - 3.5 EarlyAborted
-     * Tests the case of a participant initiated Aborted message occurring prior to the prepare phase. 
-     * @throws Exception on failure.
-     */
-    public void test3_5()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED, 2) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().earlyAborted(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            fail("Transaction rollback expected") ;
-        }
-        catch (final TransactionRolledBackException trbe)
-        {
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_6 - 3.6 ReplayCommit
-     * Participant registers for Durable2PC, initator initiates commit, participant fails after prepared, recovers and resends prepared. Transaction commits normally.
-     * @throws Exception on failure.
-     */
-    public void test3_6()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().replayCommit(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_7 - 3.7 RetryPreparedCommit
-     * Tests recovery from a communication failure during the prepare phase. Transaction commits normally.
-     * @throws Exception on failure.
-     */
-    public void test3_7()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final Sc007RetryPreparedCommitState state = new Sc007RetryPreparedCommitState() ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().retryPreparedCommit(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_8 - 3.8 RetryPreparedAbort
-     * Tests recovery from a communication failure during the prepare phase. Transaction times out.
-     * @throws Exception on failure.
-     */
-    public void test3_8()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final Sc007RetryPreparedAbortState state = new Sc007RetryPreparedAbortState() ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().retryPreparedAbort(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            fail("Transaction rollback expected") ;
-        }
-        catch (final TransactionRolledBackException trbe)
-        {
-            state.waitForCompletion(getTestTimeout()) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_9 - 3.9 RetryCommit
-     * Tests recovery from a communication failure during the commit phase. Transaction commits normally.
-     * @throws Exception on failure.
-     */
-    public void test3_9()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().retryCommit(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_10 - 3.10 PreparedAfterTimeout
-     * Tests recovery from a communication failure during the prepare phase. Transaction times out. Two participants, volatile and durable.
-     * @throws Exception on failure.
-     */
-    public void test3_10()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final Sc007PreparedAfterTimeoutState state = new Sc007PreparedAfterTimeoutState() ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().preparedAfterTimeout(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            fail("Transaction rollback expected") ;
-        }
-        catch (final TransactionRolledBackException trbe)
-        {
-            state.waitForCompletion(getTestTimeout()) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * test3_11 - 3.11 LostCommitted
-     * Tests the effect of a lost Committed message.
-     * @throws Exception on failure.
-     */
-    public void test3_11()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().lostCommitted(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-    
-    /**
-     * Get the source coordinator URI.
-     * @return The source coordinator uri.
-     */
-    protected static String getSourceCoordinatorURI()
-    {
-        return SOURCE_COORDINATOR_URI ;
-    }
-    
-    /**
-     * Get the source participant URI.
-     * @return The source participant uri.
-     */
-    protected static String getSourceParticipantURI()
-    {
-        return SOURCE_PARTICIPANT_URI ;
-    }
-    
-    /**
-     * Get the participant stub for the test.
-     * @return The participant stub.
-     */
-    private ParticipantStub getParticipantStub()
-    {
-        return (getAsyncTest() ? AsyncParticipantStub.getParticipantStub() : SyncParticipantStub.getParticipantStub()) ;
-    }
-    
-    static
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        SOURCE_PARTICIPANT_URI = serviceRegistry.getServiceURI(InteropConstants.SERVICE_PARTICIPANT) ;
-        SOURCE_COORDINATOR_URI = serviceRegistry.getServiceURI(CoordinationConstants.ACTIVATION_SERVICE_NAME) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/Sc007TestCase.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/Sc007TestCase.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/Sc007TestCase.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/Sc007TestCase.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,539 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.interop;
+
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices11.wscoor.CoordinationConstants;
+import com.arjuna.webservices11.ServiceRegistry;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wst.CompletionCoordinatorParticipant;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.TransactionRolledBackException;
+import com.jboss.transaction.wstf.interop.states.Sc007PreparedAfterTimeoutState;
+import com.jboss.transaction.wstf.interop.states.Sc007RetryPreparedAbortState;
+import com.jboss.transaction.wstf.interop.states.Sc007RetryPreparedCommitState;
+import com.jboss.transaction.wstf.interop.states.InteropWaitState;
+import com.jboss.transaction.wstf.proxy.ProxyConversation;
+import com.jboss.transaction.wstf.proxy.ProxyURIRewriting;
+import com.jboss.transaction.wstf.webservices.sc007.InteropUtil;
+import com.jboss.transaction.wstf.webservices.sc007.ParticipantStub;
+import com.jboss.transaction.wstf.webservices.sc007.*;
+import com.jboss.transaction.wstf.webservices.sc007.SyncParticipantStub;
+
+/**
+ * The AT endpoint test case
+ * @author kevin
+ */
+public class Sc007TestCase extends InteropTestCase
+{
+    /**
+     * The coordinator URI of the source.
+     */
+    private static final String SOURCE_COORDINATOR_URI ;
+    /**
+     * The service URI of the participant.
+     */
+    private static final String SOURCE_PARTICIPANT_URI ;
+    
+    /**
+     * Construct the named test case.
+     */
+    public Sc007TestCase()
+    {
+        // Default the service to the local service.
+        setParticipantURI(getSourceParticipantURI()) ;
+        setTestTimeout(120000) ;
+        setAsyncTest(true) ;
+    }
+
+    /**
+     * test1_1 - 1.1 CompletionCommit
+     * Participant creates and commits a transaction using the initiator's coordinator.
+     * @throws Exception on failure.
+     */
+    public void test1_1()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final String coordinatorURI = ProxyURIRewriting.rewriteURI(ProxyConversation.getAlternateConversationId(conversationId), getSourceCoordinatorURI()) ;
+            getParticipantStub().completionCommit(serviceURI, coordinatorURI) ;
+            state.waitForCompletion(getTestTimeout()) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test1_2 - 1.2 CompletionRollback
+     * Participant creates and rolls back a transaction using the initiator's coordinator.
+     * @throws Exception on failure.
+     */
+    public void test1_2()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final String coordinatorURI = ProxyURIRewriting.rewriteURI(ProxyConversation.getAlternateConversationId(conversationId), getSourceCoordinatorURI()) ;
+            getParticipantStub().completionRollback(serviceURI, coordinatorURI) ;
+            state.waitForCompletion(getTestTimeout()) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT2_1 - 2.1 Commit
+     * Participant registers for Durable2PC, initiator commits, transaction commits successfully.
+     * @throws Exception on failure.
+     */
+    public void test2_1()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().commit(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test2_2 - 2.2 Rollback
+     * Participant registers for Durable2PC, initiator rolls back.
+     * @throws Exception on failure.
+     */
+    public void test2_2()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().rollback(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.rollback() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_1 - 3.1 Phase2Rollback
+     * Coordinator aborts the transaction due to an Aborted vote during the prepare phase. 
+     * @throws Exception on failure.
+     */
+    public void test3_1()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED, 2) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().phase2Rollback(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            fail("Transaction rollback expected") ;
+        }
+        catch (final TransactionRolledBackException trbe)
+        {
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_2 - 3.2 Readonly
+     * Tests coordinator committing a transaction with a read only participant. 
+     * @throws Exception on failure.
+     */
+    public void test3_2()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().readonly(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_3 - 3.3 VolatileAndDurable
+     * Tests registration during the volatile prepare phase. 
+     * @throws Exception on failure.
+     */
+    public void test3_3()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().volatileAndDurable(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_4 - 3.4 EarlyReadonly
+     * Tests the case of a participant initiated ReadOnly message occurring prior to the prepare phase. 
+     * @throws Exception on failure.
+     */
+    public void test3_4()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().earlyReadonly(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_5 - 3.5 EarlyAborted
+     * Tests the case of a participant initiated Aborted message occurring prior to the prepare phase. 
+     * @throws Exception on failure.
+     */
+    public void test3_5()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED, 2) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().earlyAborted(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            fail("Transaction rollback expected") ;
+        }
+        catch (final TransactionRolledBackException trbe)
+        {
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_6 - 3.6 ReplayCommit
+     * Participant registers for Durable2PC, initator initiates commit, participant fails after prepared, recovers and resends prepared. Transaction commits normally.
+     * @throws Exception on failure.
+     */
+    public void test3_6()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().replayCommit(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_7 - 3.7 RetryPreparedCommit
+     * Tests recovery from a communication failure during the prepare phase. Transaction commits normally.
+     * @throws Exception on failure.
+     */
+    public void test3_7()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final Sc007RetryPreparedCommitState state = new Sc007RetryPreparedCommitState() ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().retryPreparedCommit(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_8 - 3.8 RetryPreparedAbort
+     * Tests recovery from a communication failure during the prepare phase. Transaction times out.
+     * @throws Exception on failure.
+     */
+    public void test3_8()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final Sc007RetryPreparedAbortState state = new Sc007RetryPreparedAbortState() ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().retryPreparedAbort(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            fail("Transaction rollback expected") ;
+        }
+        catch (final TransactionRolledBackException trbe)
+        {
+            state.waitForCompletion(getTestTimeout()) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_9 - 3.9 RetryCommit
+     * Tests recovery from a communication failure during the commit phase. Transaction commits normally.
+     * @throws Exception on failure.
+     */
+    public void test3_9()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().retryCommit(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_10 - 3.10 PreparedAfterTimeout
+     * Tests recovery from a communication failure during the prepare phase. Transaction times out. Two participants, volatile and durable.
+     * @throws Exception on failure.
+     */
+    public void test3_10()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final Sc007PreparedAfterTimeoutState state = new Sc007PreparedAfterTimeoutState() ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().preparedAfterTimeout(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            fail("Transaction rollback expected") ;
+        }
+        catch (final TransactionRolledBackException trbe)
+        {
+            state.waitForCompletion(getTestTimeout()) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * test3_11 - 3.11 LostCommitted
+     * Tests the effect of a lost Committed message.
+     * @throws Exception on failure.
+     */
+    public void test3_11()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().lostCommitted(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+    
+    /**
+     * Get the source coordinator URI.
+     * @return The source coordinator uri.
+     */
+    protected static String getSourceCoordinatorURI()
+    {
+        return SOURCE_COORDINATOR_URI ;
+    }
+    
+    /**
+     * Get the source participant URI.
+     * @return The source participant uri.
+     */
+    protected static String getSourceParticipantURI()
+    {
+        return SOURCE_PARTICIPANT_URI ;
+    }
+    
+    /**
+     * Get the participant stub for the test.
+     * @return The participant stub.
+     */
+    private ParticipantStub getParticipantStub()
+    {
+        return (getAsyncTest() ? AsyncParticipantStub.getParticipantStub() : SyncParticipantStub.getParticipantStub()) ;
+    }
+    
+    static
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        SOURCE_PARTICIPANT_URI = serviceRegistry.getServiceURI(InteropConstants.SERVICE_PARTICIPANT) ;
+        SOURCE_COORDINATOR_URI = serviceRegistry.getServiceURI(CoordinationConstants.ACTIVATION_SERVICE_NAME) ;
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/BaseState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/BaseState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/BaseState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,97 +0,0 @@
-package com.jboss.transaction.wstf.interop.states;
-
-import org.xml.sax.ContentHandler;
-
-import com.jboss.transaction.wstf.proxy.ProxyConversationState;
-
-/**
- * The base state class for proxy conversations.
- */
-abstract class BaseState implements ProxyConversationState
-{
-    /**
-     * The complete flag.
-     */
-    private boolean complete ;
-    /**
-     * The success flag.
-     */
-    private boolean success ;
-    
-    /**
-     * Mark the conversation as successfully completed.
-     */
-    protected synchronized void success()
-    {
-        if (!complete)
-        {
-            System.out.println("KEV: success!") ;
-            complete = true ;
-            success = true ;
-            notifyAll() ;
-        }
-        else
-        {
-            System.out.println("KEV: AAAAAARRRRRRRGGGGGGGHHHHHHHHH, multiple successes called for conversation!") ;
-        }
-    }
-    
-    /**
-     * Wait a specified period for the conversation to complete.
-     * @param timeout The timeout period of the conversation.
-     */
-    public synchronized void waitForCompletion(final long timeout)
-    {
-        if (!complete && (timeout > 0))
-        {
-            final long end = System.currentTimeMillis() + timeout ;
-            do
-            {
-                final long delay = end - System.currentTimeMillis() ;
-                if (delay > 0)
-                {
-                    try
-                    {
-                        wait(delay) ;
-                    }
-                    catch (final InterruptedException ie) {} // ignore
-                }
-                else
-                {
-                    break ;
-                }
-            }
-            while(!complete) ;
-        }
-        
-        complete = true ;
-    }
-    
-    /**
-     * Has the conversation complete?
-     * @return true if the conversation has complete, false otherwise.
-     */
-    public synchronized boolean isComplete()
-    {
-        return complete ;
-    }
-    
-    /**
-     * Was the conversation successful?
-     * @return true if the conversation was successful, false otherwise.
-     */
-    public synchronized boolean isSuccessful()
-    {
-        return success ;
-    }
-
-    /**
-     * Get the Handler for rewriting the XML.
-     * @param nextHandler The next handler in the sequence.
-     * @return The handler or null if no rewriting required.
-     */
-    public ContentHandler getHandler(final ContentHandler nextHandler)
-    {
-	return null ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/BaseState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/BaseState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/BaseState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/BaseState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.interop.states;
+
+import org.xml.sax.ContentHandler;
+
+import com.jboss.transaction.wstf.proxy.ProxyConversationState;
+
+/**
+ * The base state class for proxy conversations.
+ */
+abstract class BaseState implements ProxyConversationState
+{
+    /**
+     * The complete flag.
+     */
+    private boolean complete ;
+    /**
+     * The success flag.
+     */
+    private boolean success ;
+    
+    /**
+     * Mark the conversation as successfully completed.
+     */
+    protected synchronized void success()
+    {
+        if (!complete)
+        {
+            System.out.println("KEV: success!") ;
+            complete = true ;
+            success = true ;
+            notifyAll() ;
+        }
+        else
+        {
+            System.out.println("KEV: AAAAAARRRRRRRGGGGGGGHHHHHHHHH, multiple successes called for conversation!") ;
+        }
+    }
+    
+    /**
+     * Wait a specified period for the conversation to complete.
+     * @param timeout The timeout period of the conversation.
+     */
+    public synchronized void waitForCompletion(final long timeout)
+    {
+        if (!complete && (timeout > 0))
+        {
+            final long end = System.currentTimeMillis() + timeout ;
+            do
+            {
+                final long delay = end - System.currentTimeMillis() ;
+                if (delay > 0)
+                {
+                    try
+                    {
+                        wait(delay) ;
+                    }
+                    catch (final InterruptedException ie) {} // ignore
+                }
+                else
+                {
+                    break ;
+                }
+            }
+            while(!complete) ;
+        }
+        
+        complete = true ;
+    }
+    
+    /**
+     * Has the conversation complete?
+     * @return true if the conversation has complete, false otherwise.
+     */
+    public synchronized boolean isComplete()
+    {
+        return complete ;
+    }
+    
+    /**
+     * Was the conversation successful?
+     * @return true if the conversation was successful, false otherwise.
+     */
+    public synchronized boolean isSuccessful()
+    {
+        return success ;
+    }
+
+    /**
+     * Get the Handler for rewriting the XML.
+     * @param nextHandler The next handler in the sequence.
+     * @return The handler or null if no rewriting required.
+     */
+    public ContentHandler getHandler(final ContentHandler nextHandler)
+    {
+	return null ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/InteropWaitState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/InteropWaitState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/InteropWaitState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,54 +0,0 @@
-package com.jboss.transaction.wstf.interop.states;
-
-/**
- * A conversation state that waits for a specified action before completing.
- */
-public class InteropWaitState extends BaseState
-{
-    /**
-     * The last action.
-     */
-    private final String lastAction ;
-    /**
-     * The action count.
-     */
-    private int count ;
-    
-    /**
-     * Construct the conversation state.
-     * @param lastAction The last action of the conversation.
-     */
-    public InteropWaitState(final String lastAction)
-    {
-        this(lastAction, 1) ;
-    }
-    
-    /**
-     * Construct the conversation state.
-     * @param lastAction The last action of the conversation.
-     * @param count The occurrance to trigger on.
-     */
-    public InteropWaitState(final String lastAction, final int count)
-    {
-        this.lastAction = lastAction ;
-        this.count = count ;
-    }
-    
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public boolean handleAction(final String action, final String identifier)
-    {
-        if (lastAction.equals(action))
-        {
-            if (--count == 0)
-            {
-                success() ;
-            }
-        }
-        return false ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/InteropWaitState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/InteropWaitState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/InteropWaitState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/InteropWaitState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.interop.states;
+
+/**
+ * A conversation state that waits for a specified action before completing.
+ */
+public class InteropWaitState extends BaseState
+{
+    /**
+     * The last action.
+     */
+    private final String lastAction ;
+    /**
+     * The action count.
+     */
+    private int count ;
+    
+    /**
+     * Construct the conversation state.
+     * @param lastAction The last action of the conversation.
+     */
+    public InteropWaitState(final String lastAction)
+    {
+        this(lastAction, 1) ;
+    }
+    
+    /**
+     * Construct the conversation state.
+     * @param lastAction The last action of the conversation.
+     * @param count The occurrance to trigger on.
+     */
+    public InteropWaitState(final String lastAction, final int count)
+    {
+        this.lastAction = lastAction ;
+        this.count = count ;
+    }
+    
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public boolean handleAction(final String action, final String identifier)
+    {
+        if (lastAction.equals(action))
+        {
+            if (--count == 0)
+            {
+                success() ;
+            }
+        }
+        return false ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007PreparedAfterTimeoutState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007PreparedAfterTimeoutState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007PreparedAfterTimeoutState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,70 +0,0 @@
-package com.jboss.transaction.wstf.interop.states;
-
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-
-/**
- * A conversation state for prepare after timeout test.
- */
-public class Sc007PreparedAfterTimeoutState extends BaseState
-{
-    /**
-     * The prepared count.
-     */
-    private int preparedCount ;
-    /**
-     * The rollback count.
-     */
-    private int rollbackCount ;
-    /**
-     * Are we dropping other messages?
-     */
-    private boolean drop ;
-    /**
-     * Aborted flag.
-     */
-    private boolean aborted ;
-    /**
-     * Soap Fault flag.
-     */
-    private boolean soapFault ;
-    
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public boolean handleAction(final String action, final String identifier)
-    {
-        if (AtomicTransactionConstants.WSAT_ACTION_PREPARED.equals(action))
-        {
-            if (++preparedCount == 2)
-            {
-                drop = true ;
-            }
-        }
-        else if (AtomicTransactionConstants.WSAT_ACTION_ROLLBACK.equals(action))
-        {
-            if (++rollbackCount == 2)
-            {
-                drop = false ;
-                return true ;
-            }
-        }
-        else if (AtomicTransactionConstants.WSAT_ACTION_ABORTED.equals(action))
-        {
-            aborted = true ;
-        }
-        else if (AtomicTransactionConstants.WSAT_ACTION_FAULT.equals(action))
-        {
-            soapFault = true ;
-        }
-        
-        if (aborted && soapFault)
-        {
-            success() ;
-        }
-        
-        return drop ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007PreparedAfterTimeoutState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007PreparedAfterTimeoutState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007PreparedAfterTimeoutState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007PreparedAfterTimeoutState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.interop.states;
+
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+
+/**
+ * A conversation state for prepare after timeout test.
+ */
+public class Sc007PreparedAfterTimeoutState extends BaseState
+{
+    /**
+     * The prepared count.
+     */
+    private int preparedCount ;
+    /**
+     * The rollback count.
+     */
+    private int rollbackCount ;
+    /**
+     * Are we dropping other messages?
+     */
+    private boolean drop ;
+    /**
+     * Aborted flag.
+     */
+    private boolean aborted ;
+    /**
+     * Soap Fault flag.
+     */
+    private boolean soapFault ;
+    
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public boolean handleAction(final String action, final String identifier)
+    {
+        if (AtomicTransactionConstants.WSAT_ACTION_PREPARED.equals(action))
+        {
+            if (++preparedCount == 2)
+            {
+                drop = true ;
+            }
+        }
+        else if (AtomicTransactionConstants.WSAT_ACTION_ROLLBACK.equals(action))
+        {
+            if (++rollbackCount == 2)
+            {
+                drop = false ;
+                return true ;
+            }
+        }
+        else if (AtomicTransactionConstants.WSAT_ACTION_ABORTED.equals(action))
+        {
+            aborted = true ;
+        }
+        else if (AtomicTransactionConstants.WSAT_ACTION_FAULT.equals(action))
+        {
+            soapFault = true ;
+        }
+        
+        if (aborted && soapFault)
+        {
+            success() ;
+        }
+        
+        return drop ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedAbortState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedAbortState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedAbortState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,51 +0,0 @@
-package com.jboss.transaction.wstf.interop.states;
-
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-
-/**
- * A conversation state for retry prepared abort test.
- */
-public class Sc007RetryPreparedAbortState extends BaseState
-{
-    /**
-     * Have we had the first prepare?
-     */
-    private boolean firstPrepare ;
-    /**
-     * Are we dropping other messages?
-     */
-    private boolean drop ;
-    
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public boolean handleAction(final String action, final String identifier)
-    {
-        if (AtomicTransactionConstants.WSAT_ACTION_PREPARE.equals(action))
-        {
-            if (!firstPrepare)
-            {
-                firstPrepare = true ;
-                drop = true ;
-                return false ;
-            }
-            return true ;
-        }
-        if (AtomicTransactionConstants.WSAT_ACTION_ROLLBACK.equals(action))
-        {
-            if (drop)
-            {
-                drop = false ;
-                return true ;
-            }
-        }
-        else if (AtomicTransactionConstants.WSAT_ACTION_ABORTED.equals(action))
-        {
-            success() ;
-        }
-        return drop ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedAbortState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedAbortState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedAbortState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedAbortState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.interop.states;
+
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+
+/**
+ * A conversation state for retry prepared abort test.
+ */
+public class Sc007RetryPreparedAbortState extends BaseState
+{
+    /**
+     * Have we had the first prepare?
+     */
+    private boolean firstPrepare ;
+    /**
+     * Are we dropping other messages?
+     */
+    private boolean drop ;
+    
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public boolean handleAction(final String action, final String identifier)
+    {
+        if (AtomicTransactionConstants.WSAT_ACTION_PREPARE.equals(action))
+        {
+            if (!firstPrepare)
+            {
+                firstPrepare = true ;
+                drop = true ;
+                return false ;
+            }
+            return true ;
+        }
+        if (AtomicTransactionConstants.WSAT_ACTION_ROLLBACK.equals(action))
+        {
+            if (drop)
+            {
+                drop = false ;
+                return true ;
+            }
+        }
+        else if (AtomicTransactionConstants.WSAT_ACTION_ABORTED.equals(action))
+        {
+            success() ;
+        }
+        return drop ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedCommitState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedCommitState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedCommitState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,60 +0,0 @@
-package com.jboss.transaction.wstf.interop.states;
-
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-
-/**
- * A conversation state for retry prepared commit state.
- */
-public class Sc007RetryPreparedCommitState extends BaseState
-{
-    /**
-     * The prepared count.
-     */
-    private int preparedCount ;
-    /**
-     * The committed count.
-     */
-    private int committedCount ;
-    /**
-     * The first identifier.
-     */
-    private String firstIdentifier ;
-    /**
-     * Are we dropping other messages?
-     */
-    private boolean drop ;
-    
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public boolean handleAction(final String action, final String identifier)
-    {
-        if (AtomicTransactionConstants.WSAT_ACTION_PREPARED.equals(action))
-        {
-            preparedCount++ ;
-            if (preparedCount == 1)
-            {
-                firstIdentifier = identifier ;
-            }
-            else if (preparedCount == 2)
-            {
-                drop = true ;
-            }
-            else if (firstIdentifier.equals(identifier))
-            {
-                drop = false ;
-            }
-        }
-        else if (AtomicTransactionConstants.WSAT_ACTION_COMMITTED.equals(action))
-        {
-            if (++committedCount == 2)
-            {
-                success() ;
-            }
-        }
-        return drop ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedCommitState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedCommitState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedCommitState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/interop/states/Sc007RetryPreparedCommitState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.interop.states;
+
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+
+/**
+ * A conversation state for retry prepared commit state.
+ */
+public class Sc007RetryPreparedCommitState extends BaseState
+{
+    /**
+     * The prepared count.
+     */
+    private int preparedCount ;
+    /**
+     * The committed count.
+     */
+    private int committedCount ;
+    /**
+     * The first identifier.
+     */
+    private String firstIdentifier ;
+    /**
+     * Are we dropping other messages?
+     */
+    private boolean drop ;
+    
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public boolean handleAction(final String action, final String identifier)
+    {
+        if (AtomicTransactionConstants.WSAT_ACTION_PREPARED.equals(action))
+        {
+            preparedCount++ ;
+            if (preparedCount == 1)
+            {
+                firstIdentifier = identifier ;
+            }
+            else if (preparedCount == 2)
+            {
+                drop = true ;
+            }
+            else if (firstIdentifier.equals(identifier))
+            {
+                drop = false ;
+            }
+        }
+        else if (AtomicTransactionConstants.WSAT_ACTION_COMMITTED.equals(action))
+        {
+            if (++committedCount == 2)
+            {
+                success() ;
+            }
+        }
+        return drop ;
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingConstants.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,308 +0,0 @@
-package com.jboss.transaction.wstf.proxy;
-
-import javax.xml.namespace.QName;
-
-/**
- * constants used in WS Addressing 2005/08
- */
-public class AddressingConstants {
-    /**
-     * The Namespace.
-     */
-    public static String WSA_NAMESPACE = "http://www.w3.org/2005/08/addressing" ;
-    /**
-     * The Attribute Namespace.
-     */
-    public static String WSA_ATTRIBUTE_NAMESPACE = "" ;
-    /**
-     * The namespace prefix.
-     */
-    public static String WSA_PREFIX = "wsa" ;
-    /**
-     * The attribute namespace prefix.
-     */
-    public static String WSA_ATTRIBUTE_PREFIX = "" ;
-
-    /**
-     * The Action element.
-     */
-    public static String WSA_ELEMENT_ACTION = "Action" ;
-    /**
-     * The Action QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_ACTION, WSA_PREFIX) ;
-    /**
-     * The Endpoint Reference element.
-     */
-    public static String WSA_ELEMENT_ENDPOINT_REFERENCE = "EndpointReference" ;
-    /**
-     * The Endpoint Reference QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_ENDPOINT_REFERENCE = new QName(WSA_NAMESPACE, WSA_ELEMENT_ENDPOINT_REFERENCE, WSA_PREFIX) ;
-    /**
-     * The Fault To element.
-     */
-    public static String WSA_ELEMENT_FAULT_TO = "FaultTo" ;
-    /**
-     * The Fault To QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_FAULT_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_FAULT_TO, WSA_PREFIX) ;
-    /**
-     * The From element.
-     */
-    public static String WSA_ELEMENT_FROM = "From" ;
-    /**
-     * The From QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_FROM = new QName(WSA_NAMESPACE, WSA_ELEMENT_FROM, WSA_PREFIX) ;
-    /**
-     * The Message ID element.
-     */
-    public static String WSA_ELEMENT_MESSAGE_ID = "MessageID" ;
-    /**
-     * The Message ID QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_MESSAGE_ID = new QName(WSA_NAMESPACE, WSA_ELEMENT_MESSAGE_ID, WSA_PREFIX) ;
-    /**
-     * The Relates To element.
-     */
-    public static String WSA_ELEMENT_RELATES_TO = "RelatesTo" ;
-    /**
-     * The Relates To QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_RELATES_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_RELATES_TO, WSA_PREFIX) ;
-    /**
-     * The Reply To element.
-     */
-    public static String WSA_ELEMENT_REPLY_TO = "ReplyTo" ;
-    /**
-     * The Reply To QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_REPLY_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_REPLY_TO, WSA_PREFIX) ;
-    /**
-     * The To element.
-     */
-    public static String WSA_ELEMENT_TO = "To" ;
-    /**
-     * The To QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_TO, WSA_PREFIX) ;
-    /**
-     * The Address element.
-     */
-    public static String WSA_ELEMENT_ADDRESS = "Address" ;
-    /**
-     * The Address QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_ADDRESS = new QName(WSA_NAMESPACE, WSA_ELEMENT_ADDRESS, WSA_PREFIX) ;
-    /**
-     * The Reference Parameters element.
-     */
-    public static String WSA_ELEMENT_REFERENCE_PARAMETERS = "ReferenceParameters" ;
-    /**
-     * The Reference Parameters QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_REFERENCE_PARAMETERS = new QName(WSA_NAMESPACE, WSA_ELEMENT_REFERENCE_PARAMETERS, WSA_PREFIX) ;
-    /**
-     * The Metadata element.
-     */
-    public static String WSA_ELEMENT_METADATA = "Metadata" ;
-    /**
-     * The Metadata QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_METADATA = new QName(WSA_NAMESPACE, WSA_ELEMENT_METADATA, WSA_PREFIX) ;
-
-    /**
-     * The Relationship Type attribute.
-     */
-    public static String WSA_ATTRIBUTE_RELATIONSHIP_TYPE = "RelationshipType" ;
-    /**
-     * The Relationship Type QName.
-     */
-    public static QName WSA_ATTRIBUTE_QNAME_RELATIONSHIP_TYPE = new QName(WSA_ATTRIBUTE_NAMESPACE, WSA_ATTRIBUTE_RELATIONSHIP_TYPE, WSA_ATTRIBUTE_PREFIX) ;
-
-    /**
-     * The value of the Action element for faults.
-     */
-    public static String WSA_ACTION_FAULT = WSA_NAMESPACE + "/fault" ;
-    /**
-     * The value of the Action element for SOAP faults.
-     */
-    public static String WSA_ACTION_SOAP_FAULT = WSA_NAMESPACE + "/soap/fault" ;
-
-    /**
-     * The unspecified Message ID for use in relationships.
-     * KEV check
-     */
-    public static String WSA_MESSAGE_ID_UNSPECIFIED = WSA_NAMESPACE + "/unspecified" ;
-
-    /**
-     * The address URI representing an anonymous endpoint.
-     */
-    public static String WSA_ADDRESS_ANONYMOUS = WSA_NAMESPACE + "/anonymous" ;
-    /**
-     * The address URI representing the none endpoint.
-     */
-    public static String WSA_ADDRESS_NONE = WSA_NAMESPACE + "/none" ;
-
-    /**
-     * The relates to reply URI.
-     */
-    public static String WSA_RELATES_TO_REPLY = WSA_NAMESPACE + "/reply" ;
-
-    /**
-     * The Is Reference Parameter attribute.
-     */
-    public static String WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER = "IsReferenceParameter" ;
-    /**
-     * The Is Reference Parameter QName.
-     */
-    public static QName WSA_ATTRIBUTE_QNAME_IS_REFERENCE_PARAMETER = new QName(WSA_NAMESPACE, WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER, WSA_PREFIX) ;
-
-    /**
-     * The Fault Detail element.
-     */
-    public static String WSA_ELEMENT_FAULT_DETAIL = "FaultDetail" ;
-    /**
-     * The Fault Detail QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_FAULT_DETAIL = new QName(WSA_NAMESPACE, WSA_ELEMENT_FAULT_DETAIL, WSA_PREFIX) ;
-
-    /**
-     * The Invalid Addressing Header fault code.
-     */
-    public static String WSA_FAULT_CODE_INVALID_ADDRESSING_HEADER = "InvalidAddressingHeader" ;
-    /**
-     * The Invalid Addressing Header fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_INVALID_ADDRESSING_HEADER = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_ADDRESSING_HEADER, WSA_PREFIX) ;
-    /**
-     * The Invalid Address fault code.
-     */
-    public static String WSA_FAULT_CODE_INVALID_ADDRESS = "InvalidAddress" ;
-    /**
-     * The Invalid Address fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_INVALID_ADDRESS = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_ADDRESS, WSA_PREFIX) ;
-    /**
-     * The Invalid EPR fault code.
-     */
-    public static String WSA_FAULT_CODE_INVALID_EPR = "InvalidEPR" ;
-    /**
-     * The Invalid EPR fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_INVALID_EPR = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_EPR, WSA_PREFIX) ;
-    /**
-     * The Invalid Cardinality fault code.
-     */
-    public static String WSA_FAULT_CODE_INVALID_CARDINALITY = "InvalidCardinality" ;
-    /**
-     * The Invalid Cardinality fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_INVALID_CARDINALITY = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_CARDINALITY, WSA_PREFIX) ;
-    /**
-     * The Missing Address In EPR fault code.
-     */
-    public static String WSA_FAULT_CODE_MISSING_ADDRESS_IN_EPR = "MissingAddressInEPR" ;
-    /**
-     * The Missing Address In EPR fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_MISSING_ADDRESS_IN_EPR = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_MISSING_ADDRESS_IN_EPR, WSA_PREFIX) ;
-    /**
-     * The Duplicate Message ID fault code.
-     */
-    public static String WSA_FAULT_CODE_DUPLICATE_MESSAGE_ID = "DuplicateMessageID" ;
-    /**
-     * The Duplicate Message ID fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_DUPLICATE_MESSAGE_ID = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_DUPLICATE_MESSAGE_ID, WSA_PREFIX) ;
-    /**
-     * The Action Mismatch fault code.
-     */
-    public static String WSA_FAULT_CODE_ACTION_MISMATCH = "ActionMismatch" ;
-    /**
-     * The Action Mismatch fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_ACTION_MISMATCH = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ACTION_MISMATCH, WSA_PREFIX) ;
-    /**
-     * The Message Addressing Header Required fault code.
-     */
-    public static String WSA_FAULT_CODE_MESSAGING_ADDRESSING_HEADER_REQUIRED = "MessageAddressingHeaderRequired" ;
-    /**
-     * The Message Addressing Header Required fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_MESSAGING_ADDRESSING_HEADER_REQUIRED = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_MESSAGING_ADDRESSING_HEADER_REQUIRED, WSA_PREFIX) ;
-    /**
-     * The Destination Unreachable fault code.
-     */
-    public static String WSA_FAULT_CODE_DESTINATION_UNREACHABLE = "DestinationUnreachable" ;
-    /**
-     * The Destination Unreachable fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_DESTINATION_UNREACHABLE = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_DESTINATION_UNREACHABLE, WSA_PREFIX) ;
-    /**
-     * The Action Not Supported fault code.
-     */
-    public static String WSA_FAULT_CODE_ACTION_NOT_SUPPORTED = "ActionNotSupported" ;
-    /**
-     * The Action Not Supported fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_ACTION_NOT_SUPPORTED = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ACTION_NOT_SUPPORTED, WSA_PREFIX) ;
-    /**
-     * The Endpoint Unavailable fault code.
-     */
-    public static String WSA_FAULT_CODE_ENDPOINT_UNAVAILABLE = "EndpointUnavailable" ;
-    /**
-     * The Endpoint Unavailable fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_ENDPOINT_UNAVAILABLE = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ENDPOINT_UNAVAILABLE, WSA_PREFIX) ;
-
-    /**
-     * The Problem Header element.
-     */
-    public static String WSA_ELEMENT_PROBLEM_HEADER = "ProblemHeader" ;
-    /**
-     * The Problem Header QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_PROBLEM_HEADER = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_HEADER, WSA_PREFIX) ;
-    /**
-     * The Problem Header QName element.
-     */
-    public static String WSA_ELEMENT_PROBLEM_HEADER_QNAME = "ProblemHeaderQName" ;
-    /**
-     * The Problem Header QName QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_PROBLEM_HEADER_QNAME = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_HEADER_QNAME, WSA_PREFIX) ;
-    /**
-     * The Problem IRI element.
-     */
-    public static String WSA_ELEMENT_PROBLEM_IRI = "ProblemIRI" ;
-    /**
-     * The Problem IRI QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_PROBLEM_IRI = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_IRI, WSA_PREFIX) ;
-    /**
-     * The Problem Action element.
-     */
-    public static String WSA_ELEMENT_PROBLEM_ACTION = "ProblemAction" ;
-    /**
-     * The Problem Action QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_PROBLEM_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_ACTION, WSA_PREFIX) ;
-    /**
-     * The Soap Action element.
-     */
-    public static String WSA_ELEMENT_SOAP_ACTION = "SoapAction" ;
-    /**
-     * The Soap Action QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_SOAP_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_SOAP_ACTION, WSA_PREFIX) ;
-    /**
-     * The Retry After element.
-     */
-    public static String WSA_ELEMENT_RETRY_AFTER = "RetryAfter" ;
-    /**
-     * The Retry After QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_RETRY_AFTER = new QName(WSA_NAMESPACE, WSA_ELEMENT_METADATA, WSA_PREFIX) ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingConstants.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingConstants.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingConstants.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,328 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.proxy;
+
+import javax.xml.namespace.QName;
+
+/**
+ * constants used in WS Addressing 2005/08
+ */
+public class AddressingConstants {
+    /**
+     * The Namespace.
+     */
+    public static String WSA_NAMESPACE = "http://www.w3.org/2005/08/addressing" ;
+    /**
+     * The Attribute Namespace.
+     */
+    public static String WSA_ATTRIBUTE_NAMESPACE = "" ;
+    /**
+     * The namespace prefix.
+     */
+    public static String WSA_PREFIX = "wsa" ;
+    /**
+     * The attribute namespace prefix.
+     */
+    public static String WSA_ATTRIBUTE_PREFIX = "" ;
+
+    /**
+     * The Action element.
+     */
+    public static String WSA_ELEMENT_ACTION = "Action" ;
+    /**
+     * The Action QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_ACTION, WSA_PREFIX) ;
+    /**
+     * The Endpoint Reference element.
+     */
+    public static String WSA_ELEMENT_ENDPOINT_REFERENCE = "EndpointReference" ;
+    /**
+     * The Endpoint Reference QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_ENDPOINT_REFERENCE = new QName(WSA_NAMESPACE, WSA_ELEMENT_ENDPOINT_REFERENCE, WSA_PREFIX) ;
+    /**
+     * The Fault To element.
+     */
+    public static String WSA_ELEMENT_FAULT_TO = "FaultTo" ;
+    /**
+     * The Fault To QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_FAULT_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_FAULT_TO, WSA_PREFIX) ;
+    /**
+     * The From element.
+     */
+    public static String WSA_ELEMENT_FROM = "From" ;
+    /**
+     * The From QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_FROM = new QName(WSA_NAMESPACE, WSA_ELEMENT_FROM, WSA_PREFIX) ;
+    /**
+     * The Message ID element.
+     */
+    public static String WSA_ELEMENT_MESSAGE_ID = "MessageID" ;
+    /**
+     * The Message ID QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_MESSAGE_ID = new QName(WSA_NAMESPACE, WSA_ELEMENT_MESSAGE_ID, WSA_PREFIX) ;
+    /**
+     * The Relates To element.
+     */
+    public static String WSA_ELEMENT_RELATES_TO = "RelatesTo" ;
+    /**
+     * The Relates To QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_RELATES_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_RELATES_TO, WSA_PREFIX) ;
+    /**
+     * The Reply To element.
+     */
+    public static String WSA_ELEMENT_REPLY_TO = "ReplyTo" ;
+    /**
+     * The Reply To QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_REPLY_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_REPLY_TO, WSA_PREFIX) ;
+    /**
+     * The To element.
+     */
+    public static String WSA_ELEMENT_TO = "To" ;
+    /**
+     * The To QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_TO, WSA_PREFIX) ;
+    /**
+     * The Address element.
+     */
+    public static String WSA_ELEMENT_ADDRESS = "Address" ;
+    /**
+     * The Address QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_ADDRESS = new QName(WSA_NAMESPACE, WSA_ELEMENT_ADDRESS, WSA_PREFIX) ;
+    /**
+     * The Reference Parameters element.
+     */
+    public static String WSA_ELEMENT_REFERENCE_PARAMETERS = "ReferenceParameters" ;
+    /**
+     * The Reference Parameters QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_REFERENCE_PARAMETERS = new QName(WSA_NAMESPACE, WSA_ELEMENT_REFERENCE_PARAMETERS, WSA_PREFIX) ;
+    /**
+     * The Metadata element.
+     */
+    public static String WSA_ELEMENT_METADATA = "Metadata" ;
+    /**
+     * The Metadata QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_METADATA = new QName(WSA_NAMESPACE, WSA_ELEMENT_METADATA, WSA_PREFIX) ;
+
+    /**
+     * The Relationship Type attribute.
+     */
+    public static String WSA_ATTRIBUTE_RELATIONSHIP_TYPE = "RelationshipType" ;
+    /**
+     * The Relationship Type QName.
+     */
+    public static QName WSA_ATTRIBUTE_QNAME_RELATIONSHIP_TYPE = new QName(WSA_ATTRIBUTE_NAMESPACE, WSA_ATTRIBUTE_RELATIONSHIP_TYPE, WSA_ATTRIBUTE_PREFIX) ;
+
+    /**
+     * The value of the Action element for faults.
+     */
+    public static String WSA_ACTION_FAULT = WSA_NAMESPACE + "/fault" ;
+    /**
+     * The value of the Action element for SOAP faults.
+     */
+    public static String WSA_ACTION_SOAP_FAULT = WSA_NAMESPACE + "/soap/fault" ;
+
+    /**
+     * The unspecified Message ID for use in relationships.
+     * KEV check
+     */
+    public static String WSA_MESSAGE_ID_UNSPECIFIED = WSA_NAMESPACE + "/unspecified" ;
+
+    /**
+     * The address URI representing an anonymous endpoint.
+     */
+    public static String WSA_ADDRESS_ANONYMOUS = WSA_NAMESPACE + "/anonymous" ;
+    /**
+     * The address URI representing the none endpoint.
+     */
+    public static String WSA_ADDRESS_NONE = WSA_NAMESPACE + "/none" ;
+
+    /**
+     * The relates to reply URI.
+     */
+    public static String WSA_RELATES_TO_REPLY = WSA_NAMESPACE + "/reply" ;
+
+    /**
+     * The Is Reference Parameter attribute.
+     */
+    public static String WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER = "IsReferenceParameter" ;
+    /**
+     * The Is Reference Parameter QName.
+     */
+    public static QName WSA_ATTRIBUTE_QNAME_IS_REFERENCE_PARAMETER = new QName(WSA_NAMESPACE, WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER, WSA_PREFIX) ;
+
+    /**
+     * The Fault Detail element.
+     */
+    public static String WSA_ELEMENT_FAULT_DETAIL = "FaultDetail" ;
+    /**
+     * The Fault Detail QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_FAULT_DETAIL = new QName(WSA_NAMESPACE, WSA_ELEMENT_FAULT_DETAIL, WSA_PREFIX) ;
+
+    /**
+     * The Invalid Addressing Header fault code.
+     */
+    public static String WSA_FAULT_CODE_INVALID_ADDRESSING_HEADER = "InvalidAddressingHeader" ;
+    /**
+     * The Invalid Addressing Header fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_INVALID_ADDRESSING_HEADER = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_ADDRESSING_HEADER, WSA_PREFIX) ;
+    /**
+     * The Invalid Address fault code.
+     */
+    public static String WSA_FAULT_CODE_INVALID_ADDRESS = "InvalidAddress" ;
+    /**
+     * The Invalid Address fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_INVALID_ADDRESS = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_ADDRESS, WSA_PREFIX) ;
+    /**
+     * The Invalid EPR fault code.
+     */
+    public static String WSA_FAULT_CODE_INVALID_EPR = "InvalidEPR" ;
+    /**
+     * The Invalid EPR fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_INVALID_EPR = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_EPR, WSA_PREFIX) ;
+    /**
+     * The Invalid Cardinality fault code.
+     */
+    public static String WSA_FAULT_CODE_INVALID_CARDINALITY = "InvalidCardinality" ;
+    /**
+     * The Invalid Cardinality fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_INVALID_CARDINALITY = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_CARDINALITY, WSA_PREFIX) ;
+    /**
+     * The Missing Address In EPR fault code.
+     */
+    public static String WSA_FAULT_CODE_MISSING_ADDRESS_IN_EPR = "MissingAddressInEPR" ;
+    /**
+     * The Missing Address In EPR fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_MISSING_ADDRESS_IN_EPR = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_MISSING_ADDRESS_IN_EPR, WSA_PREFIX) ;
+    /**
+     * The Duplicate Message ID fault code.
+     */
+    public static String WSA_FAULT_CODE_DUPLICATE_MESSAGE_ID = "DuplicateMessageID" ;
+    /**
+     * The Duplicate Message ID fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_DUPLICATE_MESSAGE_ID = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_DUPLICATE_MESSAGE_ID, WSA_PREFIX) ;
+    /**
+     * The Action Mismatch fault code.
+     */
+    public static String WSA_FAULT_CODE_ACTION_MISMATCH = "ActionMismatch" ;
+    /**
+     * The Action Mismatch fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_ACTION_MISMATCH = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ACTION_MISMATCH, WSA_PREFIX) ;
+    /**
+     * The Message Addressing Header Required fault code.
+     */
+    public static String WSA_FAULT_CODE_MESSAGING_ADDRESSING_HEADER_REQUIRED = "MessageAddressingHeaderRequired" ;
+    /**
+     * The Message Addressing Header Required fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_MESSAGING_ADDRESSING_HEADER_REQUIRED = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_MESSAGING_ADDRESSING_HEADER_REQUIRED, WSA_PREFIX) ;
+    /**
+     * The Destination Unreachable fault code.
+     */
+    public static String WSA_FAULT_CODE_DESTINATION_UNREACHABLE = "DestinationUnreachable" ;
+    /**
+     * The Destination Unreachable fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_DESTINATION_UNREACHABLE = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_DESTINATION_UNREACHABLE, WSA_PREFIX) ;
+    /**
+     * The Action Not Supported fault code.
+     */
+    public static String WSA_FAULT_CODE_ACTION_NOT_SUPPORTED = "ActionNotSupported" ;
+    /**
+     * The Action Not Supported fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_ACTION_NOT_SUPPORTED = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ACTION_NOT_SUPPORTED, WSA_PREFIX) ;
+    /**
+     * The Endpoint Unavailable fault code.
+     */
+    public static String WSA_FAULT_CODE_ENDPOINT_UNAVAILABLE = "EndpointUnavailable" ;
+    /**
+     * The Endpoint Unavailable fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_ENDPOINT_UNAVAILABLE = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ENDPOINT_UNAVAILABLE, WSA_PREFIX) ;
+
+    /**
+     * The Problem Header element.
+     */
+    public static String WSA_ELEMENT_PROBLEM_HEADER = "ProblemHeader" ;
+    /**
+     * The Problem Header QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_PROBLEM_HEADER = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_HEADER, WSA_PREFIX) ;
+    /**
+     * The Problem Header QName element.
+     */
+    public static String WSA_ELEMENT_PROBLEM_HEADER_QNAME = "ProblemHeaderQName" ;
+    /**
+     * The Problem Header QName QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_PROBLEM_HEADER_QNAME = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_HEADER_QNAME, WSA_PREFIX) ;
+    /**
+     * The Problem IRI element.
+     */
+    public static String WSA_ELEMENT_PROBLEM_IRI = "ProblemIRI" ;
+    /**
+     * The Problem IRI QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_PROBLEM_IRI = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_IRI, WSA_PREFIX) ;
+    /**
+     * The Problem Action element.
+     */
+    public static String WSA_ELEMENT_PROBLEM_ACTION = "ProblemAction" ;
+    /**
+     * The Problem Action QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_PROBLEM_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_ACTION, WSA_PREFIX) ;
+    /**
+     * The Soap Action element.
+     */
+    public static String WSA_ELEMENT_SOAP_ACTION = "SoapAction" ;
+    /**
+     * The Soap Action QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_SOAP_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_SOAP_ACTION, WSA_PREFIX) ;
+    /**
+     * The Retry After element.
+     */
+    public static String WSA_ELEMENT_RETRY_AFTER = "RetryAfter" ;
+    /**
+     * The Retry After QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_RETRY_AFTER = new QName(WSA_NAMESPACE, WSA_ELEMENT_METADATA, WSA_PREFIX) ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingProxySAXHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingProxySAXHandler.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingProxySAXHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,177 +0,0 @@
-/*
- * Created on 20-Jan-2005
- */
-package com.jboss.transaction.wstf.proxy;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-
-import com.jboss.transaction.wstf.proxy.AddressingConstants;
-import com.arjuna.webservices.wsarj.ArjunaConstants;
-
-/**
- * Sax parser for rewriting the XML via the proxy.
- * @author kevin
- */
-public class AddressingProxySAXHandler extends BaseHandler
-{
-    /**
-     * The WS-Addressing namespace URI.
-     */
-    private static final String WSA_NAMESPACE_URI = AddressingConstants.WSA_NAMESPACE ;
-    /**
-     * The WS-Addressing To element.
-     */
-    private static final String WSA_ELEMENT_TO = AddressingConstants.WSA_ELEMENT_TO ;
-    /**
-     * The WS-Addressing Address element.
-     */
-    private static final String WSA_ELEMENT_ADDRESS = AddressingConstants.WSA_ELEMENT_ADDRESS ;
-    
-    /**
-     * Are we in a rewrite element?
-     */
-    private boolean inRewriteElement ;
-    /**
-     * Are we in a to element?
-     */
-    private boolean inToElement ;
-    /**
-     * Are we in an identifier element?
-     */
-    private boolean inIdentifierElement ;
-    /**
-     * The to address.
-     */
-    private String toAddress ;
-    /**
-     * The identifier.
-     */
-    private String identifier ;
-    /**
-     * The string buffer for text element content.
-     */
-    private StringBuffer characterContent = new StringBuffer() ;
-    
-    /**
-     * The current conversation identifier.
-     */
-    private final String conversationIdentifier ;
-    
-    /**
-     * Construct the SAX handler with the output writer.
-     * @param nextHandler The next content handler.
-     * @param conversationIdentifier The conversation identifier.
-     */
-    public AddressingProxySAXHandler(final ContentHandler nextHandler, final String conversationIdentifier)
-    {
-	super(nextHandler) ;
-        this.conversationIdentifier = conversationIdentifier ;
-    }
-    
-    /**
-     * Start an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @param attributes The element attributes.
-     * @throws SAXException for any errors.
-     */
-    public void startElement(final String uri, final String localName, final String qName,
-        final Attributes attributes)
-    	throws SAXException
-    {
-        if (WSA_NAMESPACE_URI.equals(uri))
-        {
-            if (WSA_ELEMENT_ADDRESS.equals(localName))
-            {
-                inRewriteElement = true ;
-            }
-            else if (WSA_ELEMENT_TO.equals(localName))
-            {
-                inRewriteElement = true ;
-                inToElement = true ;
-            }
-        }
-        else if (ArjunaConstants.WSARJ_NAMESPACE.equals(uri) && ArjunaConstants.WSARJ_ELEMENT_INSTANCE_IDENTIFIER.equals(localName)
-            && (attributes.getValue(WSA_NAMESPACE_URI, AddressingConstants.WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER) != null))
-        {
-            inIdentifierElement = true ;
-        }
-        
-        getNextHandler().startElement(uri, localName, qName, attributes) ;
-    }
-    
-    /**
-     * End an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @throws SAXException for any errors.
-     */
-    public void endElement(final String uri, final String localName, final String qName)
-        throws SAXException
-    {
-        if (characterContent.length() > 0)
-        {
-            if (inRewriteElement)
-            {
-                final String newValue = ProxyURIRewriting.rewriteURI(conversationIdentifier, characterContent.toString().trim()) ;
-                getNextHandler().characters(newValue.toCharArray(), 0, newValue.length()) ;
-                if (inToElement)
-                {
-                    toAddress = newValue ;
-                    inToElement = false;
-                }
-                inRewriteElement = false;
-            }
-            else if (inIdentifierElement)
-            {
-                identifier = characterContent.toString() ;
-                getNextHandler().characters(identifier.toCharArray(), 0, identifier.length()) ;
-                inIdentifierElement = false;
-            }
-            characterContent.setLength(0) ;
-        }
-        getNextHandler().endElement(uri, localName, qName) ;
-    }
-    
-    /**
-     * Process character text.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     * @throws SAXException for any errors.
-     */
-    public void characters(char[] chars, int start, int length)
-        throws SAXException
-    {
-        if (inRewriteElement || inIdentifierElement)
-        {
-            characterContent.append(chars, start, length) ;
-        }
-        else
-        {
-            getNextHandler().characters(chars, start, length) ;
-        }
-    }
-    
-    /**
-     * Return the to address from the processing.
-     * @return The to address.
-     */
-    public String getToAddress()
-    {
-        return toAddress ;
-    }
-    
-    /**
-     * Return the identifier from the processing.
-     * @return The identifier.
-     */
-    public String getIdentifier()
-    {
-        return identifier ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingProxySAXHandler.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingProxySAXHandler.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingProxySAXHandler.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/AddressingProxySAXHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,197 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Created on 20-Jan-2005
+ */
+package com.jboss.transaction.wstf.proxy;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+import com.jboss.transaction.wstf.proxy.AddressingConstants;
+import com.arjuna.webservices.wsarj.ArjunaConstants;
+
+/**
+ * Sax parser for rewriting the XML via the proxy.
+ * @author kevin
+ */
+public class AddressingProxySAXHandler extends BaseHandler
+{
+    /**
+     * The WS-Addressing namespace URI.
+     */
+    private static final String WSA_NAMESPACE_URI = AddressingConstants.WSA_NAMESPACE ;
+    /**
+     * The WS-Addressing To element.
+     */
+    private static final String WSA_ELEMENT_TO = AddressingConstants.WSA_ELEMENT_TO ;
+    /**
+     * The WS-Addressing Address element.
+     */
+    private static final String WSA_ELEMENT_ADDRESS = AddressingConstants.WSA_ELEMENT_ADDRESS ;
+    
+    /**
+     * Are we in a rewrite element?
+     */
+    private boolean inRewriteElement ;
+    /**
+     * Are we in a to element?
+     */
+    private boolean inToElement ;
+    /**
+     * Are we in an identifier element?
+     */
+    private boolean inIdentifierElement ;
+    /**
+     * The to address.
+     */
+    private String toAddress ;
+    /**
+     * The identifier.
+     */
+    private String identifier ;
+    /**
+     * The string buffer for text element content.
+     */
+    private StringBuffer characterContent = new StringBuffer() ;
+    
+    /**
+     * The current conversation identifier.
+     */
+    private final String conversationIdentifier ;
+    
+    /**
+     * Construct the SAX handler with the output writer.
+     * @param nextHandler The next content handler.
+     * @param conversationIdentifier The conversation identifier.
+     */
+    public AddressingProxySAXHandler(final ContentHandler nextHandler, final String conversationIdentifier)
+    {
+	super(nextHandler) ;
+        this.conversationIdentifier = conversationIdentifier ;
+    }
+    
+    /**
+     * Start an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @param attributes The element attributes.
+     * @throws SAXException for any errors.
+     */
+    public void startElement(final String uri, final String localName, final String qName,
+        final Attributes attributes)
+    	throws SAXException
+    {
+        if (WSA_NAMESPACE_URI.equals(uri))
+        {
+            if (WSA_ELEMENT_ADDRESS.equals(localName))
+            {
+                inRewriteElement = true ;
+            }
+            else if (WSA_ELEMENT_TO.equals(localName))
+            {
+                inRewriteElement = true ;
+                inToElement = true ;
+            }
+        }
+        else if (ArjunaConstants.WSARJ_NAMESPACE.equals(uri) && ArjunaConstants.WSARJ_ELEMENT_INSTANCE_IDENTIFIER.equals(localName)
+            && (attributes.getValue(WSA_NAMESPACE_URI, AddressingConstants.WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER) != null))
+        {
+            inIdentifierElement = true ;
+        }
+        
+        getNextHandler().startElement(uri, localName, qName, attributes) ;
+    }
+    
+    /**
+     * End an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @throws SAXException for any errors.
+     */
+    public void endElement(final String uri, final String localName, final String qName)
+        throws SAXException
+    {
+        if (characterContent.length() > 0)
+        {
+            if (inRewriteElement)
+            {
+                final String newValue = ProxyURIRewriting.rewriteURI(conversationIdentifier, characterContent.toString().trim()) ;
+                getNextHandler().characters(newValue.toCharArray(), 0, newValue.length()) ;
+                if (inToElement)
+                {
+                    toAddress = newValue ;
+                    inToElement = false;
+                }
+                inRewriteElement = false;
+            }
+            else if (inIdentifierElement)
+            {
+                identifier = characterContent.toString() ;
+                getNextHandler().characters(identifier.toCharArray(), 0, identifier.length()) ;
+                inIdentifierElement = false;
+            }
+            characterContent.setLength(0) ;
+        }
+        getNextHandler().endElement(uri, localName, qName) ;
+    }
+    
+    /**
+     * Process character text.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     * @throws SAXException for any errors.
+     */
+    public void characters(char[] chars, int start, int length)
+        throws SAXException
+    {
+        if (inRewriteElement || inIdentifierElement)
+        {
+            characterContent.append(chars, start, length) ;
+        }
+        else
+        {
+            getNextHandler().characters(chars, start, length) ;
+        }
+    }
+    
+    /**
+     * Return the to address from the processing.
+     * @return The to address.
+     */
+    public String getToAddress()
+    {
+        return toAddress ;
+    }
+    
+    /**
+     * Return the identifier from the processing.
+     * @return The identifier.
+     */
+    public String getIdentifier()
+    {
+        return identifier ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/BaseHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/BaseHandler.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/BaseHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,167 +0,0 @@
-/*
- * Created on 20-Jan-2005
- */
-package com.jboss.transaction.wstf.proxy;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-
-/**
- * Sax parser for rewriting the XML via the proxy.
- * @author kevin
- */
-public class BaseHandler implements ContentHandler
-{
-    /**
-     * The next handler in the sequence.
-     */
-    private final ContentHandler nextHandler ;
-    
-    /**
-     * Construct the base handler.
-     * @param nextHandler The next content handler.
-     */
-    protected BaseHandler(final ContentHandler nextHandler)
-    {
-	this.nextHandler = nextHandler ;
-    }
-    
-    /**
-     * Set the document locator.
-     * @param locator The document locator.
-     */
-    public void setDocumentLocator(final Locator locator)
-    {
-	nextHandler.setDocumentLocator(locator) ;
-    }
-    
-    /**
-     * Handle the procesing instruction.
-     * @param target The pi target.
-     * @param data The pi data.
-     * @throws SAXException for any errors.
-     */
-    public void processingInstruction(final String target, final String data)
-        throws SAXException
-    {
-	nextHandler.processingInstruction(target, data) ;
-    }
-    
-    /**
-     * Start the document.
-     * @throws SAXException for any errors.
-     */
-    public void startDocument()
-    	throws SAXException
-    {
-	nextHandler.startDocument() ;
-    }
-    
-    /**
-     * End the document.
-     * @throws SAXException for any errors.
-     */
-    public void endDocument()
-    	throws SAXException
-    {
-	nextHandler.endDocument() ;
-    }
-    
-    /**
-     * Start a prefix mapping.
-     * @param prefix The namespace prefix.
-     * @param uri The namespace uri.
-     * @throws SAXException for any errors.
-     */
-    public void startPrefixMapping(final String prefix, final String uri)
-        throws SAXException
-    {
-	nextHandler.startPrefixMapping(prefix, uri) ;
-    }
-    
-    /**
-     * End the prefix mapping.
-     * @param prefix The namespace prefix.
-     * @throws SAXException for any errors.
-     */
-    public void endPrefixMapping(final String prefix)
-    	throws SAXException
-    {
-	nextHandler.endPrefixMapping(prefix) ;
-    }
-    
-    /**
-     * Start an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @param attributes The element attributes.
-     * @throws SAXException for any errors.
-     */
-    public void startElement(final String uri, final String localName, final String qName,
-        final Attributes attributes)
-    	throws SAXException
-    {
-	nextHandler.startElement(uri, localName, qName, attributes) ;
-    }
-    
-    /**
-     * End an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @throws SAXException for any errors.
-     */
-    public void endElement(final String uri, final String localName, final String qName)
-        throws SAXException
-    {
-	nextHandler.endElement(uri, localName, qName) ;
-    }
-    
-    /**
-     * Process character text.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     * @throws SAXException for any errors.
-     */
-    public void characters(char[] chars, int start, int length)
-        throws SAXException
-    {
-	nextHandler.characters(chars, start, length) ;
-    }
-    
-    /**
-     * Process ignorable white space.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     * @throws SAXException for any errors.
-     */
-    public void ignorableWhitespace(char[] chars, int start, int length)
-        throws SAXException
-    {
-	nextHandler.ignorableWhitespace(chars, start, length) ;
-    }
-    
-    /**
-     * Skip an entity.
-     * @throws SAXException for any errors.
-     */
-    public void skippedEntity(final String name)
-    	throws SAXException
-    {
-	nextHandler.skippedEntity(name) ;
-    }
-    
-    /**
-     * Get the next handler.
-     * @return The next handler.
-     */
-    protected final ContentHandler getNextHandler()
-    {
-	return nextHandler ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/BaseHandler.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/BaseHandler.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/BaseHandler.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/BaseHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,187 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Created on 20-Jan-2005
+ */
+package com.jboss.transaction.wstf.proxy;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+/**
+ * Sax parser for rewriting the XML via the proxy.
+ * @author kevin
+ */
+public class BaseHandler implements ContentHandler
+{
+    /**
+     * The next handler in the sequence.
+     */
+    private final ContentHandler nextHandler ;
+    
+    /**
+     * Construct the base handler.
+     * @param nextHandler The next content handler.
+     */
+    protected BaseHandler(final ContentHandler nextHandler)
+    {
+	this.nextHandler = nextHandler ;
+    }
+    
+    /**
+     * Set the document locator.
+     * @param locator The document locator.
+     */
+    public void setDocumentLocator(final Locator locator)
+    {
+	nextHandler.setDocumentLocator(locator) ;
+    }
+    
+    /**
+     * Handle the procesing instruction.
+     * @param target The pi target.
+     * @param data The pi data.
+     * @throws SAXException for any errors.
+     */
+    public void processingInstruction(final String target, final String data)
+        throws SAXException
+    {
+	nextHandler.processingInstruction(target, data) ;
+    }
+    
+    /**
+     * Start the document.
+     * @throws SAXException for any errors.
+     */
+    public void startDocument()
+    	throws SAXException
+    {
+	nextHandler.startDocument() ;
+    }
+    
+    /**
+     * End the document.
+     * @throws SAXException for any errors.
+     */
+    public void endDocument()
+    	throws SAXException
+    {
+	nextHandler.endDocument() ;
+    }
+    
+    /**
+     * Start a prefix mapping.
+     * @param prefix The namespace prefix.
+     * @param uri The namespace uri.
+     * @throws SAXException for any errors.
+     */
+    public void startPrefixMapping(final String prefix, final String uri)
+        throws SAXException
+    {
+	nextHandler.startPrefixMapping(prefix, uri) ;
+    }
+    
+    /**
+     * End the prefix mapping.
+     * @param prefix The namespace prefix.
+     * @throws SAXException for any errors.
+     */
+    public void endPrefixMapping(final String prefix)
+    	throws SAXException
+    {
+	nextHandler.endPrefixMapping(prefix) ;
+    }
+    
+    /**
+     * Start an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @param attributes The element attributes.
+     * @throws SAXException for any errors.
+     */
+    public void startElement(final String uri, final String localName, final String qName,
+        final Attributes attributes)
+    	throws SAXException
+    {
+	nextHandler.startElement(uri, localName, qName, attributes) ;
+    }
+    
+    /**
+     * End an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @throws SAXException for any errors.
+     */
+    public void endElement(final String uri, final String localName, final String qName)
+        throws SAXException
+    {
+	nextHandler.endElement(uri, localName, qName) ;
+    }
+    
+    /**
+     * Process character text.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     * @throws SAXException for any errors.
+     */
+    public void characters(char[] chars, int start, int length)
+        throws SAXException
+    {
+	nextHandler.characters(chars, start, length) ;
+    }
+    
+    /**
+     * Process ignorable white space.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     * @throws SAXException for any errors.
+     */
+    public void ignorableWhitespace(char[] chars, int start, int length)
+        throws SAXException
+    {
+	nextHandler.ignorableWhitespace(chars, start, length) ;
+    }
+    
+    /**
+     * Skip an entity.
+     * @throws SAXException for any errors.
+     */
+    public void skippedEntity(final String name)
+    	throws SAXException
+    {
+	nextHandler.skippedEntity(name) ;
+    }
+    
+    /**
+     * Get the next handler.
+     * @return The next handler.
+     */
+    protected final ContentHandler getNextHandler()
+    {
+	return nextHandler ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversation.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversation.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,145 +0,0 @@
-package com.jboss.transaction.wstf.proxy;
-
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * Message logging via the proxy.
- */
-public class ProxyConversation
-{
-    /**
-     * The conversation id.
-     */
-    private static int currentConversationId ;
-    /**
-     * The conversation map.
-     */
-    private static Map conversationMap = new TreeMap() ;
-    /**
-     * The conversation state map.
-     */
-    private static Map conversationStateMap = new TreeMap() ;
-    
-    /**
-     * The marker for an internal id.
-     */
-    private static final char INTERNAL_ID = 'c' ;
-    /**
-     * The marker for an external id.
-     */
-    private static final char EXTERNAL_ID = 'C' ;
-    
-    /**
-     * Create a conversation.
-     * @return The id of the conversation. 
-     */
-    public static synchronized String createConversation()
-    {
-        final String conversationId = INTERNAL_ID + Integer.toString(++currentConversationId) ;
-        conversationMap.put(mapConversationId(conversationId), new ArrayList()) ;
-System.out.println("KEV: created conversation " + conversationId) ;        
-        return conversationId ;
-    }
-
-    /**
-     * Remove the conversation.
-     * @param conversationId The conversation id.
-     * @return The conversation messages in sequence.
-     */
-    public static synchronized String[] removeConversation(final String conversationId)
-    {
-        final ArrayList list = (ArrayList)conversationMap.remove(mapConversationId(conversationId)) ;
-System.out.println("KEV: removed conversation " + conversationId) ;        
-        return (list == null ? new String[0] : (String[])list.toArray(new String[list.size()])) ;
-    }
-    
-    /**
-     * Append a message to the conversation.
-     * @param conversationId The conversation id.
-     * @param message The message to append to the conversation.
-     */
-    public static synchronized void appendConversation(final String conversationId, final String message)
-    {
-        final ArrayList list = (ArrayList)conversationMap.get(mapConversationId(conversationId)) ;
-        if (list != null)
-        {
-            list.add(message) ;
-        }
-    }
-    
-    /**
-     * Set the conversation state for the specified conversation.
-     * @param conversationId The conversation id.
-     * @param conversationState The conversation state.
-     */
-    public static synchronized void setConversationState(final String conversationId, final ProxyConversationState conversationState)
-    {
-        conversationStateMap.put(mapConversationId(conversationId), conversationState) ;
-    }
-    
-    /**
-     * Get the conversation state for the specified conversation.
-     * @param conversationId The conversation id.
-     * @return The conversation state or null.
-     */
-    public static synchronized ProxyConversationState getConversationState(final String conversationId)
-    {
-        return (ProxyConversationState)conversationStateMap.get(mapConversationId(conversationId)) ;
-    }
-    
-    /**
-     * Clear the conversation state for the specified conversation.
-     * @param conversationId The conversation id.
-     */
-    public static synchronized void clearConversationState(final String conversationId)
-    {
-        conversationStateMap.remove(mapConversationId(conversationId)) ;
-    }
-    
-    /**
-     * Is the conversation id an internal id?
-     * @param conversationId The conversation id.
-     * @return True if the conversation id is internal, false if it is external.
-     */
-    public static boolean isInternalConversationId(final String conversationId)
-    {
-        return ((conversationId != null) && (conversationId.length() != 0) && (conversationId.charAt(0) == INTERNAL_ID)) ;
-    }
-    
-    /**
-     * Get the alternate conversation id.
-     * @param conversationId The current conversation id.
-     * @return The alternate conversation id.
-     */
-    public static String getAlternateConversationId(final String conversationId)
-    {
-        if ((conversationId == null) || (conversationId.length() == 0))
-        {
-            return conversationId ;
-        }
-        if (conversationId.charAt(0) == INTERNAL_ID)
-        {
-            return EXTERNAL_ID + mapConversationId(conversationId) ;
-        }
-        else
-        {
-            return INTERNAL_ID + mapConversationId(conversationId) ;
-        }
-    }
-    
-    /**
-     * Get the map conversation id.
-     * @param conversationId The full conversation id.
-     * @return The conversation id for the map.
-     */
-    private static String mapConversationId(final String conversationId)
-    {
-        if ((conversationId == null) || (conversationId.length() == 0))
-        {
-            return conversationId ;
-        }
-        return conversationId.substring(1) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversation.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversation.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversation.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,165 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.proxy;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * Message logging via the proxy.
+ */
+public class ProxyConversation
+{
+    /**
+     * The conversation id.
+     */
+    private static int currentConversationId ;
+    /**
+     * The conversation map.
+     */
+    private static Map conversationMap = new TreeMap() ;
+    /**
+     * The conversation state map.
+     */
+    private static Map conversationStateMap = new TreeMap() ;
+    
+    /**
+     * The marker for an internal id.
+     */
+    private static final char INTERNAL_ID = 'c' ;
+    /**
+     * The marker for an external id.
+     */
+    private static final char EXTERNAL_ID = 'C' ;
+    
+    /**
+     * Create a conversation.
+     * @return The id of the conversation. 
+     */
+    public static synchronized String createConversation()
+    {
+        final String conversationId = INTERNAL_ID + Integer.toString(++currentConversationId) ;
+        conversationMap.put(mapConversationId(conversationId), new ArrayList()) ;
+System.out.println("KEV: created conversation " + conversationId) ;        
+        return conversationId ;
+    }
+
+    /**
+     * Remove the conversation.
+     * @param conversationId The conversation id.
+     * @return The conversation messages in sequence.
+     */
+    public static synchronized String[] removeConversation(final String conversationId)
+    {
+        final ArrayList list = (ArrayList)conversationMap.remove(mapConversationId(conversationId)) ;
+System.out.println("KEV: removed conversation " + conversationId) ;        
+        return (list == null ? new String[0] : (String[])list.toArray(new String[list.size()])) ;
+    }
+    
+    /**
+     * Append a message to the conversation.
+     * @param conversationId The conversation id.
+     * @param message The message to append to the conversation.
+     */
+    public static synchronized void appendConversation(final String conversationId, final String message)
+    {
+        final ArrayList list = (ArrayList)conversationMap.get(mapConversationId(conversationId)) ;
+        if (list != null)
+        {
+            list.add(message) ;
+        }
+    }
+    
+    /**
+     * Set the conversation state for the specified conversation.
+     * @param conversationId The conversation id.
+     * @param conversationState The conversation state.
+     */
+    public static synchronized void setConversationState(final String conversationId, final ProxyConversationState conversationState)
+    {
+        conversationStateMap.put(mapConversationId(conversationId), conversationState) ;
+    }
+    
+    /**
+     * Get the conversation state for the specified conversation.
+     * @param conversationId The conversation id.
+     * @return The conversation state or null.
+     */
+    public static synchronized ProxyConversationState getConversationState(final String conversationId)
+    {
+        return (ProxyConversationState)conversationStateMap.get(mapConversationId(conversationId)) ;
+    }
+    
+    /**
+     * Clear the conversation state for the specified conversation.
+     * @param conversationId The conversation id.
+     */
+    public static synchronized void clearConversationState(final String conversationId)
+    {
+        conversationStateMap.remove(mapConversationId(conversationId)) ;
+    }
+    
+    /**
+     * Is the conversation id an internal id?
+     * @param conversationId The conversation id.
+     * @return True if the conversation id is internal, false if it is external.
+     */
+    public static boolean isInternalConversationId(final String conversationId)
+    {
+        return ((conversationId != null) && (conversationId.length() != 0) && (conversationId.charAt(0) == INTERNAL_ID)) ;
+    }
+    
+    /**
+     * Get the alternate conversation id.
+     * @param conversationId The current conversation id.
+     * @return The alternate conversation id.
+     */
+    public static String getAlternateConversationId(final String conversationId)
+    {
+        if ((conversationId == null) || (conversationId.length() == 0))
+        {
+            return conversationId ;
+        }
+        if (conversationId.charAt(0) == INTERNAL_ID)
+        {
+            return EXTERNAL_ID + mapConversationId(conversationId) ;
+        }
+        else
+        {
+            return INTERNAL_ID + mapConversationId(conversationId) ;
+        }
+    }
+    
+    /**
+     * Get the map conversation id.
+     * @param conversationId The full conversation id.
+     * @return The conversation id for the map.
+     */
+    private static String mapConversationId(final String conversationId)
+    {
+        if ((conversationId == null) || (conversationId.length() == 0))
+        {
+            return conversationId ;
+        }
+        return conversationId.substring(1) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversationState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversationState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversationState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,24 +0,0 @@
-package com.jboss.transaction.wstf.proxy;
-
-import org.xml.sax.ContentHandler;
-
-/**
- * Interface representing a conversation state.
- */
-public interface ProxyConversationState
-{
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public boolean handleAction(final String action, final String identifier) ;
-
-    /**
-     * Get the Handler for rewriting the XML.
-     * @param nextHandler The next handler in the sequence.
-     * @return The handler or null if no rewriting required.
-     */
-    public ContentHandler getHandler(final ContentHandler nextHandler) ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversationState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversationState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversationState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyConversationState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.proxy;
+
+import org.xml.sax.ContentHandler;
+
+/**
+ * Interface representing a conversation state.
+ */
+public interface ProxyConversationState
+{
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public boolean handleAction(final String action, final String identifier) ;
+
+    /**
+     * Get the Handler for rewriting the XML.
+     * @param nextHandler The next handler in the sequence.
+     * @return The handler or null if no rewriting required.
+     */
+    public ContentHandler getHandler(final ContentHandler nextHandler) ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,412 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, Arjuna Technologies Limited.
- *
- * $Id: DummyListenerService.java,v 1.2 2004/06/24 13:52:53 nmcl Exp $
- */
-
-package com.jboss.transaction.wstf.proxy;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Enumeration;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-public class ProxyListenerService extends HttpServlet
-{
-    /**
-     * The SOAP 1.1 content type.
-     */
-    private static final String SOAP_11_CONTENT_TYPE = "text/xml" ;
-    /**
-     * The SOAP 1.2 content type.
-     */
-    private static final String SOAP_12_CONTENT_TYPE = "application/soap+xml" ;
-    /**
-     * The name of the SOAP Action header.
-     */
-    public static final String SOAP_ACTION_HEADER = "SOAPAction" ;
-    /**
-     * The name of the Transfer encoding header.
-     */
-    public static final String TRANSFER_ENCODING_HEADER = "transfer-encoding" ;
-    /**
-     * The name of the SOAP Action header.
-     */
-    public static final String TRANSFER_ENCODING_VALUE_CHUNKED = "chunked" ;
-    /**
-     * The default data size.
-     */
-    private static final int DEFAULT_DATA_SIZE = 256 ;
-    
-    /**
-     * Initialise the servlet.
-     * @param config The servlet configuration.
-     */
-    public void init(final ServletConfig config)
-        throws ServletException
-    {
-        super.init(config);
-        
-        // Initialise the local host:port/urlstub for the proxy.
-        final String proxyServiceURI = config.getInitParameter("proxyServiceURI") ;
-        if (proxyServiceURI == null)
-        {
-            throw new ServletException("Proxy service URI missing") ;
-        }
-        ProxyURIRewriting.setProxyURI(proxyServiceURI) ;
-    }
-    
-    /**
-     * Handle the post request.
-     * @param httpServletRequest The current HTTP servlet request.
-     * @param httpServletResponse The current HTTP servlet response.
-     */
-    public void doPost(final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse)
-        throws ServletException, IOException
-    {
-        final String conversationIdentifier = getConversationIdentifier(httpServletRequest) ;
-        
-        final byte[] requestContents = getContents(httpServletRequest.getInputStream()) ;
-        final String soapAction = httpServletRequest.getHeader(SOAP_ACTION_HEADER) ;
-        final boolean jbossClient = ProxyConversation.isInternalConversationId(conversationIdentifier) ;
-        final String alternateConversationIdentifier = ProxyConversation.getAlternateConversationId(conversationIdentifier) ;
-        
-        final ProxyConversationState state = ProxyConversation.getConversationState(conversationIdentifier) ;
-
-System.out.println("KEV: processing SOAP action " + trimAction(soapAction)) ;
-        // Search header for wsa:To and wsa:Address elements, changing their URL parts as we go.
-        // Get the target URL from the to.
-        try
-        {
-            final StringWriter newMessageWriter = new StringWriter() ;
-            final WriterSAXHandler writerHandler = new WriterSAXHandler(newMessageWriter) ;
-            final AddressingProxySAXHandler addressingHandler = new AddressingProxySAXHandler(writerHandler, alternateConversationIdentifier) ;
-            
-            ContentHandler stateHandler = (state == null ? null : state.getHandler(addressingHandler)) ;
-            ContentHandler parserHandler = (stateHandler == null ? addressingHandler : stateHandler) ;
-            
-            final XMLReader xmlReader = XMLReaderFactory.createXMLReader() ;
-            xmlReader.setContentHandler(parserHandler) ;
-            xmlReader.parse(new InputSource(new ByteArrayInputStream(requestContents))) ;
-            
-            final StringBuffer newMessageBuffer = newMessageWriter.getBuffer() ;
-            final StringBuffer messageBuffer = (jbossClient ? newMessageBuffer : new StringBuffer(new String(requestContents))) ;
-            
-            ProxyConversation.appendConversation(conversationIdentifier, checkForXMLDecl(messageBuffer)) ;
-
-            final String identifier = addressingHandler.getIdentifier() ;
-            if ((state != null) && state.handleAction(trimAction(soapAction), identifier))  
-            {
-                httpServletResponse.setStatus(HttpServletResponse.SC_ACCEPTED) ;
-                httpServletResponse.flushBuffer() ;
-                return ;
-            }
-            
-            // parse input stream
-            
-            final URL destURL = new URL(addressingHandler.getToAddress()) ;
-            final HttpURLConnection destConnection = (HttpURLConnection)destURL.openConnection() ;
-            try
-            {
-                destConnection.setDoOutput(true) ;
-                destConnection.setUseCaches(false) ;
-                
-                // copy the headers
-                final Enumeration headerNameEnum = httpServletRequest.getHeaderNames() ;
-                while(headerNameEnum.hasMoreElements())
-                {
-                    final String name = (String)headerNameEnum.nextElement() ;
-                    if (name.equalsIgnoreCase(TRANSFER_ENCODING_HEADER))
-                    {
-                        // any messages we send are not chunked!
-                        final String value = httpServletRequest.getHeader(name) ;
-                        if (!value.equalsIgnoreCase(TRANSFER_ENCODING_VALUE_CHUNKED))
-                        {
-                            // this may actually cause a problem depending upon the encoding but try it anyway
-                            destConnection.setRequestProperty(name, value) ;
-                        }
-                    }
-                    else
-                    {
-                        final String value = httpServletRequest.getHeader(name) ;
-                        destConnection.setRequestProperty(name, value) ;
-                    }
-                }
-                
-                // Set content length
-                destConnection.setRequestProperty("Content-Length", Integer.toString(newMessageBuffer.length())) ;
-        		final int port = destURL.getPort() ;
-        		final String host = (port > 0 ? destURL.getHost() + ":" + port : destURL.getHost()) ;
-                destConnection.setRequestProperty("Host", host) ;
-                destConnection.setRequestMethod("POST") ;
-                // Connect
-                destConnection.connect() ;
-                // Write the new request
-                final OutputStream os = destConnection.getOutputStream() ;
-                os.write(newMessageBuffer.toString().getBytes()) ;
-                os.flush() ;
-                os.close() ;
-                
-                final int responseCode = destConnection.getResponseCode() ;
-                final String fullContentType = destConnection.getContentType() ;
-                final String contentType = getContentType(fullContentType) ;
-                switch (responseCode)
-                {
-                    case HttpServletResponse.SC_OK:
-                    case HttpServletResponse.SC_ACCEPTED:
-                        if ((contentType != null) && !(SOAP_11_CONTENT_TYPE.equals(contentType) ||
-                            SOAP_12_CONTENT_TYPE.equals(contentType)))
-                        {
-                            httpServletResponse.setStatus(HttpServletResponse.SC_ACCEPTED) ;
-                            httpServletResponse.flushBuffer() ;
-                            break ;
-                        }
-                        // FALL THRU
-                    default:
-                        // Pass the response back.
-                        httpServletResponse.setStatus(destConnection.getResponseCode()) ;
-                        if (fullContentType != null)
-                        {
-                            httpServletResponse.setContentType(fullContentType) ;
-                        }
-                        
-                        // Copy data
-                        final int datasize = DEFAULT_DATA_SIZE ;
-                        final char[] data = new char[datasize] ;
-                        int readCount ;
-                        
-                        final InputStream is ;
-                        if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR)
-                        {
-                            is = destConnection.getErrorStream() ;
-                        }
-                        else
-                        {
-                            is = destConnection.getInputStream() ;
-                        }
-                        if (is != null) {
-                            final byte[] responseBytes = getContents(is) ;
-                            if (responseBytes.length > 0) {
-                                try
-                                {
-                                    final StringWriter newResponseWriter = new StringWriter() ;
-                                    final WriterSAXHandler responseWriterHandler = new WriterSAXHandler(newResponseWriter) ;
-                                    final AddressingProxySAXHandler responseAddressingHandler = new AddressingProxySAXHandler(responseWriterHandler, alternateConversationIdentifier) ;
-
-                                    // refetch the state handler so it gets a chance to go away
-                                    stateHandler = (state == null ? null : state.getHandler(responseAddressingHandler)) ;
-                                    parserHandler = (stateHandler == null ? responseAddressingHandler : stateHandler) ;
-
-                                    // always use the standard handler for replies?
-                                    final XMLReader responseXmlReader = XMLReaderFactory.createXMLReader() ;
-                                    responseXmlReader.setContentHandler(parserHandler) ;
-                                    responseXmlReader.parse(new InputSource(new ByteArrayInputStream(responseBytes))) ;
-
-                                    final StringBuffer newResponseBuffer = newResponseWriter.getBuffer() ;
-                                    final String newResponseString = newResponseBuffer.toString();
-
-                                    final String responseString = (jbossClient ? newResponseString : new String(responseBytes));
-                                    if ((contentType != null) && !(SOAP_11_CONTENT_TYPE.equals(contentType) ||
-                                            SOAP_12_CONTENT_TYPE.equals(contentType)))
-                                    {
-                                        ProxyConversation.appendConversation(conversationIdentifier, escapeContents(responseString)) ;
-                                    }
-                                    else
-                                    {
-                                        ProxyConversation.appendConversation(conversationIdentifier, responseString) ;
-                                    }
-                                    final ServletOutputStream sos = httpServletResponse.getOutputStream() ;
-                                    sos.print(newResponseString) ;
-                                    sos.flush() ;
-                                    httpServletResponse.setContentLength(newResponseString.length()) ;
-                                }
-                                finally
-                                {
-                                    is.close() ;
-                                }
-                            } else {
-                                httpServletResponse.setContentLength(0) ;
-                            }
-                        } else {
-                            httpServletResponse.setContentLength(0) ;
-                        }
-                        break ;
-                }
-            }
-            finally
-            {
-                destConnection.disconnect() ;
-            }
-        }
-        catch (Exception exception)
-        {
-            System.err.println("Proxy Listener Service: " + exception);
-            exception.printStackTrace() ;
-        }
-        catch (Error error)
-        {
-            System.err.println("Proxy Listener Service: " + error);
-            error.printStackTrace() ;
-        }
-    }
-    
-    /**
-     * Trim quotes from the action.
-     * @param action The action.
-     * @return The trimmed action.
-     */
-    private static String trimAction(final String action)
-    {
-        final int length = (action == null ? 0 : action.length()) ;
-        if ((length < 2) || (action.charAt(0) != '"') || (action.charAt(length-1) != '"'))
-        {
-            return action ;
-        }
-        return action.substring(1, length-1) ;
-    }
-
-    /**
-     * Get the content type part.
-     * @param fullContentType The full content type.
-     * @return The content type.
-     */
-    private static String getContentType(final String fullContentType)
-    {
-        if (fullContentType == null)
-        {
-            return null ;
-        }
-        final int separatorIndex = fullContentType.indexOf(';') ;
-        return (separatorIndex == -1 ? fullContentType : fullContentType.substring(0, separatorIndex)) ;
-    }
-
-    /**
-     * Get the conversation identifier from the request.
-     * @return The conversation identifier.
-     */
-    private static String getConversationIdentifier(final HttpServletRequest httpServletRequest)
-    {
-        final String pathInfo = httpServletRequest.getPathInfo() ;
-        final int separator = pathInfo.indexOf('/', 1) ;
-        return pathInfo.substring(1, separator) ;
-    }
-    
-    /**
-     * Get the contents of the input stream
-     * @param is The input stream.
-     * @return The contents.
-     * @throws IOException for errors.
-     */
-    private byte[] getContents(final InputStream is)
-    	throws IOException
-    {
-        final ByteArrayOutputStream baos = new ByteArrayOutputStream() ;
-        final byte[] buffer = new byte[1024] ;
-        int readCount ;
-        do
-        {
-            readCount = is.read(buffer, 0, buffer.length) ;
-            if (readCount > 0)
-            {
-                baos.write(buffer, 0, readCount) ;
-            }
-        }
-        while(readCount > 0) ;
-        return baos.toByteArray() ;
-    }
-    
-    /**
-     * Check for the XML declaration and remove.
-     * This method is only used if we are intending to log the SOAP message so that it is easy to combine the XML without creating invalid documents.
-     * @param contents The current stream contents.
-     * @return The stream contents as a string.
-     */
-    private static String checkForXMLDecl(final StringBuffer contents)
-    {
-        int count = 0 ;
-        try
-        {
-            while(Character.isWhitespace(contents.charAt(count))) count++ ;
-            if (contents.charAt(count) == '<')
-            {
-                if (contents.charAt(count+1) == '?')
-                {
-                    count+=2 ;
-                    while(contents.charAt(count++) != '>') ;
-                }
-            }
-            if (count > 0)
-            {
-                contents.delete(0, count) ;
-            }
-        }
-        catch (final StringIndexOutOfBoundsException sioobe) {}
-        
-        return contents.toString() ;
-    }
-    
-    /**
-     * Escape the contents of the string.
-     * @param contents The original contents.
-     * @return The escaped contents.
-     */
-    private static String escapeContents(final String contents)
-    {
-        final int length = contents.length() ;
-        StringWriter escapedContents = null ;
-        
-        for(int count = 0 ; count < length ; count++)
-        {
-            final char ch = contents.charAt(count) ;
-            if ((ch == '<') || (ch == '>') || (ch == '&') || (ch == '"'))
-            {
-                if (escapedContents == null)
-                {
-                    escapedContents = new StringWriter(length) ;
-                    if (count > 0)
-                    {
-                        escapedContents.write(contents, 0, count-1) ;
-                    }
-                }
-                if (ch == '<')
-                {
-                    escapedContents.write("&lt;") ;
-                }
-                else if (ch == '>')
-                {
-                    escapedContents.write("&gt;") ;
-                }
-                else if (ch == '&')
-                {
-                    escapedContents.write("&amp;") ;
-                }
-                else if (ch == '"')
-                {
-                    escapedContents.write("&quot;") ;
-                }
-            }
-            else if (escapedContents != null)
-            {
-                escapedContents.write(ch) ;
-            }
-        }
-        return (escapedContents == null ? contents : escapedContents.toString()) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,432 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (c) 2002, 2003, Arjuna Technologies Limited.
+ *
+ * $Id: DummyListenerService.java,v 1.2 2004/06/24 13:52:53 nmcl Exp $
+ */
+
+package com.jboss.transaction.wstf.proxy;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Enumeration;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+public class ProxyListenerService extends HttpServlet
+{
+    /**
+     * The SOAP 1.1 content type.
+     */
+    private static final String SOAP_11_CONTENT_TYPE = "text/xml" ;
+    /**
+     * The SOAP 1.2 content type.
+     */
+    private static final String SOAP_12_CONTENT_TYPE = "application/soap+xml" ;
+    /**
+     * The name of the SOAP Action header.
+     */
+    public static final String SOAP_ACTION_HEADER = "SOAPAction" ;
+    /**
+     * The name of the Transfer encoding header.
+     */
+    public static final String TRANSFER_ENCODING_HEADER = "transfer-encoding" ;
+    /**
+     * The name of the SOAP Action header.
+     */
+    public static final String TRANSFER_ENCODING_VALUE_CHUNKED = "chunked" ;
+    /**
+     * The default data size.
+     */
+    private static final int DEFAULT_DATA_SIZE = 256 ;
+    
+    /**
+     * Initialise the servlet.
+     * @param config The servlet configuration.
+     */
+    public void init(final ServletConfig config)
+        throws ServletException
+    {
+        super.init(config);
+        
+        // Initialise the local host:port/urlstub for the proxy.
+        final String proxyServiceURI = config.getInitParameter("proxyServiceURI") ;
+        if (proxyServiceURI == null)
+        {
+            throw new ServletException("Proxy service URI missing") ;
+        }
+        ProxyURIRewriting.setProxyURI(proxyServiceURI) ;
+    }
+    
+    /**
+     * Handle the post request.
+     * @param httpServletRequest The current HTTP servlet request.
+     * @param httpServletResponse The current HTTP servlet response.
+     */
+    public void doPost(final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse)
+        throws ServletException, IOException
+    {
+        final String conversationIdentifier = getConversationIdentifier(httpServletRequest) ;
+        
+        final byte[] requestContents = getContents(httpServletRequest.getInputStream()) ;
+        final String soapAction = httpServletRequest.getHeader(SOAP_ACTION_HEADER) ;
+        final boolean jbossClient = ProxyConversation.isInternalConversationId(conversationIdentifier) ;
+        final String alternateConversationIdentifier = ProxyConversation.getAlternateConversationId(conversationIdentifier) ;
+        
+        final ProxyConversationState state = ProxyConversation.getConversationState(conversationIdentifier) ;
+
+System.out.println("KEV: processing SOAP action " + trimAction(soapAction)) ;
+        // Search header for wsa:To and wsa:Address elements, changing their URL parts as we go.
+        // Get the target URL from the to.
+        try
+        {
+            final StringWriter newMessageWriter = new StringWriter() ;
+            final WriterSAXHandler writerHandler = new WriterSAXHandler(newMessageWriter) ;
+            final AddressingProxySAXHandler addressingHandler = new AddressingProxySAXHandler(writerHandler, alternateConversationIdentifier) ;
+            
+            ContentHandler stateHandler = (state == null ? null : state.getHandler(addressingHandler)) ;
+            ContentHandler parserHandler = (stateHandler == null ? addressingHandler : stateHandler) ;
+            
+            final XMLReader xmlReader = XMLReaderFactory.createXMLReader() ;
+            xmlReader.setContentHandler(parserHandler) ;
+            xmlReader.parse(new InputSource(new ByteArrayInputStream(requestContents))) ;
+            
+            final StringBuffer newMessageBuffer = newMessageWriter.getBuffer() ;
+            final StringBuffer messageBuffer = (jbossClient ? newMessageBuffer : new StringBuffer(new String(requestContents))) ;
+            
+            ProxyConversation.appendConversation(conversationIdentifier, checkForXMLDecl(messageBuffer)) ;
+
+            final String identifier = addressingHandler.getIdentifier() ;
+            if ((state != null) && state.handleAction(trimAction(soapAction), identifier))  
+            {
+                httpServletResponse.setStatus(HttpServletResponse.SC_ACCEPTED) ;
+                httpServletResponse.flushBuffer() ;
+                return ;
+            }
+            
+            // parse input stream
+            
+            final URL destURL = new URL(addressingHandler.getToAddress()) ;
+            final HttpURLConnection destConnection = (HttpURLConnection)destURL.openConnection() ;
+            try
+            {
+                destConnection.setDoOutput(true) ;
+                destConnection.setUseCaches(false) ;
+                
+                // copy the headers
+                final Enumeration headerNameEnum = httpServletRequest.getHeaderNames() ;
+                while(headerNameEnum.hasMoreElements())
+                {
+                    final String name = (String)headerNameEnum.nextElement() ;
+                    if (name.equalsIgnoreCase(TRANSFER_ENCODING_HEADER))
+                    {
+                        // any messages we send are not chunked!
+                        final String value = httpServletRequest.getHeader(name) ;
+                        if (!value.equalsIgnoreCase(TRANSFER_ENCODING_VALUE_CHUNKED))
+                        {
+                            // this may actually cause a problem depending upon the encoding but try it anyway
+                            destConnection.setRequestProperty(name, value) ;
+                        }
+                    }
+                    else
+                    {
+                        final String value = httpServletRequest.getHeader(name) ;
+                        destConnection.setRequestProperty(name, value) ;
+                    }
+                }
+                
+                // Set content length
+                destConnection.setRequestProperty("Content-Length", Integer.toString(newMessageBuffer.length())) ;
+        		final int port = destURL.getPort() ;
+        		final String host = (port > 0 ? destURL.getHost() + ":" + port : destURL.getHost()) ;
+                destConnection.setRequestProperty("Host", host) ;
+                destConnection.setRequestMethod("POST") ;
+                // Connect
+                destConnection.connect() ;
+                // Write the new request
+                final OutputStream os = destConnection.getOutputStream() ;
+                os.write(newMessageBuffer.toString().getBytes()) ;
+                os.flush() ;
+                os.close() ;
+                
+                final int responseCode = destConnection.getResponseCode() ;
+                final String fullContentType = destConnection.getContentType() ;
+                final String contentType = getContentType(fullContentType) ;
+                switch (responseCode)
+                {
+                    case HttpServletResponse.SC_OK:
+                    case HttpServletResponse.SC_ACCEPTED:
+                        if ((contentType != null) && !(SOAP_11_CONTENT_TYPE.equals(contentType) ||
+                            SOAP_12_CONTENT_TYPE.equals(contentType)))
+                        {
+                            httpServletResponse.setStatus(HttpServletResponse.SC_ACCEPTED) ;
+                            httpServletResponse.flushBuffer() ;
+                            break ;
+                        }
+                        // FALL THRU
+                    default:
+                        // Pass the response back.
+                        httpServletResponse.setStatus(destConnection.getResponseCode()) ;
+                        if (fullContentType != null)
+                        {
+                            httpServletResponse.setContentType(fullContentType) ;
+                        }
+                        
+                        // Copy data
+                        final int datasize = DEFAULT_DATA_SIZE ;
+                        final char[] data = new char[datasize] ;
+                        int readCount ;
+                        
+                        final InputStream is ;
+                        if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR)
+                        {
+                            is = destConnection.getErrorStream() ;
+                        }
+                        else
+                        {
+                            is = destConnection.getInputStream() ;
+                        }
+                        if (is != null) {
+                            final byte[] responseBytes = getContents(is) ;
+                            if (responseBytes.length > 0) {
+                                try
+                                {
+                                    final StringWriter newResponseWriter = new StringWriter() ;
+                                    final WriterSAXHandler responseWriterHandler = new WriterSAXHandler(newResponseWriter) ;
+                                    final AddressingProxySAXHandler responseAddressingHandler = new AddressingProxySAXHandler(responseWriterHandler, alternateConversationIdentifier) ;
+
+                                    // refetch the state handler so it gets a chance to go away
+                                    stateHandler = (state == null ? null : state.getHandler(responseAddressingHandler)) ;
+                                    parserHandler = (stateHandler == null ? responseAddressingHandler : stateHandler) ;
+
+                                    // always use the standard handler for replies?
+                                    final XMLReader responseXmlReader = XMLReaderFactory.createXMLReader() ;
+                                    responseXmlReader.setContentHandler(parserHandler) ;
+                                    responseXmlReader.parse(new InputSource(new ByteArrayInputStream(responseBytes))) ;
+
+                                    final StringBuffer newResponseBuffer = newResponseWriter.getBuffer() ;
+                                    final String newResponseString = newResponseBuffer.toString();
+
+                                    final String responseString = (jbossClient ? newResponseString : new String(responseBytes));
+                                    if ((contentType != null) && !(SOAP_11_CONTENT_TYPE.equals(contentType) ||
+                                            SOAP_12_CONTENT_TYPE.equals(contentType)))
+                                    {
+                                        ProxyConversation.appendConversation(conversationIdentifier, escapeContents(responseString)) ;
+                                    }
+                                    else
+                                    {
+                                        ProxyConversation.appendConversation(conversationIdentifier, responseString) ;
+                                    }
+                                    final ServletOutputStream sos = httpServletResponse.getOutputStream() ;
+                                    sos.print(newResponseString) ;
+                                    sos.flush() ;
+                                    httpServletResponse.setContentLength(newResponseString.length()) ;
+                                }
+                                finally
+                                {
+                                    is.close() ;
+                                }
+                            } else {
+                                httpServletResponse.setContentLength(0) ;
+                            }
+                        } else {
+                            httpServletResponse.setContentLength(0) ;
+                        }
+                        break ;
+                }
+            }
+            finally
+            {
+                destConnection.disconnect() ;
+            }
+        }
+        catch (Exception exception)
+        {
+            System.err.println("Proxy Listener Service: " + exception);
+            exception.printStackTrace() ;
+        }
+        catch (Error error)
+        {
+            System.err.println("Proxy Listener Service: " + error);
+            error.printStackTrace() ;
+        }
+    }
+    
+    /**
+     * Trim quotes from the action.
+     * @param action The action.
+     * @return The trimmed action.
+     */
+    private static String trimAction(final String action)
+    {
+        final int length = (action == null ? 0 : action.length()) ;
+        if ((length < 2) || (action.charAt(0) != '"') || (action.charAt(length-1) != '"'))
+        {
+            return action ;
+        }
+        return action.substring(1, length-1) ;
+    }
+
+    /**
+     * Get the content type part.
+     * @param fullContentType The full content type.
+     * @return The content type.
+     */
+    private static String getContentType(final String fullContentType)
+    {
+        if (fullContentType == null)
+        {
+            return null ;
+        }
+        final int separatorIndex = fullContentType.indexOf(';') ;
+        return (separatorIndex == -1 ? fullContentType : fullContentType.substring(0, separatorIndex)) ;
+    }
+
+    /**
+     * Get the conversation identifier from the request.
+     * @return The conversation identifier.
+     */
+    private static String getConversationIdentifier(final HttpServletRequest httpServletRequest)
+    {
+        final String pathInfo = httpServletRequest.getPathInfo() ;
+        final int separator = pathInfo.indexOf('/', 1) ;
+        return pathInfo.substring(1, separator) ;
+    }
+    
+    /**
+     * Get the contents of the input stream
+     * @param is The input stream.
+     * @return The contents.
+     * @throws IOException for errors.
+     */
+    private byte[] getContents(final InputStream is)
+    	throws IOException
+    {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream() ;
+        final byte[] buffer = new byte[1024] ;
+        int readCount ;
+        do
+        {
+            readCount = is.read(buffer, 0, buffer.length) ;
+            if (readCount > 0)
+            {
+                baos.write(buffer, 0, readCount) ;
+            }
+        }
+        while(readCount > 0) ;
+        return baos.toByteArray() ;
+    }
+    
+    /**
+     * Check for the XML declaration and remove.
+     * This method is only used if we are intending to log the SOAP message so that it is easy to combine the XML without creating invalid documents.
+     * @param contents The current stream contents.
+     * @return The stream contents as a string.
+     */
+    private static String checkForXMLDecl(final StringBuffer contents)
+    {
+        int count = 0 ;
+        try
+        {
+            while(Character.isWhitespace(contents.charAt(count))) count++ ;
+            if (contents.charAt(count) == '<')
+            {
+                if (contents.charAt(count+1) == '?')
+                {
+                    count+=2 ;
+                    while(contents.charAt(count++) != '>') ;
+                }
+            }
+            if (count > 0)
+            {
+                contents.delete(0, count) ;
+            }
+        }
+        catch (final StringIndexOutOfBoundsException sioobe) {}
+        
+        return contents.toString() ;
+    }
+    
+    /**
+     * Escape the contents of the string.
+     * @param contents The original contents.
+     * @return The escaped contents.
+     */
+    private static String escapeContents(final String contents)
+    {
+        final int length = contents.length() ;
+        StringWriter escapedContents = null ;
+        
+        for(int count = 0 ; count < length ; count++)
+        {
+            final char ch = contents.charAt(count) ;
+            if ((ch == '<') || (ch == '>') || (ch == '&') || (ch == '"'))
+            {
+                if (escapedContents == null)
+                {
+                    escapedContents = new StringWriter(length) ;
+                    if (count > 0)
+                    {
+                        escapedContents.write(contents, 0, count-1) ;
+                    }
+                }
+                if (ch == '<')
+                {
+                    escapedContents.write("&lt;") ;
+                }
+                else if (ch == '>')
+                {
+                    escapedContents.write("&gt;") ;
+                }
+                else if (ch == '&')
+                {
+                    escapedContents.write("&amp;") ;
+                }
+                else if (ch == '"')
+                {
+                    escapedContents.write("&quot;") ;
+                }
+            }
+            else if (escapedContents != null)
+            {
+                escapedContents.write(ch) ;
+            }
+        }
+        return (escapedContents == null ? contents : escapedContents.toString()) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyURIRewriting.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyURIRewriting.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyURIRewriting.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,139 +0,0 @@
-package com.jboss.transaction.wstf.proxy;
-
-
-/**
- * @author kevin
- */
-public class ProxyURIRewriting
-{
-    /**
-     * The base URI of the proxy.
-     */
-    private static String PROXY_URI ;
-    
-    /**
-     * Set the proxy URI.
-     * @param proxyURI The proxy URI.
-     */
-    public static synchronized void setProxyURI(final String proxyURI)
-    {
-        PROXY_URI = proxyURI ;
-    }
-    
-    /**
-     * Get the proxy URI.
-     * @return The proxy URI.
-     */
-    public static synchronized String getProxyURI()
-    {
-        return PROXY_URI ;
-    }
-    
-    /**
-     * Rewrite the URI.
-     * @param conversationIdentifier The conversation identifier.
-     * @param uri The uri to be rewritten.
-     * @return The replacement URI.
-     */
-    public static String rewriteURI(final String conversationIdentifier, final String uri)
-    {
-        final String proxyURI = getProxyURI() ;
-        
-        if (uri != null)
-        {
-            if (uri.startsWith(proxyURI))
-            {
-                final int separatorIndex = uri.indexOf('/', proxyURI.length()+1) ;
-                final String remainder = uri.substring(separatorIndex+1) ;
-                return decodeURI(remainder) ;
-            }
-            else if (!uri.startsWith("http://www.w3.org/"))
-            {
-                return proxyURI + "/" + conversationIdentifier + "/" + encodeURI(uri) ;
-            }
-        }
-        return uri ;
-    }
-    
-    /**
-     * Decode a URI that has been encoded.
-     * @param uri The encoded URI.
-     * @return The decoded URI.
-     */
-    public static String decodeURI(final String uri)
-    {
-        if (uri == null)
-        {
-            return null ;
-        }
-        final StringBuffer result = new StringBuffer() ;
-        final int length = uri.length() ;
-        int separatorCount = 0 ;
-        for(int count = 0 ; count < length ; count++)
-        {
-            final char ch = uri.charAt(count) ;
-            if (separatorCount < 3)
-            {
-                if (ch == '-')
-                {
-                    result.append("/") ;
-                    separatorCount++ ;
-                    continue ;
-                }
-                else if (ch == '_')
-                {
-                    result.append(":") ;
-                    continue ;
-                }
-                result.append(ch) ;
-            }
-            else
-            {
-                result.append(ch) ;
-            }
-        }
-        return result.toString() ;
-    }
-    
-    /**
-     * Encode a URI.
-     * @param uri The URI.
-     * @return The encoded URI.
-     */
-    public static String encodeURI(final String uri)
-    {
-        if (uri == null)
-        {
-            return "" ;
-        }
-        
-        final StringBuffer result = new StringBuffer() ;
-        final int length = uri.length() ;
-        int separatorCount = 0 ;
-        for(int count = 0 ; count < length ; count++)
-        {
-            final char ch = uri.charAt(count) ;
-            if (separatorCount < 3)
-            {
-                if (ch == '/')
-                {
-                    separatorCount++ ;
-                    result.append("-") ;
-                }
-                else if (ch == ':')
-                {
-                    result.append("_") ;
-                }
-                else
-                {
-                    result.append(ch) ;
-                }
-            }
-            else
-            {
-                result.append(ch) ;
-            }
-        }
-        return result.toString() ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyURIRewriting.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyURIRewriting.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyURIRewriting.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyURIRewriting.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,159 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.proxy;
+
+
+/**
+ * @author kevin
+ */
+public class ProxyURIRewriting
+{
+    /**
+     * The base URI of the proxy.
+     */
+    private static String PROXY_URI ;
+    
+    /**
+     * Set the proxy URI.
+     * @param proxyURI The proxy URI.
+     */
+    public static synchronized void setProxyURI(final String proxyURI)
+    {
+        PROXY_URI = proxyURI ;
+    }
+    
+    /**
+     * Get the proxy URI.
+     * @return The proxy URI.
+     */
+    public static synchronized String getProxyURI()
+    {
+        return PROXY_URI ;
+    }
+    
+    /**
+     * Rewrite the URI.
+     * @param conversationIdentifier The conversation identifier.
+     * @param uri The uri to be rewritten.
+     * @return The replacement URI.
+     */
+    public static String rewriteURI(final String conversationIdentifier, final String uri)
+    {
+        final String proxyURI = getProxyURI() ;
+        
+        if (uri != null)
+        {
+            if (uri.startsWith(proxyURI))
+            {
+                final int separatorIndex = uri.indexOf('/', proxyURI.length()+1) ;
+                final String remainder = uri.substring(separatorIndex+1) ;
+                return decodeURI(remainder) ;
+            }
+            else if (!uri.startsWith("http://www.w3.org/"))
+            {
+                return proxyURI + "/" + conversationIdentifier + "/" + encodeURI(uri) ;
+            }
+        }
+        return uri ;
+    }
+    
+    /**
+     * Decode a URI that has been encoded.
+     * @param uri The encoded URI.
+     * @return The decoded URI.
+     */
+    public static String decodeURI(final String uri)
+    {
+        if (uri == null)
+        {
+            return null ;
+        }
+        final StringBuffer result = new StringBuffer() ;
+        final int length = uri.length() ;
+        int separatorCount = 0 ;
+        for(int count = 0 ; count < length ; count++)
+        {
+            final char ch = uri.charAt(count) ;
+            if (separatorCount < 3)
+            {
+                if (ch == '-')
+                {
+                    result.append("/") ;
+                    separatorCount++ ;
+                    continue ;
+                }
+                else if (ch == '_')
+                {
+                    result.append(":") ;
+                    continue ;
+                }
+                result.append(ch) ;
+            }
+            else
+            {
+                result.append(ch) ;
+            }
+        }
+        return result.toString() ;
+    }
+    
+    /**
+     * Encode a URI.
+     * @param uri The URI.
+     * @return The encoded URI.
+     */
+    public static String encodeURI(final String uri)
+    {
+        if (uri == null)
+        {
+            return "" ;
+        }
+        
+        final StringBuffer result = new StringBuffer() ;
+        final int length = uri.length() ;
+        int separatorCount = 0 ;
+        for(int count = 0 ; count < length ; count++)
+        {
+            final char ch = uri.charAt(count) ;
+            if (separatorCount < 3)
+            {
+                if (ch == '/')
+                {
+                    separatorCount++ ;
+                    result.append("-") ;
+                }
+                else if (ch == ':')
+                {
+                    result.append("_") ;
+                }
+                else
+                {
+                    result.append(ch) ;
+                }
+            }
+            else
+            {
+                result.append(ch) ;
+            }
+        }
+        return result.toString() ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/WriterSAXHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/WriterSAXHandler.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/WriterSAXHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,394 +0,0 @@
-/*
- * Created on 20-Jan-2005
- */
-package com.jboss.transaction.wstf.proxy;
-
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-
-/**
- * Sax parser for rewriting the XML via the proxy.
- * @author kevin
- */
-public class WriterSAXHandler implements ContentHandler
-{
-    /**
-     * Do we need to end the start tag?
-     */
-    private boolean endStartTag ;
-    /**
-     * The to address.
-     */
-    private String toAddress ;
-    /**
-     * The identifier.
-     */
-    private String identifier ;
-    /**
-     * The string buffer for text element content.
-     */
-    private StringBuffer characterContent = new StringBuffer() ;
-    /**
-     * The new namespaces.
-     */
-    private List newNamespaces = new ArrayList() ;
-    /**
-     * The stack of active namespaces.
-     */
-    private Stack namespaceStack = new Stack() ;
-    /**
-     * The active namespaces.
-     */
-    private Map activeNamespaces = new HashMap() ;
-    
-    /**
-     * The writer for output.
-     */
-    private final PrintWriter printWriter ;
-    
-    /**
-     * Construct the SAX handler with the output writer.
-     * @param writer The writer for output.
-     */
-    public WriterSAXHandler(final Writer writer)
-    {
-        this.printWriter = new PrintWriter(writer) ;
-    }
-    
-    /**
-     * Set the document locator.
-     * @param locator The document locator.
-     */
-    public void setDocumentLocator(final Locator locator)
-    {
-    }
-    
-    /**
-     * Handle the procesing instruction.
-     * @param target The pi target.
-     * @param data The pi data.
-     * @throws SAXException for any errors.
-     */
-    public void processingInstruction(final String target, final String data)
-        throws SAXException
-    {
-    }
-    
-    /**
-     * Start the document.
-     * @throws SAXException for any errors.
-     */
-    public void startDocument()
-    	throws SAXException
-    {
-    }
-    
-    /**
-     * End the document.
-     * @throws SAXException for any errors.
-     */
-    public void endDocument()
-    	throws SAXException
-    {
-        printWriter.flush() ;
-    }
-    
-    /**
-     * Start a prefix mapping.
-     * @param prefix The namespace prefix.
-     * @param uri The namespace uri.
-     * @throws SAXException for any errors.
-     */
-    public void startPrefixMapping(final String prefix, final String uri)
-        throws SAXException
-    {
-        newNamespaces.add(new NamespaceInfo(prefix, uri)) ;
-    }
-    
-    /**
-     * End the prefix mapping.
-     * @param prefix The namespace prefix.
-     * @throws SAXException for any errors.
-     */
-    public void endPrefixMapping(final String prefix)
-    	throws SAXException
-    {
-    }
-    
-    /**
-     * Start an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @param attributes The element attributes.
-     * @throws SAXException for any errors.
-     */
-    public void startElement(final String uri, final String localName, final String qName,
-        final Attributes attributes)
-    	throws SAXException
-    {
-        checkEndStartTag() ;
-        
-        namespaceStack.push(activeNamespaces) ;
-        final Iterator newNamespacesIter = newNamespaces.iterator() ;
-        final String namespaces ;
-        if (newNamespacesIter.hasNext())
-        {
-            final HashMap newActiveNamespaces = new HashMap(activeNamespaces) ;
-            final StringBuffer namespacesValue = new StringBuffer() ;
-            do
-            {
-                final NamespaceInfo namespaceInfo = (NamespaceInfo)newNamespacesIter.next() ;
-                final String namespacePrefix = namespaceInfo.getPrefix() ;
-                final String namespaceURI = namespaceInfo.getURI() ;
-                newActiveNamespaces.put(namespaceURI, namespacePrefix) ;
-               
-                namespacesValue.append(" xmlns") ;
-                if ((namespacePrefix != null) && (namespacePrefix.length() > 0))
-                {
-                    namespacesValue.append(':') ;
-                    namespacesValue.append(namespacePrefix) ;
-                }
-                namespacesValue.append("=\"") ;
-                namespacesValue.append(namespaceURI) ;
-                namespacesValue.append('"') ;
-            }
-            while(newNamespacesIter.hasNext()) ;
-            newNamespaces.clear() ;
-            activeNamespaces = newActiveNamespaces ;
-            namespaces = namespacesValue.toString() ;
-        }
-        else
-        {
-            namespaces = null ;
-        }
-        
-        printWriter.write('<') ;
-        printWriter.write(getQName(uri, localName, qName)) ;
-        if (namespaces != null)
-        {
-            printWriter.write(namespaces) ;
-        }
-        
-        final int numAttributes = attributes.getLength() ;
-        if (numAttributes > 0)
-        {
-            for(int count = 0 ; count < numAttributes ; count++)
-            {
-                printWriter.write(' ') ;
-                final String attributeQName = getQName(attributes.getURI(count), attributes.getLocalName(count), attributes.getQName(count)) ;
-                printWriter.write(attributeQName) ;
-                printWriter.write("=\"") ;
-                final String value = attributes.getValue(count) ;
-                escapeTextContent(value.toCharArray(), 0, value.length()) ;
-                printWriter.write('"') ;
-            }
-        }
-        
-        endStartTag = true ;
-    }
-    
-    /**
-     * End an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @throws SAXException for any errors.
-     */
-    public void endElement(final String uri, final String localName, final String qName)
-        throws SAXException
-    {
-        characterContent.setLength(0) ;
-        if (endStartTag)
-        {
-            printWriter.write("/>") ;
-        }
-        else
-        {
-            printWriter.write("</") ;
-            printWriter.write(qName) ;
-            printWriter.write('>') ;
-        }
-        activeNamespaces = (Map)namespaceStack.pop() ;
-        endStartTag = false ;
-    }
-    
-    /**
-     * Process character text.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     * @throws SAXException for any errors.
-     */
-    public void characters(char[] chars, int start, int length)
-        throws SAXException
-    {
-        checkEndStartTag() ;
-        escapeTextContent(chars, start, length) ;
-    }
-    
-    /**
-     * Process ignorable white space.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     * @throws SAXException for any errors.
-     */
-    public void ignorableWhitespace(char[] chars, int start, int length)
-        throws SAXException
-    {
-        checkEndStartTag() ;
-        printWriter.write(chars, start, length) ;
-    }
-    
-    /**
-     * Skip an entity.
-     * @throws SAXException for any errors.
-     */
-    public void skippedEntity(final String name)
-    	throws SAXException
-    {
-    }
-    
-    /**
-     * Get the qualified name of the element/attribute.
-     * @param uri The qualifed namespace uri or empty string.
-     * @param localName The qualified local name.
-     * @param qName The qualified name.
-     * @return The qualified name of the element/attribute.
-     */
-    private String getQName(final String uri, final String localName, final String qName)
-    {
-        if (uri.length() > 0)
-        {
-            final String prefix = (String)activeNamespaces.get(uri) ;
-            if (prefix.length() > 0)
-            {
-                return prefix + ":" + localName ;
-            }
-            else
-            {
-                return localName ;
-            }
-        }
-        else
-        {
-            return qName ;
-        }
-    }
-    
-    /**
-     * Check to see if the end of the start tag has been processed.
-     */
-    private void checkEndStartTag()
-    {
-        if (endStartTag)
-        {
-            printWriter.write('>') ;
-            endStartTag = false ;
-        }
-    }
-    
-    /**
-     * Escape the contents of a text element.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     */
-    private void escapeTextContent(final char[] chars, final int start, final int length)
-    {
-        final int end = start + length ;
-        for(int count = start ; count < end ; count++)
-        {
-            final char ch = chars[count] ;
-            switch(ch)
-            {
-                case '<':
-                    printWriter.print("&lt;") ;
-                    break ;
-                case '>':
-                    printWriter.print("&gt;") ;
-                    break ;
-                case '&':
-                    printWriter.print("&amp;") ;
-                    break ;
-                case '"':
-                    printWriter.print("&quot;") ;
-                    break ;
-                default:
-                    printWriter.print(ch) ;
-                    break ;
-            }
-        }
-    }
-    
-    /**
-     * Return the to address from the processing.
-     * @return The to address.
-     */
-    public String getToAddress()
-    {
-        return toAddress ;
-    }
-    
-    /**
-     * Return the identifier from the processing.
-     * @return The identifier.
-     */
-    public String getIdentifier()
-    {
-        return identifier ;
-    }
-    
-    private static final class NamespaceInfo
-    {
-        /**
-         * The namespace prefix.
-         */
-        private final String prefix ;
-        /**
-         * The namespace uri.
-         */
-        private final String uri ;
-        
-        /**
-         * Construct the namespace information.
-         * @param prefix The namespace prefix.
-         * @param uri The namespace uri.
-         */
-        NamespaceInfo(final String prefix, final String uri)
-        {
-            this.prefix = prefix ;
-            this.uri = uri ;
-        }
-        
-        /**
-         * Get the namespace prefix.
-         * @return The namespace prefix.
-         */
-        String getPrefix()
-        {
-            return prefix ;
-        }
-        
-        /**
-         * Get the namespace URI.
-         * @return The namespace URI.
-         */
-        String getURI()
-        {
-            return uri ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/WriterSAXHandler.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/WriterSAXHandler.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/WriterSAXHandler.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/WriterSAXHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,414 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Created on 20-Jan-2005
+ */
+package com.jboss.transaction.wstf.proxy;
+
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+/**
+ * Sax parser for rewriting the XML via the proxy.
+ * @author kevin
+ */
+public class WriterSAXHandler implements ContentHandler
+{
+    /**
+     * Do we need to end the start tag?
+     */
+    private boolean endStartTag ;
+    /**
+     * The to address.
+     */
+    private String toAddress ;
+    /**
+     * The identifier.
+     */
+    private String identifier ;
+    /**
+     * The string buffer for text element content.
+     */
+    private StringBuffer characterContent = new StringBuffer() ;
+    /**
+     * The new namespaces.
+     */
+    private List newNamespaces = new ArrayList() ;
+    /**
+     * The stack of active namespaces.
+     */
+    private Stack namespaceStack = new Stack() ;
+    /**
+     * The active namespaces.
+     */
+    private Map activeNamespaces = new HashMap() ;
+    
+    /**
+     * The writer for output.
+     */
+    private final PrintWriter printWriter ;
+    
+    /**
+     * Construct the SAX handler with the output writer.
+     * @param writer The writer for output.
+     */
+    public WriterSAXHandler(final Writer writer)
+    {
+        this.printWriter = new PrintWriter(writer) ;
+    }
+    
+    /**
+     * Set the document locator.
+     * @param locator The document locator.
+     */
+    public void setDocumentLocator(final Locator locator)
+    {
+    }
+    
+    /**
+     * Handle the procesing instruction.
+     * @param target The pi target.
+     * @param data The pi data.
+     * @throws SAXException for any errors.
+     */
+    public void processingInstruction(final String target, final String data)
+        throws SAXException
+    {
+    }
+    
+    /**
+     * Start the document.
+     * @throws SAXException for any errors.
+     */
+    public void startDocument()
+    	throws SAXException
+    {
+    }
+    
+    /**
+     * End the document.
+     * @throws SAXException for any errors.
+     */
+    public void endDocument()
+    	throws SAXException
+    {
+        printWriter.flush() ;
+    }
+    
+    /**
+     * Start a prefix mapping.
+     * @param prefix The namespace prefix.
+     * @param uri The namespace uri.
+     * @throws SAXException for any errors.
+     */
+    public void startPrefixMapping(final String prefix, final String uri)
+        throws SAXException
+    {
+        newNamespaces.add(new NamespaceInfo(prefix, uri)) ;
+    }
+    
+    /**
+     * End the prefix mapping.
+     * @param prefix The namespace prefix.
+     * @throws SAXException for any errors.
+     */
+    public void endPrefixMapping(final String prefix)
+    	throws SAXException
+    {
+    }
+    
+    /**
+     * Start an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @param attributes The element attributes.
+     * @throws SAXException for any errors.
+     */
+    public void startElement(final String uri, final String localName, final String qName,
+        final Attributes attributes)
+    	throws SAXException
+    {
+        checkEndStartTag() ;
+        
+        namespaceStack.push(activeNamespaces) ;
+        final Iterator newNamespacesIter = newNamespaces.iterator() ;
+        final String namespaces ;
+        if (newNamespacesIter.hasNext())
+        {
+            final HashMap newActiveNamespaces = new HashMap(activeNamespaces) ;
+            final StringBuffer namespacesValue = new StringBuffer() ;
+            do
+            {
+                final NamespaceInfo namespaceInfo = (NamespaceInfo)newNamespacesIter.next() ;
+                final String namespacePrefix = namespaceInfo.getPrefix() ;
+                final String namespaceURI = namespaceInfo.getURI() ;
+                newActiveNamespaces.put(namespaceURI, namespacePrefix) ;
+               
+                namespacesValue.append(" xmlns") ;
+                if ((namespacePrefix != null) && (namespacePrefix.length() > 0))
+                {
+                    namespacesValue.append(':') ;
+                    namespacesValue.append(namespacePrefix) ;
+                }
+                namespacesValue.append("=\"") ;
+                namespacesValue.append(namespaceURI) ;
+                namespacesValue.append('"') ;
+            }
+            while(newNamespacesIter.hasNext()) ;
+            newNamespaces.clear() ;
+            activeNamespaces = newActiveNamespaces ;
+            namespaces = namespacesValue.toString() ;
+        }
+        else
+        {
+            namespaces = null ;
+        }
+        
+        printWriter.write('<') ;
+        printWriter.write(getQName(uri, localName, qName)) ;
+        if (namespaces != null)
+        {
+            printWriter.write(namespaces) ;
+        }
+        
+        final int numAttributes = attributes.getLength() ;
+        if (numAttributes > 0)
+        {
+            for(int count = 0 ; count < numAttributes ; count++)
+            {
+                printWriter.write(' ') ;
+                final String attributeQName = getQName(attributes.getURI(count), attributes.getLocalName(count), attributes.getQName(count)) ;
+                printWriter.write(attributeQName) ;
+                printWriter.write("=\"") ;
+                final String value = attributes.getValue(count) ;
+                escapeTextContent(value.toCharArray(), 0, value.length()) ;
+                printWriter.write('"') ;
+            }
+        }
+        
+        endStartTag = true ;
+    }
+    
+    /**
+     * End an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @throws SAXException for any errors.
+     */
+    public void endElement(final String uri, final String localName, final String qName)
+        throws SAXException
+    {
+        characterContent.setLength(0) ;
+        if (endStartTag)
+        {
+            printWriter.write("/>") ;
+        }
+        else
+        {
+            printWriter.write("</") ;
+            printWriter.write(qName) ;
+            printWriter.write('>') ;
+        }
+        activeNamespaces = (Map)namespaceStack.pop() ;
+        endStartTag = false ;
+    }
+    
+    /**
+     * Process character text.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     * @throws SAXException for any errors.
+     */
+    public void characters(char[] chars, int start, int length)
+        throws SAXException
+    {
+        checkEndStartTag() ;
+        escapeTextContent(chars, start, length) ;
+    }
+    
+    /**
+     * Process ignorable white space.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     * @throws SAXException for any errors.
+     */
+    public void ignorableWhitespace(char[] chars, int start, int length)
+        throws SAXException
+    {
+        checkEndStartTag() ;
+        printWriter.write(chars, start, length) ;
+    }
+    
+    /**
+     * Skip an entity.
+     * @throws SAXException for any errors.
+     */
+    public void skippedEntity(final String name)
+    	throws SAXException
+    {
+    }
+    
+    /**
+     * Get the qualified name of the element/attribute.
+     * @param uri The qualifed namespace uri or empty string.
+     * @param localName The qualified local name.
+     * @param qName The qualified name.
+     * @return The qualified name of the element/attribute.
+     */
+    private String getQName(final String uri, final String localName, final String qName)
+    {
+        if (uri.length() > 0)
+        {
+            final String prefix = (String)activeNamespaces.get(uri) ;
+            if (prefix.length() > 0)
+            {
+                return prefix + ":" + localName ;
+            }
+            else
+            {
+                return localName ;
+            }
+        }
+        else
+        {
+            return qName ;
+        }
+    }
+    
+    /**
+     * Check to see if the end of the start tag has been processed.
+     */
+    private void checkEndStartTag()
+    {
+        if (endStartTag)
+        {
+            printWriter.write('>') ;
+            endStartTag = false ;
+        }
+    }
+    
+    /**
+     * Escape the contents of a text element.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     */
+    private void escapeTextContent(final char[] chars, final int start, final int length)
+    {
+        final int end = start + length ;
+        for(int count = start ; count < end ; count++)
+        {
+            final char ch = chars[count] ;
+            switch(ch)
+            {
+                case '<':
+                    printWriter.print("&lt;") ;
+                    break ;
+                case '>':
+                    printWriter.print("&gt;") ;
+                    break ;
+                case '&':
+                    printWriter.print("&amp;") ;
+                    break ;
+                case '"':
+                    printWriter.print("&quot;") ;
+                    break ;
+                default:
+                    printWriter.print(ch) ;
+                    break ;
+            }
+        }
+    }
+    
+    /**
+     * Return the to address from the processing.
+     * @return The to address.
+     */
+    public String getToAddress()
+    {
+        return toAddress ;
+    }
+    
+    /**
+     * Return the identifier from the processing.
+     * @return The identifier.
+     */
+    public String getIdentifier()
+    {
+        return identifier ;
+    }
+    
+    private static final class NamespaceInfo
+    {
+        /**
+         * The namespace prefix.
+         */
+        private final String prefix ;
+        /**
+         * The namespace uri.
+         */
+        private final String uri ;
+        
+        /**
+         * Construct the namespace information.
+         * @param prefix The namespace prefix.
+         * @param uri The namespace uri.
+         */
+        NamespaceInfo(final String prefix, final String uri)
+        {
+            this.prefix = prefix ;
+            this.uri = uri ;
+        }
+        
+        /**
+         * Get the namespace prefix.
+         * @return The namespace prefix.
+         */
+        String getPrefix()
+        {
+            return prefix ;
+        }
+        
+        /**
+         * Get the namespace URI.
+         * @return The namespace URI.
+         */
+        String getURI()
+        {
+            return uri ;
+        }
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/FullTestResult.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/FullTestResult.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/FullTestResult.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,130 +0,0 @@
-package com.jboss.transaction.wstf.test;
-
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.AssertionFailedError;
-
-import java.util.List;
-import java.util.LinkedList;
-
-/**
- * TestResult which holds list of passed tests, not only failed
- * or error tests, and time of executions of them.
- * @author <a href="mailto:istudens at redhat.com">Ivo Studensky</a>
- * @version <tt>$Revision$</tt>
- */
-public class FullTestResult extends TestResult
-{
-   private List _passedTests;
-   private List _failedTests;
-   private List _errorTests;
-
-   private long                 _startTime            = 0;
-   private boolean              _failed               = false;
-   private boolean              _error                = false;
-   private AssertionFailedError _assertionFailedError = null;
-   private Throwable            _throwable            = null;
-
-   public FullTestResult()
-   {
-      super();
-
-      _passedTests        = new LinkedList();
-      _failedTests        = new LinkedList();
-      _errorTests         = new LinkedList();
-   }
-
-   public List getPassedTests()
-   {
-      return _passedTests;
-   }
-
-   public List getFailedTests()
-   {
-      return _failedTests;
-   }
-
-   public List getErrorTests()
-   {
-      return _errorTests;
-   }
-
-   /*-----------  OVERWRITES  ----------*/
-   public void startTest(Test test)
-   {
-      super.startTest(test);
-
-      _startTime            = System.currentTimeMillis();
-      _failed               = false;
-      _error                = false;
-      _assertionFailedError = null;
-      _throwable            = null;
-   }
-
-   public void addError(Test test, Throwable throwable)
-   {
-      super.addError(test, throwable);
-
-      _error     = true;
-      _throwable = throwable;
-   }
-
-   public void addFailure(Test test, AssertionFailedError assertionFailedError)
-   {
-      super.addFailure(test, assertionFailedError);
-
-      _failed               = true;
-      _assertionFailedError = assertionFailedError;
-   }
-
-   public void endTest(Test test)
-   {
-      super.endTest(test);
-
-      if (_failed)
-      {
-          FailedTest failedTest           = new FailedTest();
-          failedTest.test                 = test;
-          failedTest.duration             = System.currentTimeMillis() - _startTime;
-          failedTest.assertionFailedError = _assertionFailedError;
-          _failedTests.add(failedTest);
-      }
-      else if (_error)
-      {
-          ErrorTest errorTest = new ErrorTest();
-          errorTest.test      = test;
-          errorTest.duration  = System.currentTimeMillis() - _startTime;
-          errorTest.throwable = _throwable;
-          _errorTests.add(errorTest);
-      }
-      else
-      {
-          PassedTest passedTest = new PassedTest();
-          passedTest.test       = test;
-          passedTest.duration   = System.currentTimeMillis() - _startTime;
-          _passedTests.add(passedTest);
-      }
-   }
-
-   /*----------   SUBCLASSES   -----------*/
-   public class PassedTest
-   {
-      public Test test;
-      public long duration;
-   }
-
-   public class FailedTest
-   {
-      public Test                 test;
-      public long                 duration;
-      public AssertionFailedError assertionFailedError;
-   }
-
-   public class ErrorTest
-   {
-      public Test      test;
-      public long      duration;
-      public Throwable throwable;
-   }
-
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/FullTestResult.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/FullTestResult.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/FullTestResult.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/FullTestResult.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,150 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.test;
+
+import junit.framework.Test;
+import junit.framework.TestResult;
+import junit.framework.AssertionFailedError;
+
+import java.util.List;
+import java.util.LinkedList;
+
+/**
+ * TestResult which holds list of passed tests, not only failed
+ * or error tests, and time of executions of them.
+ * @author <a href="mailto:istudens at redhat.com">Ivo Studensky</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class FullTestResult extends TestResult
+{
+   private List _passedTests;
+   private List _failedTests;
+   private List _errorTests;
+
+   private long                 _startTime            = 0;
+   private boolean              _failed               = false;
+   private boolean              _error                = false;
+   private AssertionFailedError _assertionFailedError = null;
+   private Throwable            _throwable            = null;
+
+   public FullTestResult()
+   {
+      super();
+
+      _passedTests        = new LinkedList();
+      _failedTests        = new LinkedList();
+      _errorTests         = new LinkedList();
+   }
+
+   public List getPassedTests()
+   {
+      return _passedTests;
+   }
+
+   public List getFailedTests()
+   {
+      return _failedTests;
+   }
+
+   public List getErrorTests()
+   {
+      return _errorTests;
+   }
+
+   /*-----------  OVERWRITES  ----------*/
+   public void startTest(Test test)
+   {
+      super.startTest(test);
+
+      _startTime            = System.currentTimeMillis();
+      _failed               = false;
+      _error                = false;
+      _assertionFailedError = null;
+      _throwable            = null;
+   }
+
+   public void addError(Test test, Throwable throwable)
+   {
+      super.addError(test, throwable);
+
+      _error     = true;
+      _throwable = throwable;
+   }
+
+   public void addFailure(Test test, AssertionFailedError assertionFailedError)
+   {
+      super.addFailure(test, assertionFailedError);
+
+      _failed               = true;
+      _assertionFailedError = assertionFailedError;
+   }
+
+   public void endTest(Test test)
+   {
+      super.endTest(test);
+
+      if (_failed)
+      {
+          FailedTest failedTest           = new FailedTest();
+          failedTest.test                 = test;
+          failedTest.duration             = System.currentTimeMillis() - _startTime;
+          failedTest.assertionFailedError = _assertionFailedError;
+          _failedTests.add(failedTest);
+      }
+      else if (_error)
+      {
+          ErrorTest errorTest = new ErrorTest();
+          errorTest.test      = test;
+          errorTest.duration  = System.currentTimeMillis() - _startTime;
+          errorTest.throwable = _throwable;
+          _errorTests.add(errorTest);
+      }
+      else
+      {
+          PassedTest passedTest = new PassedTest();
+          passedTest.test       = test;
+          passedTest.duration   = System.currentTimeMillis() - _startTime;
+          _passedTests.add(passedTest);
+      }
+   }
+
+   /*----------   SUBCLASSES   -----------*/
+   public class PassedTest
+   {
+      public Test test;
+      public long duration;
+   }
+
+   public class FailedTest
+   {
+      public Test                 test;
+      public long                 duration;
+      public AssertionFailedError assertionFailedError;
+   }
+
+   public class ErrorTest
+   {
+      public Test      test;
+      public long      duration;
+      public Throwable throwable;
+   }
+
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestConstants.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,213 +0,0 @@
-package com.jboss.transaction.wstf.test ;
-
-import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * This class contains constants used to map the front end onto
- * the WS-TX interop tests.
- * @author kevin
- */
-public class TestConstants
-{
-    /**
-     * The name of the Service URI parameter.
-     */
-    public static final String PARAM_SERVICE_URI = "serviceuri" ;
-    /**
-     * The name of the test parameter.
-     */
-    public static final String PARAM_TEST = "test" ;
-    /**
-     * The name of the test timeout parameter.
-     */
-    public static final String PARAM_TEST_TIMEOUT = "testTimeout" ;
-    /**
-     * The name of the asynchronous test flag parameter.
-     */
-    public static final String PARAM_ASYNC_TEST = "asyncTest" ;
-    /**
-     * The name of the result page parameter.
-     */
-    public static final String PARAM_RESULT_PAGE = "resultPage";
-    /**
-     * Default address of page with results.
-     */
-    public static final String DEFAULT_RESULT_PAGE_ADDRESS = "/results.jsp";
-    
-    /**
-     * The name of the test results attribute.
-     */
-    public static final String ATTRIBUTE_TEST_RESULT = "testResult" ;
-    /**
-     * The name of the test validation attribute.
-     */
-    public static final String ATTRIBUTE_TEST_VALIDATION = "testValidation" ;
-    /**
-     * The name of the log count attribute.
-     */
-    public static final String ATTRIBUTE_LOG_COUNT = "logCount" ;
-    /**
-     * The name of the log name attribute.
-     */
-    public static final String ATTRIBUTE_LOG_NAME = "logName" ;
-    
-    /**
-     * test name for all tests
-     */
-    public static final String NAME_ALL_TESTS = "allTests" ;
-    /**
-     * The prefix for all AT tests.
-     */
-    public static final String PREFIX_TESTS = "test" ;
-    /**
-     * test name for AT Scenario 1.1
-     */
-    public static final String NAME_TEST_AT_1_1 = PREFIX_TESTS + "1_1" ;
-    /**
-     * test description for AT Scenario 1.1
-     */
-    public static final String DESCRIPTION_TEST_1_1 = "1.1 - " + InteropConstants.INTEROP_ELEMENT_COMPLETION_COMMIT ;
-    /**
-     * test name for AT Scenario 1.2
-     */
-    public static final String NAME_TEST_1_2 = PREFIX_TESTS + "1_2" ;
-    /**
-     * test description for AT Scenario 1.2
-     */
-    public static final String DESCRIPTION_TEST_1_2 = "1.2 - " + InteropConstants.INTEROP_ELEMENT_COMPLETION_ROLLBACK ;
-    /**
-     * test name for AT Scenario 2.1
-     */
-    public static final String NAME_TEST_2_1 = PREFIX_TESTS + "2_1" ;
-    /**
-     * test description for AT Scenario 2.1
-     */
-    public static final String DESCRIPTION_TEST_2_1 = "2.1 - " + InteropConstants.INTEROP_ELEMENT_COMMIT ;
-    /**
-     * test name for AT Scenario 2.2
-     */
-    public static final String NAME_TEST_2_2 = PREFIX_TESTS + "2_2" ;
-    /**
-     * test description for AT Scenario 2.2
-     */
-    public static final String DESCRIPTION_TEST_2_2 = "2.2 - " + InteropConstants.INTEROP_ELEMENT_ROLLBACK ;
-    /**
-     * test name for AT Scenario 3.1
-     */
-    public static final String NAME_TEST_3_1 = PREFIX_TESTS + "3_1" ;
-    /**
-     * test description for AT Scenario 3.1
-     */
-    public static final String DESCRIPTION_TEST_3_1 = "3.1 - " + InteropConstants.INTEROP_ELEMENT_PHASE_2_ROLLBACK ;
-    /**
-     * test name for AT Scenario 3.2
-     */
-    public static final String NAME_TEST_3_2 = PREFIX_TESTS + "3_2" ;
-    /**
-     * test description for AT Scenario 3.2
-     */
-    public static final String DESCRIPTION_TEST_3_2 = "3.2 - " + InteropConstants.INTEROP_ELEMENT_READONLY ;
-    /**
-     * test name for AT Scenario 3.3
-     */
-    public static final String NAME_TEST_3_3 = PREFIX_TESTS + "3_3" ;
-    /**
-     * test description for AT Scenario 3.3
-     */
-    public static final String DESCRIPTION_TEST_3_3 = "3.3 - " + InteropConstants.INTEROP_ELEMENT_VOLATILE_AND_DURABLE ;
-    /**
-     * test name for AT Scenario 4.1
-     */
-    public static final String NAME_TEST_3_4 = PREFIX_TESTS + "3_4" ;
-    /**
-     * test description for AT Scenario 3.4
-     */
-    public static final String DESCRIPTION_TEST_3_4 = "3.4 - " + InteropConstants.INTEROP_ELEMENT_EARLY_READONLY ;
-    /**
-     * test name for AT Scenario 3.5
-     */
-    public static final String NAME_TEST_3_5 = PREFIX_TESTS + "3_5" ;
-    /**
-     * test description for AT Scenario 3.5
-     */
-    public static final String DESCRIPTION_TEST_3_5 = "3.5 - " + InteropConstants.INTEROP_ELEMENT_EARLY_ABORTED ;
-    /**
-     * test name for AT Scenario 3.6
-     */
-    public static final String NAME_TEST_3_6 = PREFIX_TESTS + "3_6" ;
-    /**
-     * test description for AT Scenario 3.6
-     */
-    public static final String DESCRIPTION_TEST_3_6 = "3.6 - " + InteropConstants.INTEROP_ELEMENT_REPLAY_COMMIT ;
-    /**
-     * test name for AT Scenario 3.7
-     */
-    public static final String NAME_TEST_3_7 = PREFIX_TESTS + "3_7" ;
-    /**
-     * test description for AT Scenario 3.7
-     */
-    public static final String DESCRIPTION_TEST_3_7 = "3.7 - " + InteropConstants.INTEROP_ELEMENT_RETRY_PREPARED_COMMIT ;
-    /**
-     * test name for AT Scenario 3.8
-     */
-    public static final String NAME_TEST_3_8 = PREFIX_TESTS + "3_8" ;
-    /**
-     * test description for AT Scenario 3.8
-     */
-    public static final String DESCRIPTION_TEST_3_8 = "3.8 - " + InteropConstants.INTEROP_ELEMENT_RETRY_PREPARED_ABORT ;
-    /**
-     * test name for AT Scenario 3.9
-     */
-    public static final String NAME_TEST_3_9 = PREFIX_TESTS + "3_9" ;
-    /**
-     * test description for AT Scenario 3.9
-     */
-    public static final String DESCRIPTION_TEST_3_9 = "3.9 - " + InteropConstants.INTEROP_ELEMENT_RETRY_COMMIT ;
-    /**
-     * test name for AT Scenario 3.10
-     */
-    public static final String NAME_TEST_3_10 = PREFIX_TESTS + "3_10" ;
-    /**
-     * test description for AT Scenario 3.10
-     */
-    public static final String DESCRIPTION_TEST_3_10 = "3.10 - " + InteropConstants.INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT ;
-    /**
-     * test name for AT Scenario 3.11
-     */
-    public static final String NAME_TEST_3_11 = PREFIX_TESTS + "3_11" ;
-    /**
-     * test description for AT Scenario 3.11
-     */
-    public static final String DESCRIPTION_TEST_3_11 = "3.11 - " + InteropConstants.INTEROP_ELEMENT_LOST_COMMITTED ;
-
-    /**
-     * The name to description map.
-     */
-    public static final Map DESCRIPTIONS ;
-    
-    static
-    {
-        final TreeMap descriptions = new TreeMap() ;
-        
-        descriptions.put(NAME_TEST_AT_1_1, DESCRIPTION_TEST_1_1) ;
-        descriptions.put(NAME_TEST_1_2, DESCRIPTION_TEST_1_2) ;
-        descriptions.put(NAME_TEST_2_1, DESCRIPTION_TEST_2_1) ;
-        descriptions.put(NAME_TEST_2_2, DESCRIPTION_TEST_2_2) ;
-        descriptions.put(NAME_TEST_3_1, DESCRIPTION_TEST_3_1) ;
-        descriptions.put(NAME_TEST_3_2, DESCRIPTION_TEST_3_2) ;
-        descriptions.put(NAME_TEST_3_3, DESCRIPTION_TEST_3_3) ;
-        descriptions.put(NAME_TEST_3_4, DESCRIPTION_TEST_3_4) ;
-        descriptions.put(NAME_TEST_3_5, DESCRIPTION_TEST_3_5) ;
-        descriptions.put(NAME_TEST_3_6, DESCRIPTION_TEST_3_6) ;
-        descriptions.put(NAME_TEST_3_7, DESCRIPTION_TEST_3_7) ;
-        descriptions.put(NAME_TEST_3_8, DESCRIPTION_TEST_3_8) ;
-        descriptions.put(NAME_TEST_3_9, DESCRIPTION_TEST_3_9) ;
-        descriptions.put(NAME_TEST_3_10, DESCRIPTION_TEST_3_10) ;
-        descriptions.put(NAME_TEST_3_11, DESCRIPTION_TEST_3_11) ;
-
-        DESCRIPTIONS = descriptions ;
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestConstants.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestConstants.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestConstants.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,233 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.test ;
+
+import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * This class contains constants used to map the front end onto
+ * the WS-TX interop tests.
+ * @author kevin
+ */
+public class TestConstants
+{
+    /**
+     * The name of the Service URI parameter.
+     */
+    public static final String PARAM_SERVICE_URI = "serviceuri" ;
+    /**
+     * The name of the test parameter.
+     */
+    public static final String PARAM_TEST = "test" ;
+    /**
+     * The name of the test timeout parameter.
+     */
+    public static final String PARAM_TEST_TIMEOUT = "testTimeout" ;
+    /**
+     * The name of the asynchronous test flag parameter.
+     */
+    public static final String PARAM_ASYNC_TEST = "asyncTest" ;
+    /**
+     * The name of the result page parameter.
+     */
+    public static final String PARAM_RESULT_PAGE = "resultPage";
+    /**
+     * Default address of page with results.
+     */
+    public static final String DEFAULT_RESULT_PAGE_ADDRESS = "/results.jsp";
+    
+    /**
+     * The name of the test results attribute.
+     */
+    public static final String ATTRIBUTE_TEST_RESULT = "testResult" ;
+    /**
+     * The name of the test validation attribute.
+     */
+    public static final String ATTRIBUTE_TEST_VALIDATION = "testValidation" ;
+    /**
+     * The name of the log count attribute.
+     */
+    public static final String ATTRIBUTE_LOG_COUNT = "logCount" ;
+    /**
+     * The name of the log name attribute.
+     */
+    public static final String ATTRIBUTE_LOG_NAME = "logName" ;
+    
+    /**
+     * test name for all tests
+     */
+    public static final String NAME_ALL_TESTS = "allTests" ;
+    /**
+     * The prefix for all AT tests.
+     */
+    public static final String PREFIX_TESTS = "test" ;
+    /**
+     * test name for AT Scenario 1.1
+     */
+    public static final String NAME_TEST_AT_1_1 = PREFIX_TESTS + "1_1" ;
+    /**
+     * test description for AT Scenario 1.1
+     */
+    public static final String DESCRIPTION_TEST_1_1 = "1.1 - " + InteropConstants.INTEROP_ELEMENT_COMPLETION_COMMIT ;
+    /**
+     * test name for AT Scenario 1.2
+     */
+    public static final String NAME_TEST_1_2 = PREFIX_TESTS + "1_2" ;
+    /**
+     * test description for AT Scenario 1.2
+     */
+    public static final String DESCRIPTION_TEST_1_2 = "1.2 - " + InteropConstants.INTEROP_ELEMENT_COMPLETION_ROLLBACK ;
+    /**
+     * test name for AT Scenario 2.1
+     */
+    public static final String NAME_TEST_2_1 = PREFIX_TESTS + "2_1" ;
+    /**
+     * test description for AT Scenario 2.1
+     */
+    public static final String DESCRIPTION_TEST_2_1 = "2.1 - " + InteropConstants.INTEROP_ELEMENT_COMMIT ;
+    /**
+     * test name for AT Scenario 2.2
+     */
+    public static final String NAME_TEST_2_2 = PREFIX_TESTS + "2_2" ;
+    /**
+     * test description for AT Scenario 2.2
+     */
+    public static final String DESCRIPTION_TEST_2_2 = "2.2 - " + InteropConstants.INTEROP_ELEMENT_ROLLBACK ;
+    /**
+     * test name for AT Scenario 3.1
+     */
+    public static final String NAME_TEST_3_1 = PREFIX_TESTS + "3_1" ;
+    /**
+     * test description for AT Scenario 3.1
+     */
+    public static final String DESCRIPTION_TEST_3_1 = "3.1 - " + InteropConstants.INTEROP_ELEMENT_PHASE_2_ROLLBACK ;
+    /**
+     * test name for AT Scenario 3.2
+     */
+    public static final String NAME_TEST_3_2 = PREFIX_TESTS + "3_2" ;
+    /**
+     * test description for AT Scenario 3.2
+     */
+    public static final String DESCRIPTION_TEST_3_2 = "3.2 - " + InteropConstants.INTEROP_ELEMENT_READONLY ;
+    /**
+     * test name for AT Scenario 3.3
+     */
+    public static final String NAME_TEST_3_3 = PREFIX_TESTS + "3_3" ;
+    /**
+     * test description for AT Scenario 3.3
+     */
+    public static final String DESCRIPTION_TEST_3_3 = "3.3 - " + InteropConstants.INTEROP_ELEMENT_VOLATILE_AND_DURABLE ;
+    /**
+     * test name for AT Scenario 4.1
+     */
+    public static final String NAME_TEST_3_4 = PREFIX_TESTS + "3_4" ;
+    /**
+     * test description for AT Scenario 3.4
+     */
+    public static final String DESCRIPTION_TEST_3_4 = "3.4 - " + InteropConstants.INTEROP_ELEMENT_EARLY_READONLY ;
+    /**
+     * test name for AT Scenario 3.5
+     */
+    public static final String NAME_TEST_3_5 = PREFIX_TESTS + "3_5" ;
+    /**
+     * test description for AT Scenario 3.5
+     */
+    public static final String DESCRIPTION_TEST_3_5 = "3.5 - " + InteropConstants.INTEROP_ELEMENT_EARLY_ABORTED ;
+    /**
+     * test name for AT Scenario 3.6
+     */
+    public static final String NAME_TEST_3_6 = PREFIX_TESTS + "3_6" ;
+    /**
+     * test description for AT Scenario 3.6
+     */
+    public static final String DESCRIPTION_TEST_3_6 = "3.6 - " + InteropConstants.INTEROP_ELEMENT_REPLAY_COMMIT ;
+    /**
+     * test name for AT Scenario 3.7
+     */
+    public static final String NAME_TEST_3_7 = PREFIX_TESTS + "3_7" ;
+    /**
+     * test description for AT Scenario 3.7
+     */
+    public static final String DESCRIPTION_TEST_3_7 = "3.7 - " + InteropConstants.INTEROP_ELEMENT_RETRY_PREPARED_COMMIT ;
+    /**
+     * test name for AT Scenario 3.8
+     */
+    public static final String NAME_TEST_3_8 = PREFIX_TESTS + "3_8" ;
+    /**
+     * test description for AT Scenario 3.8
+     */
+    public static final String DESCRIPTION_TEST_3_8 = "3.8 - " + InteropConstants.INTEROP_ELEMENT_RETRY_PREPARED_ABORT ;
+    /**
+     * test name for AT Scenario 3.9
+     */
+    public static final String NAME_TEST_3_9 = PREFIX_TESTS + "3_9" ;
+    /**
+     * test description for AT Scenario 3.9
+     */
+    public static final String DESCRIPTION_TEST_3_9 = "3.9 - " + InteropConstants.INTEROP_ELEMENT_RETRY_COMMIT ;
+    /**
+     * test name for AT Scenario 3.10
+     */
+    public static final String NAME_TEST_3_10 = PREFIX_TESTS + "3_10" ;
+    /**
+     * test description for AT Scenario 3.10
+     */
+    public static final String DESCRIPTION_TEST_3_10 = "3.10 - " + InteropConstants.INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT ;
+    /**
+     * test name for AT Scenario 3.11
+     */
+    public static final String NAME_TEST_3_11 = PREFIX_TESTS + "3_11" ;
+    /**
+     * test description for AT Scenario 3.11
+     */
+    public static final String DESCRIPTION_TEST_3_11 = "3.11 - " + InteropConstants.INTEROP_ELEMENT_LOST_COMMITTED ;
+
+    /**
+     * The name to description map.
+     */
+    public static final Map DESCRIPTIONS ;
+    
+    static
+    {
+        final TreeMap descriptions = new TreeMap() ;
+        
+        descriptions.put(NAME_TEST_AT_1_1, DESCRIPTION_TEST_1_1) ;
+        descriptions.put(NAME_TEST_1_2, DESCRIPTION_TEST_1_2) ;
+        descriptions.put(NAME_TEST_2_1, DESCRIPTION_TEST_2_1) ;
+        descriptions.put(NAME_TEST_2_2, DESCRIPTION_TEST_2_2) ;
+        descriptions.put(NAME_TEST_3_1, DESCRIPTION_TEST_3_1) ;
+        descriptions.put(NAME_TEST_3_2, DESCRIPTION_TEST_3_2) ;
+        descriptions.put(NAME_TEST_3_3, DESCRIPTION_TEST_3_3) ;
+        descriptions.put(NAME_TEST_3_4, DESCRIPTION_TEST_3_4) ;
+        descriptions.put(NAME_TEST_3_5, DESCRIPTION_TEST_3_5) ;
+        descriptions.put(NAME_TEST_3_6, DESCRIPTION_TEST_3_6) ;
+        descriptions.put(NAME_TEST_3_7, DESCRIPTION_TEST_3_7) ;
+        descriptions.put(NAME_TEST_3_8, DESCRIPTION_TEST_3_8) ;
+        descriptions.put(NAME_TEST_3_9, DESCRIPTION_TEST_3_9) ;
+        descriptions.put(NAME_TEST_3_10, DESCRIPTION_TEST_3_10) ;
+        descriptions.put(NAME_TEST_3_11, DESCRIPTION_TEST_3_11) ;
+
+        DESCRIPTIONS = descriptions ;
+    }
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogController.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogController.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogController.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,84 +0,0 @@
-package com.jboss.transaction.wstf.test;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-
-/**
- * The test log controller.
- * @author kevin
- */
-public class TestLogController
-{
-    /**
-     * The base directory for logs, hardcoded for now.
-     */
-    private static File baseDir ;
-    
-    static
-    {
-        final String userHome = System.getProperty("user.home") ;
-        baseDir = new File(userHome, "logs") ;
-        if (!baseDir.exists())
-        {
-            baseDir.mkdir() ;
-        }
-    }
-
-    /**
-     * Read the contents of the specified log.
-     * @param logName The log to retrieve.
-     * @return The log contents.
-     * @throws IOException for reading errors.
-     */
-    public static String readLog(final String logName)
-        throws IOException
-    {
-        final File logFile = new File(baseDir, logName) ;
-        if (logFile.exists() && logFile.canRead())
-        {
-            final FileReader reader = new FileReader(logFile) ;
-            try
-            {
-                final StringBuffer buffer = new StringBuffer() ;
-                final char[] charBuffer = new char[256] ;
-                while(reader.ready())
-                {
-                    final int count = reader.read(charBuffer) ;
-                    if (count > 0)
-                    {
-                        buffer.append(charBuffer, 0, count) ;
-                    }
-                }
-                return buffer.toString() ;
-            }
-            finally
-            {
-                reader.close() ;
-            }
-        }
-        throw new IOException("Cannot read log file: " + logName) ;
-    }
-
-    /**
-     * Write the contents of the specified log.
-     * @param logName The log to write.
-     * @param contents The log contents.
-     * @throws IOException for reading errors.
-     */
-    public static void writeLog(final String logName, final String contents)
-        throws IOException
-    {
-        final File logFile = new File(baseDir, logName) ;
-        final FileWriter writer = new FileWriter(logFile) ;
-        try
-        {
-            writer.write(contents) ;
-        }
-        finally
-        {
-            writer.close() ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogController.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogController.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogController.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogController.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.test;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+
+/**
+ * The test log controller.
+ * @author kevin
+ */
+public class TestLogController
+{
+    /**
+     * The base directory for logs, hardcoded for now.
+     */
+    private static File baseDir ;
+    
+    static
+    {
+        final String userHome = System.getProperty("user.home") ;
+        baseDir = new File(userHome, "logs") ;
+        if (!baseDir.exists())
+        {
+            baseDir.mkdir() ;
+        }
+    }
+
+    /**
+     * Read the contents of the specified log.
+     * @param logName The log to retrieve.
+     * @return The log contents.
+     * @throws IOException for reading errors.
+     */
+    public static String readLog(final String logName)
+        throws IOException
+    {
+        final File logFile = new File(baseDir, logName) ;
+        if (logFile.exists() && logFile.canRead())
+        {
+            final FileReader reader = new FileReader(logFile) ;
+            try
+            {
+                final StringBuffer buffer = new StringBuffer() ;
+                final char[] charBuffer = new char[256] ;
+                while(reader.ready())
+                {
+                    final int count = reader.read(charBuffer) ;
+                    if (count > 0)
+                    {
+                        buffer.append(charBuffer, 0, count) ;
+                    }
+                }
+                return buffer.toString() ;
+            }
+            finally
+            {
+                reader.close() ;
+            }
+        }
+        throw new IOException("Cannot read log file: " + logName) ;
+    }
+
+    /**
+     * Write the contents of the specified log.
+     * @param logName The log to write.
+     * @param contents The log contents.
+     * @throws IOException for reading errors.
+     */
+    public static void writeLog(final String logName, final String contents)
+        throws IOException
+    {
+        final File logFile = new File(baseDir, logName) ;
+        final FileWriter writer = new FileWriter(logFile) ;
+        try
+        {
+            writer.write(contents) ;
+        }
+        finally
+        {
+            writer.close() ;
+        }
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogServlet.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogServlet.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,96 +0,0 @@
-package com.jboss.transaction.wstf.test;
-
-import java.io.IOException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.arjuna.webservices.util.ClassLoaderHelper;
-
-/**
- * The test servlet.
- * @author kevin
- */
-public class TestLogServlet extends HttpServlet
-{
-    /**
-     * The servlet serial version UID.
-     */
-    private static final long serialVersionUID = 2566877081747112520L ;
-    
-    /**
-     * The not found HTML page.
-     */
-    private String notFoundResponse ;
-    /**
-     * The directory contents HTML page.
-     */
-    private String directoryContents ;
-    
-    /**
-     * Initialise the servlet.
-     * @param servletConfig The servlet configuration.
-     */
-    public void init(final ServletConfig servletConfig)
-        throws ServletException
-    {
-        super.init(servletConfig) ;
-        try
-        {
-            notFoundResponse = ClassLoaderHelper.getResourceAsString(TestLogServlet.class, "notFoundResponse.html") ;
-            directoryContents = ClassLoaderHelper.getResourceAsString(TestLogServlet.class, "directoryContents.html") ;
-        }
-        catch (final IOException ioe)
-        {
-            throw new ServletException("Failed to load HTML pages", ioe) ;
-        }
-    }
-    
-    /**
-     * Return the specified logs
-     * @param request The HTTP servlet request.
-     * @param response The HTTP servlet response.
-     */
-    protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
-        throws ServletException, IOException
-    {
-        final String logName = request.getPathInfo() ;
-        if ((logName == null) || (logName.length() == 0))
-        {
-            response.sendRedirect("logs/") ;
-            return ;
-        }
-        else if ("/".equals(logName))
-        {
-            response.setContentType("text/html") ;
-            response.setStatus(HttpServletResponse.SC_OK) ;
-            response.setContentLength(directoryContents.length()) ;
-            response.getOutputStream().print(directoryContents) ;
-        }
-        else
-        {
-            final String contents ;
-            try
-            {
-                contents = TestLogController.readLog(logName) ;
-            }
-            catch (final Throwable th)
-            {
-                log("Error reading log file", th) ;
-                response.setContentType("text/html") ;
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND) ;
-                response.setContentLength(notFoundResponse.length()) ;
-                response.getOutputStream().print(notFoundResponse) ;
-                return ;
-            }
-            
-            response.setContentType("text/xml") ;
-            response.setStatus(HttpServletResponse.SC_OK) ;
-            response.setContentLength(contents.length()) ;
-            response.getOutputStream().print(contents) ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogServlet.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogServlet.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogServlet.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestLogServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.test;
+
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.arjuna.webservices.util.ClassLoaderHelper;
+
+/**
+ * The test servlet.
+ * @author kevin
+ */
+public class TestLogServlet extends HttpServlet
+{
+    /**
+     * The servlet serial version UID.
+     */
+    private static final long serialVersionUID = 2566877081747112520L ;
+    
+    /**
+     * The not found HTML page.
+     */
+    private String notFoundResponse ;
+    /**
+     * The directory contents HTML page.
+     */
+    private String directoryContents ;
+    
+    /**
+     * Initialise the servlet.
+     * @param servletConfig The servlet configuration.
+     */
+    public void init(final ServletConfig servletConfig)
+        throws ServletException
+    {
+        super.init(servletConfig) ;
+        try
+        {
+            notFoundResponse = ClassLoaderHelper.getResourceAsString(TestLogServlet.class, "notFoundResponse.html") ;
+            directoryContents = ClassLoaderHelper.getResourceAsString(TestLogServlet.class, "directoryContents.html") ;
+        }
+        catch (final IOException ioe)
+        {
+            throw new ServletException("Failed to load HTML pages", ioe) ;
+        }
+    }
+    
+    /**
+     * Return the specified logs
+     * @param request The HTTP servlet request.
+     * @param response The HTTP servlet response.
+     */
+    protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
+        throws ServletException, IOException
+    {
+        final String logName = request.getPathInfo() ;
+        if ((logName == null) || (logName.length() == 0))
+        {
+            response.sendRedirect("logs/") ;
+            return ;
+        }
+        else if ("/".equals(logName))
+        {
+            response.setContentType("text/html") ;
+            response.setStatus(HttpServletResponse.SC_OK) ;
+            response.setContentLength(directoryContents.length()) ;
+            response.getOutputStream().print(directoryContents) ;
+        }
+        else
+        {
+            final String contents ;
+            try
+            {
+                contents = TestLogController.readLog(logName) ;
+            }
+            catch (final Throwable th)
+            {
+                log("Error reading log file", th) ;
+                response.setContentType("text/html") ;
+                response.setStatus(HttpServletResponse.SC_NOT_FOUND) ;
+                response.setContentLength(notFoundResponse.length()) ;
+                response.getOutputStream().print(notFoundResponse) ;
+                return ;
+            }
+            
+            response.setContentType("text/xml") ;
+            response.setStatus(HttpServletResponse.SC_OK) ;
+            response.setContentLength(contents.length()) ;
+            response.getOutputStream().print(contents) ;
+        }
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestRunner.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestRunner.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestRunner.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,109 +0,0 @@
-package com.jboss.transaction.wstf.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import com.jboss.transaction.wstf.interop.Sc007TestCase;
-import com.jboss.transaction.wstf.interop.InteropTestCase;
-import com.jboss.transaction.wstf.interop.InteropTestSuite;
-import com.jboss.transaction.wstf.interop.MessageLogging;
-
-/**
- * Class responsible for executing the appropriate JUnit test.
- * @author kevin
- */
-public class TestRunner
-{
-    /**
-     * The log message prefix.
-     */
-    private static final String LOG_MESSAGE_PREFIX = "<log:log xmlns:log=\"http://docs.oasis-open.org/ws-tx/logs/\">" ;
-    /**
-     * The log message suffix.
-     */
-    private static final String LOG_MESSAGE_SUFFIX = "</log:log>";
-    
-    /**
-     * The AT test class.
-     */
-    private static final Class SC007_TEST_CLASS = Sc007TestCase.class ;
-
-    /**
-     * Execute the specific test against the specified participant.
-     * @param participantURI The URI of the participant.
-     * @param testTimeout The test timeout.
-     * @param asyncTest The asynchronous test flag.
-     * @param testName The name of the test to execute.
-     * @return The test result.
-     */
-    public static TestResult execute(final String participantURI, final long testTimeout, final boolean asyncTest, final String testName)
-    {
-        MessageLogging.clearThreadLog() ;
-        final Test test ;
-        if (TestConstants.NAME_ALL_TESTS.equals(testName))
-        {
-            final TestSuite testSuite = new TestSuite() ;
-            testSuite.addTest(new InteropTestSuite(participantURI, testTimeout, asyncTest, SC007_TEST_CLASS)) ;
-            test = testSuite ;
-        }
-        else if (testName.startsWith(TestConstants.PREFIX_TESTS))
-        {
-            final Class testClass = SC007_TEST_CLASS;
-            try
-            {
-                test = createTest(testClass, participantURI, testTimeout, asyncTest, testName) ;
-            }
-            catch (final Throwable th)
-            {
-                System.err.println("Unexpected error instantiating test class: " + th) ;
-                return null ;
-            }
-        }
-        else
-        {
-            System.err.println("Unidentified test name: " + testName) ;
-            return null ;
-        }
-        MessageLogging.appendThreadLog(LOG_MESSAGE_PREFIX) ;
-        final TestResult testResult = new FullTestResult() ;
-        test.run(testResult) ;
-        MessageLogging.appendThreadLog(LOG_MESSAGE_SUFFIX) ;
-        return testResult ;
-    }
-    
-    /**
-     * Create the test instance.
-     * @param testClass The test class name.
-     * @param participantURI The participant URI.
-     * @param testTimeout The test timeout.
-     * @param asyncTest The asynchronous test flag.
-     * @param testName The test name.
-     * @return The test instance.
-     * @throws IllegalAccessException For access exception instantiating the test class.
-     * @throws InstantiationException For errors instantiating the test class.
-     * @throws IllegalArgumentException For an invalid test class.
-     */
-    private static TestCase createTest(final Class testClass, final String participantURI, final long testTimeout, final boolean asyncTest, final String testName)
-        throws IllegalAccessException, InstantiationException, IllegalArgumentException
-    {
-        final Object testObject = testClass.newInstance() ;
-        if (testObject instanceof InteropTestCase)
-        {
-            final InteropTestCase interopTestCase = (InteropTestCase)testObject ;
-            interopTestCase.setParticipantURI(participantURI) ; 
-            interopTestCase.setTestTimeout(testTimeout) ; 
-            interopTestCase.setAsyncTest(asyncTest) ; 
-            interopTestCase.setName(testName) ;
-            return interopTestCase ;
-        }
-        else if (testObject instanceof TestCase)
-        {
-            final TestCase test = (TestCase)testObject ;
-            test.setName(testName) ;
-            return test ;
-        }
-        throw new IllegalArgumentException("Invalid class: " + testClass.getName()) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestRunner.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestRunner.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestRunner.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestRunner.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,129 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+import com.jboss.transaction.wstf.interop.Sc007TestCase;
+import com.jboss.transaction.wstf.interop.InteropTestCase;
+import com.jboss.transaction.wstf.interop.InteropTestSuite;
+import com.jboss.transaction.wstf.interop.MessageLogging;
+
+/**
+ * Class responsible for executing the appropriate JUnit test.
+ * @author kevin
+ */
+public class TestRunner
+{
+    /**
+     * The log message prefix.
+     */
+    private static final String LOG_MESSAGE_PREFIX = "<log:log xmlns:log=\"http://docs.oasis-open.org/ws-tx/logs/\">" ;
+    /**
+     * The log message suffix.
+     */
+    private static final String LOG_MESSAGE_SUFFIX = "</log:log>";
+    
+    /**
+     * The AT test class.
+     */
+    private static final Class SC007_TEST_CLASS = Sc007TestCase.class ;
+
+    /**
+     * Execute the specific test against the specified participant.
+     * @param participantURI The URI of the participant.
+     * @param testTimeout The test timeout.
+     * @param asyncTest The asynchronous test flag.
+     * @param testName The name of the test to execute.
+     * @return The test result.
+     */
+    public static TestResult execute(final String participantURI, final long testTimeout, final boolean asyncTest, final String testName)
+    {
+        MessageLogging.clearThreadLog() ;
+        final Test test ;
+        if (TestConstants.NAME_ALL_TESTS.equals(testName))
+        {
+            final TestSuite testSuite = new TestSuite() ;
+            testSuite.addTest(new InteropTestSuite(participantURI, testTimeout, asyncTest, SC007_TEST_CLASS)) ;
+            test = testSuite ;
+        }
+        else if (testName.startsWith(TestConstants.PREFIX_TESTS))
+        {
+            final Class testClass = SC007_TEST_CLASS;
+            try
+            {
+                test = createTest(testClass, participantURI, testTimeout, asyncTest, testName) ;
+            }
+            catch (final Throwable th)
+            {
+                System.err.println("Unexpected error instantiating test class: " + th) ;
+                return null ;
+            }
+        }
+        else
+        {
+            System.err.println("Unidentified test name: " + testName) ;
+            return null ;
+        }
+        MessageLogging.appendThreadLog(LOG_MESSAGE_PREFIX) ;
+        final TestResult testResult = new FullTestResult() ;
+        test.run(testResult) ;
+        MessageLogging.appendThreadLog(LOG_MESSAGE_SUFFIX) ;
+        return testResult ;
+    }
+    
+    /**
+     * Create the test instance.
+     * @param testClass The test class name.
+     * @param participantURI The participant URI.
+     * @param testTimeout The test timeout.
+     * @param asyncTest The asynchronous test flag.
+     * @param testName The test name.
+     * @return The test instance.
+     * @throws IllegalAccessException For access exception instantiating the test class.
+     * @throws InstantiationException For errors instantiating the test class.
+     * @throws IllegalArgumentException For an invalid test class.
+     */
+    private static TestCase createTest(final Class testClass, final String participantURI, final long testTimeout, final boolean asyncTest, final String testName)
+        throws IllegalAccessException, InstantiationException, IllegalArgumentException
+    {
+        final Object testObject = testClass.newInstance() ;
+        if (testObject instanceof InteropTestCase)
+        {
+            final InteropTestCase interopTestCase = (InteropTestCase)testObject ;
+            interopTestCase.setParticipantURI(participantURI) ; 
+            interopTestCase.setTestTimeout(testTimeout) ; 
+            interopTestCase.setAsyncTest(asyncTest) ; 
+            interopTestCase.setName(testName) ;
+            return interopTestCase ;
+        }
+        else if (testObject instanceof TestCase)
+        {
+            final TestCase test = (TestCase)testObject ;
+            test.setName(testName) ;
+            return test ;
+        }
+        throw new IllegalArgumentException("Invalid class: " + testClass.getName()) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestServlet.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestServlet.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,204 +0,0 @@
-package com.jboss.transaction.wstf.test;
-
-import com.arjuna.webservices.util.ClassLoaderHelper;
-import com.jboss.transaction.wstf.interop.MessageLogging;
-import junit.framework.TestResult;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * The test servlet.
- * @author kevin
- */
-public class TestServlet extends HttpServlet
-{
-    /**
-     * The servlet serial version UID.
-     */
-    private static final long serialVersionUID = 6764303043215036856L ;
-    
-    /**
-     * The validation templates.
-     */
-    private Templates validationTemplates ;
-
-
-    /**
-     * Initialise the servlet.
-     * @param config The servlet configuration.
-     */
-    public void init(final ServletConfig config)
-        throws ServletException
-    {
-        super.init(config) ;
-        
-        final InputStream is = ClassLoaderHelper.getResourceAsStream(getClass(), "processor.xsl") ;
-        if (is == null)
-        {
-            throw new ServletException("Cannot locate transformation stylesheet") ;
-        }
-        final TransformerFactory factory = TransformerFactory.newInstance() ;
-        try
-        {
-            validationTemplates = factory.newTemplates(new StreamSource(is)) ;
-        }
-        catch (final TransformerConfigurationException tce)
-        {
-            throw new ServletException("Error creating transformation template!", tce) ;
-        }
-    }
-    
-    /**
-     * Execute the test
-     * @param request The HTTP servlet request.
-     * @param response The HTTP servlet response.
-     */
-    protected void doPost(final HttpServletRequest request, final HttpServletResponse response)
-        throws ServletException, IOException
-    {
-        final String serviceURI = request.getParameter(TestConstants.PARAM_SERVICE_URI) ;
-        final String test = request.getParameter(TestConstants.PARAM_TEST) ;
-        final String testTimeoutValue = request.getParameter(TestConstants.PARAM_TEST_TIMEOUT) ;
-        // final String asyncTestValue = request.getParameter(TestConstants.PARAM_ASYNC_TEST) ;
-        String resultPageAddress = request.getParameter(TestConstants.PARAM_RESULT_PAGE);
-        if (resultPageAddress == null || resultPageAddress.length() == 0)
-        {
-           resultPageAddress = TestConstants.DEFAULT_RESULT_PAGE_ADDRESS;
-        }
-
-        final int serviceURILength = (serviceURI == null ? 0 : serviceURI.length()) ;
-        final int testLength = (test == null ? 0 : test.length()) ;
-        
-        long testTimeout = 0 ;
-        
-        boolean testTimeoutValid = false ;
-        if ((testTimeoutValue != null) && (testTimeoutValue.length() > 0))
-        {
-            try
-            {
-                testTimeout = Long.parseLong(testTimeoutValue) ;
-                testTimeoutValid = true ;
-            }
-            catch (final NumberFormatException nfe) {} // ignore
-        }
-        
-        // final boolean asyncTest = (asyncTestValue != null) ;
-        final boolean asyncTest = true ;
-
-        if ((serviceURILength == 0) || (testLength == 0) || !testTimeoutValid)
-        {
-            final RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/invalidParameters.html") ;
-            dispatcher.forward(request, response) ;
-            return ;
-        }
-        
-        final HttpSession session = request.getSession() ;
-        final String id = session.getId() ;
-        final int logCount = getLogCount(session) ;
-        final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss") ;
-        final String date = format.format(new Date()) ;
-        final String logName = date + "-" + id + "-" + logCount ;
-
-        session.setAttribute(TestConstants.ATTRIBUTE_TEST_RESULT, null) ;
-        session.setAttribute(TestConstants.ATTRIBUTE_TEST_VALIDATION, null) ;
-        session.setAttribute(TestConstants.ATTRIBUTE_LOG_NAME, null) ;
-
-        final String threadLog ;
-        try
-        {
-            final TestResult result = TestRunner.execute(serviceURI, testTimeout, asyncTest, test) ;
-            if (result != null)
-            {
-                session.setAttribute(TestConstants.ATTRIBUTE_TEST_RESULT, result) ;
-                
-                threadLog = MessageLogging.getThreadLog() ;
-                
-                try
-                {
-                    TestLogController.writeLog(logName, threadLog) ;
-                    session.setAttribute(TestConstants.ATTRIBUTE_LOG_NAME, logName) ;
-                }
-                catch (final IOException ioe)
-                {
-                    log("Unexpected IOException writing message log", ioe) ;
-                }
-            }
-            else
-            {
-                threadLog = null ;
-            }
-        }
-        finally
-        {
-            MessageLogging.clearThreadLog() ;
-        }
-        
-        if ((threadLog != null) && (threadLog.length() > 0))
-        {
-            try
-            {
-                final String testValidation = transform(threadLog) ;
-                session.setAttribute(TestConstants.ATTRIBUTE_TEST_VALIDATION, testValidation) ;
-            }
-            catch (final Throwable th)
-            {
-                log("Unexpected throwable transforming message log", th) ;
-            }
-        }
-        
-        final RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(resultPageAddress) ;
-        dispatcher.forward(request, response) ;
-    }
-    
-    /**
-     * Get the log count from the session, incrementing afterwards.
-     * @param session The current HTTP session.
-     * @return The log count.
-     */
-    private int getLogCount(final HttpSession session)
-    {
-        final Object logCountObject = session.getAttribute(TestConstants.ATTRIBUTE_LOG_COUNT) ;
-        final int logCount = (logCountObject == null ? 1 : ((Integer)logCountObject).intValue() + 1) ;
-        session.setAttribute(TestConstants.ATTRIBUTE_LOG_COUNT, new Integer(logCount)) ;
-        return logCount ;
-    }
-    
-    /**
-     * Transform the specified message log.
-     * @param messageLog The specified message log.
-     * @return The transformed result.
-     * @throws TransformerConfigurationException For transformer configuration errors.
-     * @throws TransformerException The transformation errors.
-     */
-    private String transform(final String messageLog)
-        throws TransformerConfigurationException, TransformerException
-    {
-        final Source source = new StreamSource(new StringReader(messageLog)) ;
-        final Transformer transformer = validationTemplates.newTransformer() ;
-        final StringWriter writer = new StringWriter() ;
-        final Result result = new StreamResult(writer) ;
-        transformer.transform(source, result) ;
-        return writer.toString() ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestServlet.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestServlet.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestServlet.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/TestServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,224 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.test;
+
+import com.arjuna.webservices.util.ClassLoaderHelper;
+import com.jboss.transaction.wstf.interop.MessageLogging;
+import junit.framework.TestResult;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * The test servlet.
+ * @author kevin
+ */
+public class TestServlet extends HttpServlet
+{
+    /**
+     * The servlet serial version UID.
+     */
+    private static final long serialVersionUID = 6764303043215036856L ;
+    
+    /**
+     * The validation templates.
+     */
+    private Templates validationTemplates ;
+
+
+    /**
+     * Initialise the servlet.
+     * @param config The servlet configuration.
+     */
+    public void init(final ServletConfig config)
+        throws ServletException
+    {
+        super.init(config) ;
+        
+        final InputStream is = ClassLoaderHelper.getResourceAsStream(getClass(), "processor.xsl") ;
+        if (is == null)
+        {
+            throw new ServletException("Cannot locate transformation stylesheet") ;
+        }
+        final TransformerFactory factory = TransformerFactory.newInstance() ;
+        try
+        {
+            validationTemplates = factory.newTemplates(new StreamSource(is)) ;
+        }
+        catch (final TransformerConfigurationException tce)
+        {
+            throw new ServletException("Error creating transformation template!", tce) ;
+        }
+    }
+    
+    /**
+     * Execute the test
+     * @param request The HTTP servlet request.
+     * @param response The HTTP servlet response.
+     */
+    protected void doPost(final HttpServletRequest request, final HttpServletResponse response)
+        throws ServletException, IOException
+    {
+        final String serviceURI = request.getParameter(TestConstants.PARAM_SERVICE_URI) ;
+        final String test = request.getParameter(TestConstants.PARAM_TEST) ;
+        final String testTimeoutValue = request.getParameter(TestConstants.PARAM_TEST_TIMEOUT) ;
+        // final String asyncTestValue = request.getParameter(TestConstants.PARAM_ASYNC_TEST) ;
+        String resultPageAddress = request.getParameter(TestConstants.PARAM_RESULT_PAGE);
+        if (resultPageAddress == null || resultPageAddress.length() == 0)
+        {
+           resultPageAddress = TestConstants.DEFAULT_RESULT_PAGE_ADDRESS;
+        }
+
+        final int serviceURILength = (serviceURI == null ? 0 : serviceURI.length()) ;
+        final int testLength = (test == null ? 0 : test.length()) ;
+        
+        long testTimeout = 0 ;
+        
+        boolean testTimeoutValid = false ;
+        if ((testTimeoutValue != null) && (testTimeoutValue.length() > 0))
+        {
+            try
+            {
+                testTimeout = Long.parseLong(testTimeoutValue) ;
+                testTimeoutValid = true ;
+            }
+            catch (final NumberFormatException nfe) {} // ignore
+        }
+        
+        // final boolean asyncTest = (asyncTestValue != null) ;
+        final boolean asyncTest = true ;
+
+        if ((serviceURILength == 0) || (testLength == 0) || !testTimeoutValid)
+        {
+            final RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/invalidParameters.html") ;
+            dispatcher.forward(request, response) ;
+            return ;
+        }
+        
+        final HttpSession session = request.getSession() ;
+        final String id = session.getId() ;
+        final int logCount = getLogCount(session) ;
+        final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss") ;
+        final String date = format.format(new Date()) ;
+        final String logName = date + "-" + id + "-" + logCount ;
+
+        session.setAttribute(TestConstants.ATTRIBUTE_TEST_RESULT, null) ;
+        session.setAttribute(TestConstants.ATTRIBUTE_TEST_VALIDATION, null) ;
+        session.setAttribute(TestConstants.ATTRIBUTE_LOG_NAME, null) ;
+
+        final String threadLog ;
+        try
+        {
+            final TestResult result = TestRunner.execute(serviceURI, testTimeout, asyncTest, test) ;
+            if (result != null)
+            {
+                session.setAttribute(TestConstants.ATTRIBUTE_TEST_RESULT, result) ;
+                
+                threadLog = MessageLogging.getThreadLog() ;
+                
+                try
+                {
+                    TestLogController.writeLog(logName, threadLog) ;
+                    session.setAttribute(TestConstants.ATTRIBUTE_LOG_NAME, logName) ;
+                }
+                catch (final IOException ioe)
+                {
+                    log("Unexpected IOException writing message log", ioe) ;
+                }
+            }
+            else
+            {
+                threadLog = null ;
+            }
+        }
+        finally
+        {
+            MessageLogging.clearThreadLog() ;
+        }
+        
+        if ((threadLog != null) && (threadLog.length() > 0))
+        {
+            try
+            {
+                final String testValidation = transform(threadLog) ;
+                session.setAttribute(TestConstants.ATTRIBUTE_TEST_VALIDATION, testValidation) ;
+            }
+            catch (final Throwable th)
+            {
+                log("Unexpected throwable transforming message log", th) ;
+            }
+        }
+        
+        final RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(resultPageAddress) ;
+        dispatcher.forward(request, response) ;
+    }
+    
+    /**
+     * Get the log count from the session, incrementing afterwards.
+     * @param session The current HTTP session.
+     * @return The log count.
+     */
+    private int getLogCount(final HttpSession session)
+    {
+        final Object logCountObject = session.getAttribute(TestConstants.ATTRIBUTE_LOG_COUNT) ;
+        final int logCount = (logCountObject == null ? 1 : ((Integer)logCountObject).intValue() + 1) ;
+        session.setAttribute(TestConstants.ATTRIBUTE_LOG_COUNT, new Integer(logCount)) ;
+        return logCount ;
+    }
+    
+    /**
+     * Transform the specified message log.
+     * @param messageLog The specified message log.
+     * @return The transformed result.
+     * @throws TransformerConfigurationException For transformer configuration errors.
+     * @throws TransformerException The transformation errors.
+     */
+    private String transform(final String messageLog)
+        throws TransformerConfigurationException, TransformerException
+    {
+        final Source source = new StreamSource(new StringReader(messageLog)) ;
+        final Transformer transformer = validationTemplates.newTransformer() ;
+        final StringWriter writer = new StringWriter() ;
+        final Result result = new StreamResult(writer) ;
+        transformer.transform(source, result) ;
+        return writer.toString() ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/XMLResultsServlet.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/XMLResultsServlet.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/XMLResultsServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,245 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.wstf.test;
-
-import org.dom4j.dom.DOMDocument;
-import org.dom4j.dom.DOMElement;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.XMLWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Formats test results to the JUnit XML format.
- * @author <a href="mailto:istudens at redhat.com">Ivo Studensky</a>
- * @version $Revision$
- */
-public class XMLResultsServlet extends HttpServlet
-{
-   public void doGet(HttpServletRequest request, HttpServletResponse response)
-       throws ServletException, IOException
-   {
-      doStatus(request, response);
-   }
-
-   public void doPost(HttpServletRequest request, HttpServletResponse response)
-       throws ServletException, IOException
-   {
-      doStatus(request, response);
-   }
-
-   public void doStatus(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
-   {
-      response.setContentType("text/xml");
-      response.setHeader("Cache-Control", "no-cache");
-
-      HttpSession session = request.getSession();
-      final FullTestResult testResult = (FullTestResult) session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT);
-
-      DOMDocument report = new DOMDocument();
-      DOMElement testsuite = new DOMElement("testsuite");
-      report.setRootElement(testsuite);
-
-      if (testResult == null)
-      {
-         // No JUnit test results generated.
-      }
-      else
-      {
-         List passedTests = testResult.getPassedTests();
-         List failedTests = testResult.getFailedTests();
-         List errorTests  = testResult.getErrorTests();
-
-         final int runCount = testResult.runCount() ;
-         final int errorCount = testResult.errorCount() ;
-         final int failureCount = testResult.failureCount() ;
-
-         testsuite.addAttribute("name", "com.jboss.transaction.wstf.interop.InteropTestSuite");
-         testsuite.addAttribute("errors", Integer.toString(errorCount));
-         testsuite.addAttribute("failures", Integer.toString(failureCount));
-         testsuite.addAttribute("hostname", request.getServerName());
-         testsuite.addAttribute("tests", Integer.toString(runCount));
-         testsuite.addAttribute("timestamp", new Date().toString());
-
-         DOMElement properties = new DOMElement("properties");
-         testsuite.add(properties);
-         DOMElement status = newPropertyDOMElement("status");
-         properties.add(status);
-         status.addAttribute("value", "finished");
-
-         long totalDuration = 0;
-
-         if (! passedTests.isEmpty())
-         {
-             Iterator passedTestsIterator = passedTests.iterator();
-             while (passedTestsIterator.hasNext())
-             {
-                 FullTestResult.PassedTest passedTest = (FullTestResult.PassedTest) passedTestsIterator.next();
-                 totalDuration += passedTest.duration;
-
-                 final String name = passedTest.test.toString();
-                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
-
-                 testsuite.add(newTestcase(
-                         passedTest.test.getClass().getName(), name + ": " + description, passedTest.duration));
-             }
-         }
-
-         if (! failedTests.isEmpty())
-         {
-             Iterator failedTestsIterator = failedTests.iterator();
-             while (failedTestsIterator.hasNext())
-             {
-                 FullTestResult.FailedTest failedTest = (FullTestResult.FailedTest) failedTestsIterator.next();
-                 totalDuration += failedTest.duration;
-
-                 final String name = failedTest.test.toString();
-                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
-                 CharArrayWriter charArrayWriter = new CharArrayWriter();
-                 PrintWriter printWriter     = new PrintWriter(charArrayWriter, true);
-                 failedTest.assertionFailedError.printStackTrace(printWriter);
-                 printWriter.close();
-                 charArrayWriter.close();
-
-                 testsuite.add(newFailedTestcase(
-                         failedTest.test.getClass().getName(), name + ": " + description, failedTest.duration,
-                         failedTest.assertionFailedError.getMessage(), charArrayWriter.toString()));
-             }
-         }
-
-         if (! errorTests.isEmpty())
-         {
-             Iterator errorTestsIterator = errorTests.iterator();
-             while (errorTestsIterator.hasNext())
-             {
-                 FullTestResult.ErrorTest errorTest = (FullTestResult.ErrorTest) errorTestsIterator.next();
-                 totalDuration += errorTest.duration;
-
-                 final String name = errorTest.test.toString();
-                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
-                 CharArrayWriter charArrayWriter = new CharArrayWriter();
-                 PrintWriter     printWriter     = new PrintWriter(charArrayWriter, true);
-                 errorTest.throwable.printStackTrace(printWriter);
-                 printWriter.close();
-                 charArrayWriter.close();
-
-                 System.out.println("charArrayWriter.toString()=" + charArrayWriter.toString());
-                 testsuite.add(newErrorTestcase(
-                         errorTest.test.getClass().getName(), name + ": " + description, errorTest.duration,
-                         errorTest.throwable.getMessage(), charArrayWriter.toString()));
-             }
-         }
-
-         // total time of all tests
-         testsuite.addAttribute("time", Float.toString(totalDuration / 1000f));
-      }
-
-      String logContent = null;
-      final String logName = (String)session.getAttribute(TestConstants.ATTRIBUTE_LOG_NAME) ;
-      if (logName != null)
-      {
-         try
-         {
-            logContent = TestLogController.readLog(logName) ;
-         }
-         catch (final Throwable th)
-         {
-            log("Error reading log file", th) ;
-         }
-      }
-
-      testsuite.add(new DOMElement("system-out").addCDATA((logContent != null) ? logContent : ""));
-      testsuite.add(new DOMElement("system-err").addCDATA(""));
-
-      XMLWriter outputter = new XMLWriter(response.getWriter(), OutputFormat.createPrettyPrint());
-      try {
-          outputter.write(testsuite);
-          outputter.close();
-      } catch (IOException e) {
-          throw new ServletException(e);
-      }
-   }
-
-   private DOMElement newPropertyDOMElement(String name)
-   {
-       return newPropertyDOMElement(name, null);
-   }
-
-   private DOMElement newPropertyDOMElement(String name, String value)
-   {
-       DOMElement property = new DOMElement("property");
-       property.addAttribute("name", name);
-       if (value != null)
-       {
-           property.addAttribute("value", value);
-       }
-       return property;
-   }
-
-   private DOMElement newTestcase(String classname, String name, long duration)
-   {
-       return newTestcase(classname, name, duration, null, null, null);
-   }
-
-   private DOMElement newFailedTestcase(String classname, String name, long duration, String failureMessage, String failureDetail)
-   {
-       return newTestcase(classname, name, duration, "junit.framework.AssertionFailedError", failureMessage, failureDetail);
-   }
-
-   private DOMElement newErrorTestcase(String classname, String name, long duration, String failureMessage, String failureDetail)
-   {
-       return newTestcase(classname, name, duration, "junit.framework.throwable", failureMessage, failureDetail);
-   }
-
-   private DOMElement newTestcase(String classname, String name, long duration, String failureMessage, String failureType, String failureDetail)
-   {
-       DOMElement testcase = new DOMElement("testcase");
-       testcase.addAttribute("classname", classname);
-       testcase.addAttribute("name", name);
-       testcase.addAttribute("time", Float.toString(duration / 1000f));    // converts from miliseconds to seconds
-       if (failureMessage != null)
-       {
-           DOMElement failure = new DOMElement("failure");
-           testcase.add(failure);
-           failure.addAttribute("message", failureMessage);
-           if (failureType != null)
-           {
-               failure.addAttribute("type", failureType);
-           }
-           if (failureDetail != null)
-           {
-               failure.addCDATA(failureDetail);
-           }
-       }
-       return testcase;
-   }
-
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/XMLResultsServlet.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/XMLResultsServlet.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/XMLResultsServlet.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/XMLResultsServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,245 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.test;
+
+import org.dom4j.dom.DOMDocument;
+import org.dom4j.dom.DOMElement;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Formats test results to the JUnit XML format.
+ * @author <a href="mailto:istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision$
+ */
+public class XMLResultsServlet extends HttpServlet
+{
+   public void doGet(HttpServletRequest request, HttpServletResponse response)
+       throws ServletException, IOException
+   {
+      doStatus(request, response);
+   }
+
+   public void doPost(HttpServletRequest request, HttpServletResponse response)
+       throws ServletException, IOException
+   {
+      doStatus(request, response);
+   }
+
+   public void doStatus(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+   {
+      response.setContentType("text/xml");
+      response.setHeader("Cache-Control", "no-cache");
+
+      HttpSession session = request.getSession();
+      final FullTestResult testResult = (FullTestResult) session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT);
+
+      DOMDocument report = new DOMDocument();
+      DOMElement testsuite = new DOMElement("testsuite");
+      report.setRootElement(testsuite);
+
+      if (testResult == null)
+      {
+         // No JUnit test results generated.
+      }
+      else
+      {
+         List passedTests = testResult.getPassedTests();
+         List failedTests = testResult.getFailedTests();
+         List errorTests  = testResult.getErrorTests();
+
+         final int runCount = testResult.runCount() ;
+         final int errorCount = testResult.errorCount() ;
+         final int failureCount = testResult.failureCount() ;
+
+         testsuite.addAttribute("name", "com.jboss.transaction.wstf.interop.InteropTestSuite");
+         testsuite.addAttribute("errors", Integer.toString(errorCount));
+         testsuite.addAttribute("failures", Integer.toString(failureCount));
+         testsuite.addAttribute("hostname", request.getServerName());
+         testsuite.addAttribute("tests", Integer.toString(runCount));
+         testsuite.addAttribute("timestamp", new Date().toString());
+
+         DOMElement properties = new DOMElement("properties");
+         testsuite.add(properties);
+         DOMElement status = newPropertyDOMElement("status");
+         properties.add(status);
+         status.addAttribute("value", "finished");
+
+         long totalDuration = 0;
+
+         if (! passedTests.isEmpty())
+         {
+             Iterator passedTestsIterator = passedTests.iterator();
+             while (passedTestsIterator.hasNext())
+             {
+                 FullTestResult.PassedTest passedTest = (FullTestResult.PassedTest) passedTestsIterator.next();
+                 totalDuration += passedTest.duration;
+
+                 final String name = passedTest.test.toString();
+                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
+
+                 testsuite.add(newTestcase(
+                         passedTest.test.getClass().getName(), name + ": " + description, passedTest.duration));
+             }
+         }
+
+         if (! failedTests.isEmpty())
+         {
+             Iterator failedTestsIterator = failedTests.iterator();
+             while (failedTestsIterator.hasNext())
+             {
+                 FullTestResult.FailedTest failedTest = (FullTestResult.FailedTest) failedTestsIterator.next();
+                 totalDuration += failedTest.duration;
+
+                 final String name = failedTest.test.toString();
+                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
+                 CharArrayWriter charArrayWriter = new CharArrayWriter();
+                 PrintWriter printWriter     = new PrintWriter(charArrayWriter, true);
+                 failedTest.assertionFailedError.printStackTrace(printWriter);
+                 printWriter.close();
+                 charArrayWriter.close();
+
+                 testsuite.add(newFailedTestcase(
+                         failedTest.test.getClass().getName(), name + ": " + description, failedTest.duration,
+                         failedTest.assertionFailedError.getMessage(), charArrayWriter.toString()));
+             }
+         }
+
+         if (! errorTests.isEmpty())
+         {
+             Iterator errorTestsIterator = errorTests.iterator();
+             while (errorTestsIterator.hasNext())
+             {
+                 FullTestResult.ErrorTest errorTest = (FullTestResult.ErrorTest) errorTestsIterator.next();
+                 totalDuration += errorTest.duration;
+
+                 final String name = errorTest.test.toString();
+                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
+                 CharArrayWriter charArrayWriter = new CharArrayWriter();
+                 PrintWriter     printWriter     = new PrintWriter(charArrayWriter, true);
+                 errorTest.throwable.printStackTrace(printWriter);
+                 printWriter.close();
+                 charArrayWriter.close();
+
+                 System.out.println("charArrayWriter.toString()=" + charArrayWriter.toString());
+                 testsuite.add(newErrorTestcase(
+                         errorTest.test.getClass().getName(), name + ": " + description, errorTest.duration,
+                         errorTest.throwable.getMessage(), charArrayWriter.toString()));
+             }
+         }
+
+         // total time of all tests
+         testsuite.addAttribute("time", Float.toString(totalDuration / 1000f));
+      }
+
+      String logContent = null;
+      final String logName = (String)session.getAttribute(TestConstants.ATTRIBUTE_LOG_NAME) ;
+      if (logName != null)
+      {
+         try
+         {
+            logContent = TestLogController.readLog(logName) ;
+         }
+         catch (final Throwable th)
+         {
+            log("Error reading log file", th) ;
+         }
+      }
+
+      testsuite.add(new DOMElement("system-out").addCDATA((logContent != null) ? logContent : ""));
+      testsuite.add(new DOMElement("system-err").addCDATA(""));
+
+      XMLWriter outputter = new XMLWriter(response.getWriter(), OutputFormat.createPrettyPrint());
+      try {
+          outputter.write(testsuite);
+          outputter.close();
+      } catch (IOException e) {
+          throw new ServletException(e);
+      }
+   }
+
+   private DOMElement newPropertyDOMElement(String name)
+   {
+       return newPropertyDOMElement(name, null);
+   }
+
+   private DOMElement newPropertyDOMElement(String name, String value)
+   {
+       DOMElement property = new DOMElement("property");
+       property.addAttribute("name", name);
+       if (value != null)
+       {
+           property.addAttribute("value", value);
+       }
+       return property;
+   }
+
+   private DOMElement newTestcase(String classname, String name, long duration)
+   {
+       return newTestcase(classname, name, duration, null, null, null);
+   }
+
+   private DOMElement newFailedTestcase(String classname, String name, long duration, String failureMessage, String failureDetail)
+   {
+       return newTestcase(classname, name, duration, "junit.framework.AssertionFailedError", failureMessage, failureDetail);
+   }
+
+   private DOMElement newErrorTestcase(String classname, String name, long duration, String failureMessage, String failureDetail)
+   {
+       return newTestcase(classname, name, duration, "junit.framework.throwable", failureMessage, failureDetail);
+   }
+
+   private DOMElement newTestcase(String classname, String name, long duration, String failureMessage, String failureType, String failureDetail)
+   {
+       DOMElement testcase = new DOMElement("testcase");
+       testcase.addAttribute("classname", classname);
+       testcase.addAttribute("name", name);
+       testcase.addAttribute("time", Float.toString(duration / 1000f));    // converts from miliseconds to seconds
+       if (failureMessage != null)
+       {
+           DOMElement failure = new DOMElement("failure");
+           testcase.add(failure);
+           failure.addAttribute("message", failureMessage);
+           if (failureType != null)
+           {
+               failure.addAttribute("type", failureType);
+           }
+           if (failureDetail != null)
+           {
+               failure.addCDATA(failureDetail);
+           }
+       }
+       return testcase;
+   }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/directoryContents.html
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/directoryContents.html	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/directoryContents.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,25 +0,0 @@
-<html>
-  <head>
-    <title>JBoss Transaction WS-TX interop results</title>
-  </head>
-  <body>
-    <h1>WS-TX Interop results</h1>
-    <!--
-    <p>These log files are the results of executing the JBoss Transaction WS-TX Interop client against public endpoints</p>
-    <table>
-    <thead>
-    <tr><td>Endpoint</td><td>Log file</td></tr>
-    </thead>
-    <tbody>
-    <tr><td>JBoss</td><td><a href="jboss-jboss.xml">jboss-jboss.xml</a></td></tr>
-    <tr><td>IBM</td><td><a href="jboss-ibm.xml">jboss-ibm.xml</a></td></tr>
-    <tr><td>Sun</td><td><a href="jboss-sun.xml">jboss-sun.xml</a></td></tr>
-    <tr><td>Microsoft</td><td><a href="jboss-msft.xml">jboss-msft.xml</a></td></tr>
-    <tr><td>Apache</td><td><a href="jboss-apache.xml">jboss-apache.xml</a></td></tr>
-    <tr><td>WSO2</td><td><a href="jboss-wso2.xml">jboss-wso2.xml</a></td></tr>
-    </tbody>
-    </table>
-    -->
-    <p>Please send any queries to the <a href="mailto:adinn at redhat.com?subject=Log%20results%20query">wstf test contact</a></p>
-  </body>
-</html>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/directoryContents.html (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/directoryContents.html)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/directoryContents.html	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/directoryContents.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,45 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<html>
+  <head>
+    <title>JBoss Transaction WS-TX interop results</title>
+  </head>
+  <body>
+    <h1>WS-TX Interop results</h1>
+    <!--
+    <p>These log files are the results of executing the JBoss Transaction WS-TX Interop client against public endpoints</p>
+    <table>
+    <thead>
+    <tr><td>Endpoint</td><td>Log file</td></tr>
+    </thead>
+    <tbody>
+    <tr><td>JBoss</td><td><a href="jboss-jboss.xml">jboss-jboss.xml</a></td></tr>
+    <tr><td>IBM</td><td><a href="jboss-ibm.xml">jboss-ibm.xml</a></td></tr>
+    <tr><td>Sun</td><td><a href="jboss-sun.xml">jboss-sun.xml</a></td></tr>
+    <tr><td>Microsoft</td><td><a href="jboss-msft.xml">jboss-msft.xml</a></td></tr>
+    <tr><td>Apache</td><td><a href="jboss-apache.xml">jboss-apache.xml</a></td></tr>
+    <tr><td>WSO2</td><td><a href="jboss-wso2.xml">jboss-wso2.xml</a></td></tr>
+    </tbody>
+    </table>
+    -->
+    <p>Please send any queries to the <a href="mailto:adinn at redhat.com?subject=Log%20results%20query">wstf test contact</a></p>
+  </body>
+</html>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/notFoundResponse.html
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/notFoundResponse.html	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/notFoundResponse.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <title>Log file not found</title>
-  </head>
-  <body>
-    <h1>Log file not found</h1>
-    Requested log file could not be found
-  </body>
-</html>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/notFoundResponse.html (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/notFoundResponse.html)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/notFoundResponse.html	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/notFoundResponse.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,29 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<html>
+  <head>
+    <title>Log file not found</title>
+  </head>
+  <body>
+    <h1>Log file not found</h1>
+    Requested log file could not be found
+  </body>
+</html>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/processor.xsl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/processor.xsl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/processor.xsl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,3 +0,0 @@
-<xsl:transform
-  id = "empty" version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-</xsl:transform>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/processor.xsl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/processor.xsl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/processor.xsl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/test/processor.xsl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,23 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<xsl:transform
+  id = "empty" version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</xsl:transform>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/CoordinationContextManager.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/CoordinationContextManager.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/CoordinationContextManager.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,59 +0,0 @@
-package com.jboss.transaction.wstf.webservices;
-
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-
-import javax.xml.ws.handler.MessageContext;
-
-/**
- * Helper class for passing a coordination context in a SOAP header when using JaxWS
- */
-public class CoordinationContextManager {
-    /**
-     * The key used for the coordination context within a message exchange.
-     */
-    private static final String COORDINATION_CONTEXT_PROPERTY = "org.jboss.xts.message.context.coordination.context.property";
-
-    /**
-     * The coordination context associated with the thread.
-     */
-    private static final ThreadLocal THREAD_CONTEXT = new ThreadLocal() ;
-
-    /**
-     * Get the coordination context from the message context if present.
-     * @param messageContext The message context.
-     * @return The coordination context or null if not present.
-     */
-    public static CoordinationContextType getContext(final MessageContext messageContext)
-    {
-        return (CoordinationContextType)messageContext.get(COORDINATION_CONTEXT_PROPERTY) ;
-    }
-
-    /**
-     * Set the coordination context for the message context.
-     * @param messageContext The message context.
-     * @param coordinationContext The coordination context.
-     */
-    public static void setContext(final MessageContext messageContext, final CoordinationContextType coordinationContext)
-    {
-        messageContext.put(COORDINATION_CONTEXT_PROPERTY, coordinationContext) ;
-        messageContext.setScope(COORDINATION_CONTEXT_PROPERTY, MessageContext.Scope.APPLICATION);
-    }
-
-    /**
-     * Get the coordination context from the current thread if present.
-     * @return The coordination context or null if not present.
-     */
-    public static CoordinationContextType getThreadContext()
-    {
-        return (CoordinationContextType)THREAD_CONTEXT.get() ;
-    }
-
-    /**
-     * Set the coordination context for the current thread.
-     * @param coordinationContext The coordination context.
-     */
-    public static void setThreadContext(final CoordinationContextType coordinationContext)
-    {
-        THREAD_CONTEXT.set(coordinationContext) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/CoordinationContextManager.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/CoordinationContextManager.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/CoordinationContextManager.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/CoordinationContextManager.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices;
+
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * Helper class for passing a coordination context in a SOAP header when using JaxWS
+ */
+public class CoordinationContextManager {
+    /**
+     * The key used for the coordination context within a message exchange.
+     */
+    private static final String COORDINATION_CONTEXT_PROPERTY = "org.jboss.xts.message.context.coordination.context.property";
+
+    /**
+     * The coordination context associated with the thread.
+     */
+    private static final ThreadLocal THREAD_CONTEXT = new ThreadLocal() ;
+
+    /**
+     * Get the coordination context from the message context if present.
+     * @param messageContext The message context.
+     * @return The coordination context or null if not present.
+     */
+    public static CoordinationContextType getContext(final MessageContext messageContext)
+    {
+        return (CoordinationContextType)messageContext.get(COORDINATION_CONTEXT_PROPERTY) ;
+    }
+
+    /**
+     * Set the coordination context for the message context.
+     * @param messageContext The message context.
+     * @param coordinationContext The coordination context.
+     */
+    public static void setContext(final MessageContext messageContext, final CoordinationContextType coordinationContext)
+    {
+        messageContext.put(COORDINATION_CONTEXT_PROPERTY, coordinationContext) ;
+        messageContext.setScope(COORDINATION_CONTEXT_PROPERTY, MessageContext.Scope.APPLICATION);
+    }
+
+    /**
+     * Get the coordination context from the current thread if present.
+     * @return The coordination context or null if not present.
+     */
+    public static CoordinationContextType getThreadContext()
+    {
+        return (CoordinationContextType)THREAD_CONTEXT.get() ;
+    }
+
+    /**
+     * Set the coordination context for the current thread.
+     * @param coordinationContext The coordination context.
+     */
+    public static void setThreadContext(final CoordinationContextType coordinationContext)
+    {
+        THREAD_CONTEXT.set(coordinationContext) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/InteropConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/InteropConstants.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/InteropConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,12 +0,0 @@
-package com.jboss.transaction.wstf.webservices;
-
-/**
- * Interface containing WS-TX Interop constants.
- */
-public interface InteropConstants
-{
-    /**
-     * The interop test participant service name.
-     */
-    public String SERVICE_PARTICIPANT = "Participant" ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/InteropConstants.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/InteropConstants.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/InteropConstants.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/InteropConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices;
+
+/**
+ * Interface containing WS-TX Interop constants.
+ */
+public interface InteropConstants
+{
+    /**
+     * The interop test participant service name.
+     */
+    public String SERVICE_PARTICIPANT = "Participant" ;
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/CoordinationContextHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/CoordinationContextHandler.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/CoordinationContextHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,202 +0,0 @@
-package com.jboss.transaction.wstf.webservices.handlers;
-
-import com.arjuna.webservices11.wscoor.CoordinationConstants;
-import com.jboss.transaction.wstf.webservices.CoordinationContextManager;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.ProtocolException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Marshaller;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Collections;
-
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-
-/**
- * Handler to serialise and deserialise a coordination context to/from a SOAP header.
- */
-public class CoordinationContextHandler implements SOAPHandler<SOAPMessageContext> {
-    /**
-     * Gets the header blocks that can be processed by this Handler
-     * instance.
-     *
-     * @return Set of QNames of header blocks processed by this
-     *         handler instance. <code>QName</code> is the qualified
-     *         name of the outermost element of the Header block.
-     */
-    public Set<QName> getHeaders()
-    {
-        return headers;
-    }
-
-    /**
-     * Handle an outgoing message by inserting any current arjuna context attached to the context into the message
-     * headers and handle an incoming message by retrieving the context from the headers and attaching it to the
-     * context,
-     *
-     * @param context the message context.
-     * @return Always return true
-     * @throws RuntimeException               Causes the JAX-WS runtime to cease
-     *                                        handler processing and generate a fault.
-     * @throws javax.xml.ws.ProtocolException Causes the JAX-WS runtime to switch to
-     *                                        fault message processing.
-     */
-    public boolean handleMessage(SOAPMessageContext context) throws ProtocolException
-    {
-        final boolean outbound = (Boolean)context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-        if (outbound) {
-            return handleMessageOutbound(context);
-        } else {
-            return handlemessageInbound(context);
-        }
-    }
-
-    /**
-     * check for an arjuna context attached to the message context and, if found, install its identifier as the value
-     * of a soap message header element
-     * @param context
-     * @return
-     * @throws ProtocolException
-     */
-    protected boolean handleMessageOutbound(SOAPMessageContext context) throws ProtocolException
-    {
-        try {
-            CoordinationContextType coordinationContext = CoordinationContextManager.getThreadContext();
-            if (coordinationContext != null) {
-                final JAXBContext jaxbCtx = getJaxbContext();
-
-                // insert a header into the current message containing the coordination context
-                final SOAPMessage soapMessage = context.getMessage();
-                final SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
-                SOAPHeader soapHeader = soapEnvelope.getHeader() ;
-                if (soapHeader == null)
-                {
-                    soapHeader = soapEnvelope.addHeader() ;
-                }
-                /*
-                 * this does not work but it is what we want!!
-                 *
-                 * The problem here is that the marshaller creates plain old elements and inserts them top
-                 * down as it goes along. but the soap header add child method checks its argument and
-                 * replaces plain elements with soap header elements before inserting them. it copies the
-                 * inserted element substructure into the rpelacement but since it does not exist at
-                 * copy time the chiuldren get lost
-                Marshaller marshaller = jaxbCtx.createMarshaller();
-                marshaller.marshal(coordinationContext, soapHeader);
-                 */
-                /*
-                 * ok, here's the workaround -- marshall the object as a child of a dummy header, detach it and
-                 * then insert it as a header element.
-                 */
-                SOAPHeaderElement headerElement = soapHeader.addHeaderElement(getDummyQName());
-                Marshaller marshaller = jaxbCtx.createMarshaller();
-                marshaller.marshal(coordinationContext, headerElement);
-                soapHeader.replaceChild(headerElement.getChildNodes().item(0), headerElement);
-                // ok, now we need to locate the inserted node and set the mustunderstand attribute
-                Iterator<SOAPHeaderElement> iterator = soapHeader.examineAllHeaderElements();
-                while (iterator.hasNext()) {
-                    headerElement = iterator.next();
-                    if (CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME.equals(headerElement.getElementQName())) {
-                        headerElement.setMustUnderstand(true);
-                        break;
-                    }
-                }
-            }
-        } catch (Exception se) {
-            throw new ProtocolException(se);
-        }
-
-        return true;
-    }
-
-    /**
-     * check for an arjuna instance identifier element embedded in the soap message headesr and, if found, use it to
-     * label an arjuna context attached to the message context
-     * @param context
-     * @return
-     * @throws ProtocolException
-     */
-    private boolean handlemessageInbound(SOAPMessageContext context)  throws ProtocolException
-    {
-        try {
-            final SOAPMessage soapMessage = context.getMessage();
-            final SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
-            Iterator<SOAPHeaderElement> iterator = soapEnvelope.getHeader().examineAllHeaderElements();
-            while (iterator.hasNext()) {
-                final SOAPHeaderElement headerElement = iterator.next();
-                if (CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME.equals(headerElement.getElementQName())) {
-                    // found it - clear the must understand flag, retrieve the value and store an arjuna
-                    // context in the message context
-                    headerElement.setMustUnderstand(false);
-                    final JAXBContext jaxbCtx = getJaxbContext();
-                    final JAXBElement<CoordinationContextType> elt = jaxbCtx.createUnmarshaller().unmarshal(headerElement, CoordinationContextType.class);
-                    final CoordinationContextType coordinationContext = elt.getValue();
-                    CoordinationContextManager.setContext(context, coordinationContext);
-                }
-            }
-        } catch (Exception se) {
-            throw new ProtocolException(se);
-        }
-
-        return true;
-    }
-
-    /**
-     * this handler ignores faults but allows other handlers to deal with them
-     *
-     * @param context the message context
-     * @return true to allow fault handling to continue
-     */
-
-    public boolean handleFault(SOAPMessageContext context)
-    {
-        return true;
-    }
-
-    /**
-     * this hanlder ignores close messages
-     *
-     * @param context the message context
-     */
-    public void close(javax.xml.ws.handler.MessageContext context)
-    {
-    }
-
-    /**
-     * a singleton set containing the only header this handler is interested in
-     */
-    private static Set<QName> headers = Collections.singleton(CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME);
-
-    private static JAXBContext jaxbContext;
-    private synchronized JAXBContext getJaxbContext()
-    {
-        if (jaxbContext == null) {
-            try {
-                jaxbContext = JAXBContext.newInstance("org.oasis_open.docs.ws_tx.wscoor._2006._06");
-            } catch (JAXBException e) {
-                // TODO log error here
-            }
-        }
-
-        return jaxbContext;
-    }
-    private static QName dummyQName = null;
-    private synchronized QName getDummyQName()
-    {
-        if (dummyQName == null) {
-            dummyQName = new QName("http://transactions.jboss.com/xts/dummy/", "DummyElement", "dummy");
-        }
-
-        return dummyQName;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/CoordinationContextHandler.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/CoordinationContextHandler.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/CoordinationContextHandler.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/handlers/CoordinationContextHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,222 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.handlers;
+
+import com.arjuna.webservices11.wscoor.CoordinationConstants;
+import com.jboss.transaction.wstf.webservices.CoordinationContextManager;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+import javax.xml.ws.handler.soap.SOAPHandler;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.ProtocolException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPHeaderElement;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Marshaller;
+import java.util.Set;
+import java.util.Iterator;
+import java.util.Collections;
+
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+
+/**
+ * Handler to serialise and deserialise a coordination context to/from a SOAP header.
+ */
+public class CoordinationContextHandler implements SOAPHandler<SOAPMessageContext> {
+    /**
+     * Gets the header blocks that can be processed by this Handler
+     * instance.
+     *
+     * @return Set of QNames of header blocks processed by this
+     *         handler instance. <code>QName</code> is the qualified
+     *         name of the outermost element of the Header block.
+     */
+    public Set<QName> getHeaders()
+    {
+        return headers;
+    }
+
+    /**
+     * Handle an outgoing message by inserting any current arjuna context attached to the context into the message
+     * headers and handle an incoming message by retrieving the context from the headers and attaching it to the
+     * context,
+     *
+     * @param context the message context.
+     * @return Always return true
+     * @throws RuntimeException               Causes the JAX-WS runtime to cease
+     *                                        handler processing and generate a fault.
+     * @throws javax.xml.ws.ProtocolException Causes the JAX-WS runtime to switch to
+     *                                        fault message processing.
+     */
+    public boolean handleMessage(SOAPMessageContext context) throws ProtocolException
+    {
+        final boolean outbound = (Boolean)context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
+        if (outbound) {
+            return handleMessageOutbound(context);
+        } else {
+            return handlemessageInbound(context);
+        }
+    }
+
+    /**
+     * check for an arjuna context attached to the message context and, if found, install its identifier as the value
+     * of a soap message header element
+     * @param context
+     * @return
+     * @throws ProtocolException
+     */
+    protected boolean handleMessageOutbound(SOAPMessageContext context) throws ProtocolException
+    {
+        try {
+            CoordinationContextType coordinationContext = CoordinationContextManager.getThreadContext();
+            if (coordinationContext != null) {
+                final JAXBContext jaxbCtx = getJaxbContext();
+
+                // insert a header into the current message containing the coordination context
+                final SOAPMessage soapMessage = context.getMessage();
+                final SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
+                SOAPHeader soapHeader = soapEnvelope.getHeader() ;
+                if (soapHeader == null)
+                {
+                    soapHeader = soapEnvelope.addHeader() ;
+                }
+                /*
+                 * this does not work but it is what we want!!
+                 *
+                 * The problem here is that the marshaller creates plain old elements and inserts them top
+                 * down as it goes along. but the soap header add child method checks its argument and
+                 * replaces plain elements with soap header elements before inserting them. it copies the
+                 * inserted element substructure into the rpelacement but since it does not exist at
+                 * copy time the chiuldren get lost
+                Marshaller marshaller = jaxbCtx.createMarshaller();
+                marshaller.marshal(coordinationContext, soapHeader);
+                 */
+                /*
+                 * ok, here's the workaround -- marshall the object as a child of a dummy header, detach it and
+                 * then insert it as a header element.
+                 */
+                SOAPHeaderElement headerElement = soapHeader.addHeaderElement(getDummyQName());
+                Marshaller marshaller = jaxbCtx.createMarshaller();
+                marshaller.marshal(coordinationContext, headerElement);
+                soapHeader.replaceChild(headerElement.getChildNodes().item(0), headerElement);
+                // ok, now we need to locate the inserted node and set the mustunderstand attribute
+                Iterator<SOAPHeaderElement> iterator = soapHeader.examineAllHeaderElements();
+                while (iterator.hasNext()) {
+                    headerElement = iterator.next();
+                    if (CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME.equals(headerElement.getElementQName())) {
+                        headerElement.setMustUnderstand(true);
+                        break;
+                    }
+                }
+            }
+        } catch (Exception se) {
+            throw new ProtocolException(se);
+        }
+
+        return true;
+    }
+
+    /**
+     * check for an arjuna instance identifier element embedded in the soap message headesr and, if found, use it to
+     * label an arjuna context attached to the message context
+     * @param context
+     * @return
+     * @throws ProtocolException
+     */
+    private boolean handlemessageInbound(SOAPMessageContext context)  throws ProtocolException
+    {
+        try {
+            final SOAPMessage soapMessage = context.getMessage();
+            final SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
+            Iterator<SOAPHeaderElement> iterator = soapEnvelope.getHeader().examineAllHeaderElements();
+            while (iterator.hasNext()) {
+                final SOAPHeaderElement headerElement = iterator.next();
+                if (CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME.equals(headerElement.getElementQName())) {
+                    // found it - clear the must understand flag, retrieve the value and store an arjuna
+                    // context in the message context
+                    headerElement.setMustUnderstand(false);
+                    final JAXBContext jaxbCtx = getJaxbContext();
+                    final JAXBElement<CoordinationContextType> elt = jaxbCtx.createUnmarshaller().unmarshal(headerElement, CoordinationContextType.class);
+                    final CoordinationContextType coordinationContext = elt.getValue();
+                    CoordinationContextManager.setContext(context, coordinationContext);
+                }
+            }
+        } catch (Exception se) {
+            throw new ProtocolException(se);
+        }
+
+        return true;
+    }
+
+    /**
+     * this handler ignores faults but allows other handlers to deal with them
+     *
+     * @param context the message context
+     * @return true to allow fault handling to continue
+     */
+
+    public boolean handleFault(SOAPMessageContext context)
+    {
+        return true;
+    }
+
+    /**
+     * this hanlder ignores close messages
+     *
+     * @param context the message context
+     */
+    public void close(javax.xml.ws.handler.MessageContext context)
+    {
+    }
+
+    /**
+     * a singleton set containing the only header this handler is interested in
+     */
+    private static Set<QName> headers = Collections.singleton(CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME);
+
+    private static JAXBContext jaxbContext;
+    private synchronized JAXBContext getJaxbContext()
+    {
+        if (jaxbContext == null) {
+            try {
+                jaxbContext = JAXBContext.newInstance("org.oasis_open.docs.ws_tx.wscoor._2006._06");
+            } catch (JAXBException e) {
+                // TODO log error here
+            }
+        }
+
+        return jaxbContext;
+    }
+    private static QName dummyQName = null;
+    private synchronized QName getDummyQName()
+    {
+        if (dummyQName == null) {
+            dummyQName = new QName("http://transactions.jboss.com/xts/dummy/", "DummyElement", "dummy");
+        }
+
+        return dummyQName;
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007 (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,545 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007;
-
-import java.io.IOException;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.SoapFaultType;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.SoapFault11;
-import com.jboss.transaction.wstf.webservices.sc007.client.AsyncParticipantClient;
-import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorCallback;
-import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorProcessor;
-import com.jboss.transaction.wstf.webservices.sc007.ParticipantStub;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The participant stub.
- */
-public class AsyncParticipantStub implements ParticipantStub
-{
-    /***
-     * The participant stub singletong.
-     */
-    private static final ParticipantStub PARTICIPANT_STUB = new AsyncParticipantStub() ;
-    
-    /**
-     * Get the participant stub singleton.
-     * @return The participant stub singleton.
-     */
-    public static ParticipantStub getParticipantStub()
-    {
-        return PARTICIPANT_STUB ;
-    }
-    
-    /**
-     * Send a completion commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionCommit(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a completion rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionRollback(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a phase2Rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a readonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a volatileAndDurable request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send an earlyReadonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a earlyAborted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a replayCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a retryPreparedCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a retryPreparedAbort request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a retryCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a preparedAfterTimeout request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a lostCommitted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Handle the callback.
-     * @param callback The callback.
-     * @throws SoapFault for errors.
-     */
-    private static void handleCallback(final RequestCallback callback)
-        throws SoapFault
-    {
-        if (callback.hasFailed())
-        {
-            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback execution failed") ;
-        }
-        else if (!callback.hasTriggered())
-        {
-            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback wasn't triggered") ;
-        }
-        else if (!callback.isResponse())
-        {
-            throw callback.getSoapFault() ;
-        }
-    }
-    
-    /**
-     * The request callback class.
-     */
-    private static final class RequestCallback extends InitiatorCallback
-    {
-        /**
-         * The response flag.
-         */
-        private boolean response ;
-        /**
-         * The SOAP fault response.
-         */
-        private SoapFault soapFault ;
-        
-        /**
-         * A response.
-         * @param addressingProperties The current addressing context.
-         */
-        public void response(final AddressingProperties addressingProperties)
-        {
-            this.response = true ;
-        }
-
-        /**
-         * A SOAP fault response.
-         * @param soapFault The SOAP fault response.
-         * @param addressingProperties The current addressing context.
-         */
-        public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
-        {
-            this.soapFault = soapFault ;
-        }
-        
-        /**
-         * Was a response received?
-         * @return true if a response was received, false otherwise.
-         */
-        boolean isResponse()
-        {
-            return response ;
-        }
-        
-        /**
-         * Get the SOAP fault.
-         * @return The SOAP fault or null.
-         */
-        SoapFault getSoapFault()
-        {
-            return soapFault ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,565 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007;
+
+import java.io.IOException;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.SoapFaultType;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.SoapFault11;
+import com.jboss.transaction.wstf.webservices.sc007.client.AsyncParticipantClient;
+import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorCallback;
+import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorProcessor;
+import com.jboss.transaction.wstf.webservices.sc007.ParticipantStub;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The participant stub.
+ */
+public class AsyncParticipantStub implements ParticipantStub
+{
+    /***
+     * The participant stub singletong.
+     */
+    private static final ParticipantStub PARTICIPANT_STUB = new AsyncParticipantStub() ;
+    
+    /**
+     * Get the participant stub singleton.
+     * @return The participant stub singleton.
+     */
+    public static ParticipantStub getParticipantStub()
+    {
+        return PARTICIPANT_STUB ;
+    }
+    
+    /**
+     * Send a completion commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionCommit(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a completion rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionRollback(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a phase2Rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a readonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a volatileAndDurable request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send an earlyReadonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a earlyAborted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a replayCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a retryPreparedCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a retryPreparedAbort request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a retryCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a preparedAfterTimeout request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a lostCommitted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Handle the callback.
+     * @param callback The callback.
+     * @throws SoapFault for errors.
+     */
+    private static void handleCallback(final RequestCallback callback)
+        throws SoapFault
+    {
+        if (callback.hasFailed())
+        {
+            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback execution failed") ;
+        }
+        else if (!callback.hasTriggered())
+        {
+            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback wasn't triggered") ;
+        }
+        else if (!callback.isResponse())
+        {
+            throw callback.getSoapFault() ;
+        }
+    }
+    
+    /**
+     * The request callback class.
+     */
+    private static final class RequestCallback extends InitiatorCallback
+    {
+        /**
+         * The response flag.
+         */
+        private boolean response ;
+        /**
+         * The SOAP fault response.
+         */
+        private SoapFault soapFault ;
+        
+        /**
+         * A response.
+         * @param addressingProperties The current addressing context.
+         */
+        public void response(final AddressingProperties addressingProperties)
+        {
+            this.response = true ;
+        }
+
+        /**
+         * A SOAP fault response.
+         * @param soapFault The SOAP fault response.
+         * @param addressingProperties The current addressing context.
+         */
+        public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+        {
+            this.soapFault = soapFault ;
+        }
+        
+        /**
+         * Was a response received?
+         * @return true if a response was received, false otherwise.
+         */
+        boolean isResponse()
+        {
+            return response ;
+        }
+        
+        /**
+         * Get the SOAP fault.
+         * @return The SOAP fault or null.
+         */
+        SoapFault getSoapFault()
+        {
+            return soapFault ;
+        }
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropConstants.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,245 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007;
-
-import javax.xml.namespace.QName;
-
-/**
- * Interface containing WS-TX AT Interop constants.
- */
-public interface InteropConstants
-{
-    /**
-     * The interop test initiator service name.
-     */
-    public String SERVICE_INITIATOR = "Sc007InitiatorService" ;
-
-    /**
-     * The interop test participant service name.
-     */
-    public String SERVICE_PARTICIPANT = "Sc007ParticipantService" ;
-
-    /**
-     * The interop Namespace.
-     */
-    public String INTEROP_NAMESPACE = "http://www.wstf.org/sc007" ;
-    /**
-     * The interop namespace prefix.
-     */
-    public String INTEROP_PREFIX = "sc007" ;
-    
-    /**
-     * The participant action prefix.
-     */
-    public String INTEROP_ACTION_PARTICIPANT_PREFIX = INTEROP_NAMESPACE + "/ParticipantPortType/" ;
-    /**
-     * The initiator action prefix.
-     */
-    public String INTEROP_ACTION_INITIATOR_PREFIX = INTEROP_NAMESPACE + "/InitiatorPortType/" ;
-
-    /**
-     * The completion commit element.
-     */
-    public String INTEROP_ELEMENT_COMPLETION_COMMIT = "CompletionCommit" ;
-    /**
-     * The completion commit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_COMPLETION_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPLETION_COMMIT, INTEROP_PREFIX) ;
-    /**
-     * The completion commit Action.
-     */
-    public String INTEROP_ACTION_COMPLETION_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPLETION_COMMIT ;
-    
-    /**
-     * The completion rollback element.
-     */
-    public String INTEROP_ELEMENT_COMPLETION_ROLLBACK = "CompletionRollback" ;
-    /**
-     * The completion rollback QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_COMPLETION_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPLETION_ROLLBACK, INTEROP_PREFIX) ;
-    /**
-     * The completion rollback Action.
-     */
-    public String INTEROP_ACTION_COMPLETION_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPLETION_ROLLBACK ;
-    
-    /**
-     * The commit element.
-     */
-    public String INTEROP_ELEMENT_COMMIT = "Commit" ;
-    /**
-     * The commit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMMIT, INTEROP_PREFIX) ;
-    /**
-     * The commit Action.
-     */
-    public String INTEROP_ACTION_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMMIT ;
-    
-    /**
-     * The rollback element.
-     */
-    public String INTEROP_ELEMENT_ROLLBACK = "Rollback" ;
-    /**
-     * The rollback QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_ROLLBACK, INTEROP_PREFIX) ;
-    /**
-     * The rollback Action.
-     */
-    public String INTEROP_ACTION_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_ROLLBACK ;
-    
-    /**
-     * The phase 2 rollback element.
-     */
-    public String INTEROP_ELEMENT_PHASE_2_ROLLBACK = "Phase2Rollback" ;
-    /**
-     * The phase 2 rollback QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_PHASE_2_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PHASE_2_ROLLBACK, INTEROP_PREFIX) ;
-    /**
-     * The phase 2 rollback Action.
-     */
-    public String INTEROP_ACTION_PHASE_2_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PHASE_2_ROLLBACK ;
-    
-    /**
-     * The readonly element.
-     */
-    public String INTEROP_ELEMENT_READONLY = "Readonly" ;
-    /**
-     * The readonly QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_READONLY = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_READONLY, INTEROP_PREFIX) ;
-    /**
-     * The readonly Action.
-     */
-    public String INTEROP_ACTION_READONLY = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_READONLY ;
-    
-    /**
-     * The volatile and durable element.
-     */
-    public String INTEROP_ELEMENT_VOLATILE_AND_DURABLE = "VolatileAndDurable" ;
-    /**
-     * The volatile and durable QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_VOLATILE_AND_DURABLE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_VOLATILE_AND_DURABLE, INTEROP_PREFIX) ;
-    /**
-     * The volatile and durable Action.
-     */
-    public String INTEROP_ACTION_VOLATILE_AND_DURABLE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_VOLATILE_AND_DURABLE ;
-    
-    /**
-     * The early readonly element.
-     */
-    public String INTEROP_ELEMENT_EARLY_READONLY = "EarlyReadonly" ;
-    /**
-     * The early readonly QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_EARLY_READONLY = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_EARLY_READONLY, INTEROP_PREFIX) ;
-    /**
-     * The early readonly Action.
-     */
-    public String INTEROP_ACTION_EARLY_READONLY = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_EARLY_READONLY ;
-    
-    /**
-     * The early aborted element.
-     */
-    public String INTEROP_ELEMENT_EARLY_ABORTED = "EarlyAborted" ;
-    /**
-     * The early aborted QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_EARLY_ABORTED = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_EARLY_ABORTED, INTEROP_PREFIX) ;
-    /**
-     * The early aborted Action.
-     */
-    public String INTEROP_ACTION_EARLY_ABORTED = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_EARLY_ABORTED ;
-    
-    /**
-     * The replay commit element.
-     */
-    public String INTEROP_ELEMENT_REPLAY_COMMIT = "ReplayCommit" ;
-    /**
-     * The replay commit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_REPLAY_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_REPLAY_COMMIT, INTEROP_PREFIX) ;
-    /**
-     * The replay commit Action.
-     */
-    public String INTEROP_ACTION_REPLAY_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_REPLAY_COMMIT ;
-    
-    /**
-     * The retry prepared commit element.
-     */
-    public String INTEROP_ELEMENT_RETRY_PREPARED_COMMIT = "RetryPreparedCommit" ;
-    /**
-     * The retry prepared commit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_RETRY_PREPARED_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_PREPARED_COMMIT, INTEROP_PREFIX) ;
-    /**
-     * The retry prepared commit Action.
-     */
-    public String INTEROP_ACTION_RETRY_PREPARED_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_PREPARED_COMMIT ;
-    
-    /**
-     * The retry prepared abort element.
-     */
-    public String INTEROP_ELEMENT_RETRY_PREPARED_ABORT = "RetryPreparedAbort" ;
-    /**
-     * The retry prepared abort QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_RETRY_PREPARED_ABORT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_PREPARED_ABORT, INTEROP_PREFIX) ;
-    /**
-     * The retry prepared abort Action.
-     */
-    public String INTEROP_ACTION_RETRY_PREPARED_ABORT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_PREPARED_ABORT ;
-    
-    /**
-     * The retry commit element.
-     */
-    public String INTEROP_ELEMENT_RETRY_COMMIT = "RetryCommit" ;
-    /**
-     * The retry commit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_RETRY_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_COMMIT, INTEROP_PREFIX) ;
-    /**
-     * The retry commit Action.
-     */
-    public String INTEROP_ACTION_RETRY_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_COMMIT ;
-    
-    /**
-     * The prepared after timeout element.
-     */
-    public String INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT = "PreparedAfterTimeout" ;
-    /**
-     * The prepared after timeout QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_PREPARED_AFTER_TIMEOUT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT, INTEROP_PREFIX) ;
-    /**
-     * The prepared after timeout Action.
-     */
-    public String INTEROP_ACTION_PREPARED_AFTER_TIMEOUT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT ;
-    
-    /**
-     * The lost committed element.
-     */
-    public String INTEROP_ELEMENT_LOST_COMMITTED = "LostCommitted" ;
-    /**
-     * The lost committed QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_LOST_COMMITTED = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_LOST_COMMITTED, INTEROP_PREFIX) ;
-    /**
-     * The lost committed Action.
-     */
-    public String INTEROP_ACTION_LOST_COMMITTED = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_LOST_COMMITTED ;
-    
-    /**
-     * The response element.
-     */
-    public String INTEROP_ELEMENT_RESPONSE = "Response" ;
-    /**
-     * The response QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_RESPONSE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RESPONSE, INTEROP_PREFIX) ;
-    /**
-     * The response Action.
-     */
-    public String INTEROP_ACTION_RESPONSE = INTEROP_ACTION_INITIATOR_PREFIX + INTEROP_ELEMENT_RESPONSE ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropConstants.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropConstants.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropConstants.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,265 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Interface containing WS-TX AT Interop constants.
+ */
+public interface InteropConstants
+{
+    /**
+     * The interop test initiator service name.
+     */
+    public String SERVICE_INITIATOR = "Sc007InitiatorService" ;
+
+    /**
+     * The interop test participant service name.
+     */
+    public String SERVICE_PARTICIPANT = "Sc007ParticipantService" ;
+
+    /**
+     * The interop Namespace.
+     */
+    public String INTEROP_NAMESPACE = "http://www.wstf.org/sc007" ;
+    /**
+     * The interop namespace prefix.
+     */
+    public String INTEROP_PREFIX = "sc007" ;
+    
+    /**
+     * The participant action prefix.
+     */
+    public String INTEROP_ACTION_PARTICIPANT_PREFIX = INTEROP_NAMESPACE + "/ParticipantPortType/" ;
+    /**
+     * The initiator action prefix.
+     */
+    public String INTEROP_ACTION_INITIATOR_PREFIX = INTEROP_NAMESPACE + "/InitiatorPortType/" ;
+
+    /**
+     * The completion commit element.
+     */
+    public String INTEROP_ELEMENT_COMPLETION_COMMIT = "CompletionCommit" ;
+    /**
+     * The completion commit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_COMPLETION_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPLETION_COMMIT, INTEROP_PREFIX) ;
+    /**
+     * The completion commit Action.
+     */
+    public String INTEROP_ACTION_COMPLETION_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPLETION_COMMIT ;
+    
+    /**
+     * The completion rollback element.
+     */
+    public String INTEROP_ELEMENT_COMPLETION_ROLLBACK = "CompletionRollback" ;
+    /**
+     * The completion rollback QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_COMPLETION_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPLETION_ROLLBACK, INTEROP_PREFIX) ;
+    /**
+     * The completion rollback Action.
+     */
+    public String INTEROP_ACTION_COMPLETION_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPLETION_ROLLBACK ;
+    
+    /**
+     * The commit element.
+     */
+    public String INTEROP_ELEMENT_COMMIT = "Commit" ;
+    /**
+     * The commit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMMIT, INTEROP_PREFIX) ;
+    /**
+     * The commit Action.
+     */
+    public String INTEROP_ACTION_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMMIT ;
+    
+    /**
+     * The rollback element.
+     */
+    public String INTEROP_ELEMENT_ROLLBACK = "Rollback" ;
+    /**
+     * The rollback QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_ROLLBACK, INTEROP_PREFIX) ;
+    /**
+     * The rollback Action.
+     */
+    public String INTEROP_ACTION_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_ROLLBACK ;
+    
+    /**
+     * The phase 2 rollback element.
+     */
+    public String INTEROP_ELEMENT_PHASE_2_ROLLBACK = "Phase2Rollback" ;
+    /**
+     * The phase 2 rollback QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_PHASE_2_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PHASE_2_ROLLBACK, INTEROP_PREFIX) ;
+    /**
+     * The phase 2 rollback Action.
+     */
+    public String INTEROP_ACTION_PHASE_2_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PHASE_2_ROLLBACK ;
+    
+    /**
+     * The readonly element.
+     */
+    public String INTEROP_ELEMENT_READONLY = "Readonly" ;
+    /**
+     * The readonly QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_READONLY = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_READONLY, INTEROP_PREFIX) ;
+    /**
+     * The readonly Action.
+     */
+    public String INTEROP_ACTION_READONLY = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_READONLY ;
+    
+    /**
+     * The volatile and durable element.
+     */
+    public String INTEROP_ELEMENT_VOLATILE_AND_DURABLE = "VolatileAndDurable" ;
+    /**
+     * The volatile and durable QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_VOLATILE_AND_DURABLE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_VOLATILE_AND_DURABLE, INTEROP_PREFIX) ;
+    /**
+     * The volatile and durable Action.
+     */
+    public String INTEROP_ACTION_VOLATILE_AND_DURABLE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_VOLATILE_AND_DURABLE ;
+    
+    /**
+     * The early readonly element.
+     */
+    public String INTEROP_ELEMENT_EARLY_READONLY = "EarlyReadonly" ;
+    /**
+     * The early readonly QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_EARLY_READONLY = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_EARLY_READONLY, INTEROP_PREFIX) ;
+    /**
+     * The early readonly Action.
+     */
+    public String INTEROP_ACTION_EARLY_READONLY = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_EARLY_READONLY ;
+    
+    /**
+     * The early aborted element.
+     */
+    public String INTEROP_ELEMENT_EARLY_ABORTED = "EarlyAborted" ;
+    /**
+     * The early aborted QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_EARLY_ABORTED = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_EARLY_ABORTED, INTEROP_PREFIX) ;
+    /**
+     * The early aborted Action.
+     */
+    public String INTEROP_ACTION_EARLY_ABORTED = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_EARLY_ABORTED ;
+    
+    /**
+     * The replay commit element.
+     */
+    public String INTEROP_ELEMENT_REPLAY_COMMIT = "ReplayCommit" ;
+    /**
+     * The replay commit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_REPLAY_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_REPLAY_COMMIT, INTEROP_PREFIX) ;
+    /**
+     * The replay commit Action.
+     */
+    public String INTEROP_ACTION_REPLAY_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_REPLAY_COMMIT ;
+    
+    /**
+     * The retry prepared commit element.
+     */
+    public String INTEROP_ELEMENT_RETRY_PREPARED_COMMIT = "RetryPreparedCommit" ;
+    /**
+     * The retry prepared commit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_RETRY_PREPARED_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_PREPARED_COMMIT, INTEROP_PREFIX) ;
+    /**
+     * The retry prepared commit Action.
+     */
+    public String INTEROP_ACTION_RETRY_PREPARED_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_PREPARED_COMMIT ;
+    
+    /**
+     * The retry prepared abort element.
+     */
+    public String INTEROP_ELEMENT_RETRY_PREPARED_ABORT = "RetryPreparedAbort" ;
+    /**
+     * The retry prepared abort QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_RETRY_PREPARED_ABORT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_PREPARED_ABORT, INTEROP_PREFIX) ;
+    /**
+     * The retry prepared abort Action.
+     */
+    public String INTEROP_ACTION_RETRY_PREPARED_ABORT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_PREPARED_ABORT ;
+    
+    /**
+     * The retry commit element.
+     */
+    public String INTEROP_ELEMENT_RETRY_COMMIT = "RetryCommit" ;
+    /**
+     * The retry commit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_RETRY_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_COMMIT, INTEROP_PREFIX) ;
+    /**
+     * The retry commit Action.
+     */
+    public String INTEROP_ACTION_RETRY_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_COMMIT ;
+    
+    /**
+     * The prepared after timeout element.
+     */
+    public String INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT = "PreparedAfterTimeout" ;
+    /**
+     * The prepared after timeout QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_PREPARED_AFTER_TIMEOUT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT, INTEROP_PREFIX) ;
+    /**
+     * The prepared after timeout Action.
+     */
+    public String INTEROP_ACTION_PREPARED_AFTER_TIMEOUT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT ;
+    
+    /**
+     * The lost committed element.
+     */
+    public String INTEROP_ELEMENT_LOST_COMMITTED = "LostCommitted" ;
+    /**
+     * The lost committed QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_LOST_COMMITTED = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_LOST_COMMITTED, INTEROP_PREFIX) ;
+    /**
+     * The lost committed Action.
+     */
+    public String INTEROP_ACTION_LOST_COMMITTED = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_LOST_COMMITTED ;
+    
+    /**
+     * The response element.
+     */
+    public String INTEROP_ELEMENT_RESPONSE = "Response" ;
+    /**
+     * The response QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_RESPONSE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RESPONSE, INTEROP_PREFIX) ;
+    /**
+     * The response Action.
+     */
+    public String INTEROP_ACTION_RESPONSE = INTEROP_ACTION_INITIATOR_PREFIX + INTEROP_ELEMENT_RESPONSE ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropUtil.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropUtil.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropUtil.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,145 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007;
-
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.webservices11.wsarj.InstanceIdentifier;
-import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.wsc11.ActivationCoordinator;
-import com.arjuna.wsc11.RegistrationCoordinator;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.arjuna.wst.CompletionCoordinatorParticipant;
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.Participant;
-import com.arjuna.wst.Volatile2PCParticipant;
-import com.arjuna.wst11.messaging.engines.ParticipantEngine;
-import com.arjuna.wst11.stub.CompletionStub;
-
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
-
-/**
- * Utility methods
- */
-public class InteropUtil
-{
-    /**
-     * Get a coordination context.
-     * @param coordinatorURI The coordinator URI.
-     * @return The coordination context.
-     * @throws Exception for errors.
-     */
-    public static CoordinationContextType createCoordinationContext(final String coordinatorURI)
-        throws Exception
-    {
-        return ActivationCoordinator.createCoordinationContext(coordinatorURI, MessageId.getMessageId(), AtomicTransactionConstants.WSAT_PROTOCOL, null, null) ;
-    }
-
-    /**
-     * Register for completion.
-     * @param context The coordination context.
-     * @return The endpoint for communicating with the coordinator.
-     * @throws Exception for errors.
-     */
-    public static CompletionCoordinatorParticipant registerCompletion(final CoordinationContextType context, final String id)
-        throws Exception
-    {
-        final W3CEndpointReference completionCoordinator = register(context, getCompletionParticipant(id), AtomicTransactionConstants.WSAT_SUB_PROTOCOL_COMPLETION) ;
-        return new CompletionStub(id, completionCoordinator);
-    }
-    
-    /**
-     * Register a durable participant in the specified coordination context.
-     * @param context The coordination context.
-     * @param participant The durable 2PC participant
-     * @param id The participant id.
-     * @return The participant engine.
-     * @throws Exception for errors.
-     */
-    public static ParticipantEngine registerDurable2PC(final CoordinationContextType context, final Durable2PCParticipant participant, final String id)
-        throws Exception
-    {
-        return registerParticipant(context, participant, id, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_DURABLE_2PC) ;
-    }
-    
-    /**
-     * Register a volatile participant in the specified coordination context.
-     * @param context The coordination context.
-     * @param participant The volatile 2PC participant
-     * @param id The participant id.
-     * @return The participant engine.
-     * @throws Exception for errors.
-     */
-    public static ParticipantEngine registerVolatile2PC(final CoordinationContextType context, final Volatile2PCParticipant participant, final String id)
-        throws Exception
-    {
-        return registerParticipant(context, participant, id, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_VOLATILE_2PC) ;
-    }
-    
-    /**
-     * Register the participant in the specified coordination context.
-     * @param context The coordination context.
-     * @param participant The participant.
-     * @param id The participant id.
-     * @param protocol The sub protocol to register for.
-     * @return The participant engine.
-     * @throws Exception for errors.
-     */
-    private static ParticipantEngine registerParticipant(final CoordinationContextType context, final Participant participant, final String id, final String protocol)
-        throws Exception
-    {
-        final W3CEndpointReference coordinator = RegistrationCoordinator.register(context, MessageId.getMessageId(),
-            getParticipant(id), protocol) ;
-        final ParticipantEngine engine = new ParticipantEngine(participant, id, coordinator) ;
-        ParticipantProcessor.getProcessor().activateParticipant(engine, id) ;
-        return engine ;
-    }
-    
-    /**
-     * Register for a sub protocol.
-     * @param context The coordination context.
-     * @param participant The participant EPR.
-     * @param protocol The protocol.
-     * @return The coordinator endpoint.
-     * @throws Exception for errors.
-     */
-    private static W3CEndpointReference register(final CoordinationContextType context, final W3CEndpointReference participant, final String protocol)
-        throws Exception
-    {
-        return RegistrationCoordinator.register(context, MessageId.getMessageId(), participant, protocol) ;
-    }
-
-    /**
-     * Get an endpoint reference for the completion initiator service.
-     * @param id The completion id.
-     * @return The endpoint reference.
-     */
-    private static W3CEndpointReference getCompletionParticipant(final String id)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        final String serviceURI = serviceRegistry.getServiceURI(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME) ;
-        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
-        builder.serviceName(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_QNAME);
-        builder.endpointName(AtomicTransactionConstants.COMPLETION_INITIATOR_PORT_QNAME);
-        builder.address(serviceURI);
-        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
-        return builder.build();
-    }
-
-    /**
-     * Get an endpoint reference for the participant service.
-     * @param id The participant id.
-     * @return The endpoint reference.
-     */
-    private static W3CEndpointReference getParticipant(final String id)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        final String serviceURI = serviceRegistry.getServiceURI(AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME) ;
-        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
-        builder.serviceName(AtomicTransactionConstants.PARTICIPANT_SERVICE_QNAME);
-        builder.endpointName(AtomicTransactionConstants.PARTICIPANT_PORT_QNAME);
-        builder.address(serviceURI);
-        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
-        return builder.build();
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropUtil.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropUtil.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropUtil.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/InteropUtil.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,165 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007;
+
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.webservices11.wsarj.InstanceIdentifier;
+import com.arjuna.webservices11.ServiceRegistry;
+import com.arjuna.wsc11.ActivationCoordinator;
+import com.arjuna.wsc11.RegistrationCoordinator;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.arjuna.wst.CompletionCoordinatorParticipant;
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.Participant;
+import com.arjuna.wst.Volatile2PCParticipant;
+import com.arjuna.wst11.messaging.engines.ParticipantEngine;
+import com.arjuna.wst11.stub.CompletionStub;
+
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
+
+/**
+ * Utility methods
+ */
+public class InteropUtil
+{
+    /**
+     * Get a coordination context.
+     * @param coordinatorURI The coordinator URI.
+     * @return The coordination context.
+     * @throws Exception for errors.
+     */
+    public static CoordinationContextType createCoordinationContext(final String coordinatorURI)
+        throws Exception
+    {
+        return ActivationCoordinator.createCoordinationContext(coordinatorURI, MessageId.getMessageId(), AtomicTransactionConstants.WSAT_PROTOCOL, null, null) ;
+    }
+
+    /**
+     * Register for completion.
+     * @param context The coordination context.
+     * @return The endpoint for communicating with the coordinator.
+     * @throws Exception for errors.
+     */
+    public static CompletionCoordinatorParticipant registerCompletion(final CoordinationContextType context, final String id)
+        throws Exception
+    {
+        final W3CEndpointReference completionCoordinator = register(context, getCompletionParticipant(id), AtomicTransactionConstants.WSAT_SUB_PROTOCOL_COMPLETION) ;
+        return new CompletionStub(id, completionCoordinator);
+    }
+    
+    /**
+     * Register a durable participant in the specified coordination context.
+     * @param context The coordination context.
+     * @param participant The durable 2PC participant
+     * @param id The participant id.
+     * @return The participant engine.
+     * @throws Exception for errors.
+     */
+    public static ParticipantEngine registerDurable2PC(final CoordinationContextType context, final Durable2PCParticipant participant, final String id)
+        throws Exception
+    {
+        return registerParticipant(context, participant, id, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_DURABLE_2PC) ;
+    }
+    
+    /**
+     * Register a volatile participant in the specified coordination context.
+     * @param context The coordination context.
+     * @param participant The volatile 2PC participant
+     * @param id The participant id.
+     * @return The participant engine.
+     * @throws Exception for errors.
+     */
+    public static ParticipantEngine registerVolatile2PC(final CoordinationContextType context, final Volatile2PCParticipant participant, final String id)
+        throws Exception
+    {
+        return registerParticipant(context, participant, id, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_VOLATILE_2PC) ;
+    }
+    
+    /**
+     * Register the participant in the specified coordination context.
+     * @param context The coordination context.
+     * @param participant The participant.
+     * @param id The participant id.
+     * @param protocol The sub protocol to register for.
+     * @return The participant engine.
+     * @throws Exception for errors.
+     */
+    private static ParticipantEngine registerParticipant(final CoordinationContextType context, final Participant participant, final String id, final String protocol)
+        throws Exception
+    {
+        final W3CEndpointReference coordinator = RegistrationCoordinator.register(context, MessageId.getMessageId(),
+            getParticipant(id), protocol) ;
+        final ParticipantEngine engine = new ParticipantEngine(participant, id, coordinator) ;
+        ParticipantProcessor.getProcessor().activateParticipant(engine, id) ;
+        return engine ;
+    }
+    
+    /**
+     * Register for a sub protocol.
+     * @param context The coordination context.
+     * @param participant The participant EPR.
+     * @param protocol The protocol.
+     * @return The coordinator endpoint.
+     * @throws Exception for errors.
+     */
+    private static W3CEndpointReference register(final CoordinationContextType context, final W3CEndpointReference participant, final String protocol)
+        throws Exception
+    {
+        return RegistrationCoordinator.register(context, MessageId.getMessageId(), participant, protocol) ;
+    }
+
+    /**
+     * Get an endpoint reference for the completion initiator service.
+     * @param id The completion id.
+     * @return The endpoint reference.
+     */
+    private static W3CEndpointReference getCompletionParticipant(final String id)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        final String serviceURI = serviceRegistry.getServiceURI(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME) ;
+        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
+        builder.serviceName(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_QNAME);
+        builder.endpointName(AtomicTransactionConstants.COMPLETION_INITIATOR_PORT_QNAME);
+        builder.address(serviceURI);
+        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
+        return builder.build();
+    }
+
+    /**
+     * Get an endpoint reference for the participant service.
+     * @param id The participant id.
+     * @return The endpoint reference.
+     */
+    private static W3CEndpointReference getParticipant(final String id)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        final String serviceURI = serviceRegistry.getServiceURI(AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME) ;
+        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
+        builder.serviceName(AtomicTransactionConstants.PARTICIPANT_SERVICE_QNAME);
+        builder.endpointName(AtomicTransactionConstants.PARTICIPANT_PORT_QNAME);
+        builder.address(serviceURI);
+        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
+        return builder.build();
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/ParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/ParticipantStub.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/ParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,162 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007;
-
-import java.io.IOException;
-
-import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-
-/**
- * The interface for the participant stub.
- */
-public interface ParticipantStub
-{
-    /**
-     * Send a completion commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionCommit(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a completion rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionRollback(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a phase2Rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a readonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a volatileAndDurable request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send an earlyReadonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a earlyAborted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a replayCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a retryPreparedCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a retryPreparedAbort request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a retryCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a preparedAfterTimeout request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a lostCommitted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/ParticipantStub.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/ParticipantStub.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/ParticipantStub.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/ParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,182 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007;
+
+import java.io.IOException;
+
+import com.arjuna.webservices.SoapFault;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+
+/**
+ * The interface for the participant stub.
+ */
+public interface ParticipantStub
+{
+    /**
+     * Send a completion commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionCommit(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a completion rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionRollback(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a phase2Rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a readonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a volatileAndDurable request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send an earlyReadonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a earlyAborted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a replayCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a retryPreparedCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a retryPreparedAbort request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a retryCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a preparedAfterTimeout request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a lostCommitted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,271 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007;
-
-import java.io.IOException;
-
-import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.jboss.transaction.wstf.webservices.sc007.client.SyncParticipantClient;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The participant stub.
- */
-public class SyncParticipantStub implements ParticipantStub
-{
-    /**
-     * The participant stub singletong.
-     */
-    private static final ParticipantStub PARTICIPANT_STUB = new SyncParticipantStub() ;
-    
-    /**
-     * Get the participant stub singleton.
-     * @return The participant stub singleton.
-     */
-    public static ParticipantStub getParticipantStub()
-    {
-        return PARTICIPANT_STUB ;
-    }
-    
-    /**
-     * Send a completion commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionCommit(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
-    }
-
-    /**
-     * Send a completion rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionRollback(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
-    }
-
-    /**
-     * Send a commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a phase2Rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a readonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a volatileAndDurable request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send an earlyReadonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a earlyAborted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a replayCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a retryPreparedCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a retryPreparedAbort request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a retryCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a preparedAfterTimeout request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a lostCommitted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,291 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007;
+
+import java.io.IOException;
+
+import com.arjuna.webservices.SoapFault;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.jboss.transaction.wstf.webservices.sc007.client.SyncParticipantClient;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The participant stub.
+ */
+public class SyncParticipantStub implements ParticipantStub
+{
+    /**
+     * The participant stub singletong.
+     */
+    private static final ParticipantStub PARTICIPANT_STUB = new SyncParticipantStub() ;
+    
+    /**
+     * Get the participant stub singleton.
+     * @return The participant stub singleton.
+     */
+    public static ParticipantStub getParticipantStub()
+    {
+        return PARTICIPANT_STUB ;
+    }
+    
+    /**
+     * Send a completion commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionCommit(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
+    }
+
+    /**
+     * Send a completion rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionRollback(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
+    }
+
+    /**
+     * Send a commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a phase2Rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a readonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a volatileAndDurable request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send an earlyReadonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a earlyAborted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a replayCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a retryPreparedCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a retryPreparedAbort request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a retryCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a preparedAfterTimeout request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a lostCommitted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,456 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.client;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.ServiceRegistry;
-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 com.jboss.transaction.wstf.webservices.sc007.generated.ParticipantPortType;
-
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.EndpointReference;
-import javax.xml.ws.addressing.AddressingBuilder;
-
-/**
- * The participant client.
- * @author kevin
- */
-public class AsyncParticipantClient
-{
-    /**
-     * The client singleton.
-     */
-    private static final AsyncParticipantClient CLIENT = new AsyncParticipantClient() ;
-
-    /**
-     * The completion commit action.
-     */
-    private static final String completionCommitAction = InteropConstants.INTEROP_ACTION_COMPLETION_COMMIT ;
-    /**
-     * The completion rollback Action.
-     */
-    private static final String completionRollbackAction = InteropConstants.INTEROP_ACTION_COMPLETION_ROLLBACK ;
-    /**
-     * The commit Action.
-     */
-    private static final String commitAction = InteropConstants.INTEROP_ACTION_COMMIT ;
-    /**
-     * The rollback Action.
-     */
-    private static final String rollbackAction = InteropConstants.INTEROP_ACTION_ROLLBACK ;
-    /**
-     * The phase 2 rollback Action.
-     */
-    private static final String phase2RollbackAction = InteropConstants.INTEROP_ACTION_PHASE_2_ROLLBACK ;
-    /**
-     * The readonly Action.
-     */
-    private static final String readonlyAction = InteropConstants.INTEROP_ACTION_READONLY ;
-    /**
-     * The volatile and durable Action.
-     */
-    private static final String volatileAndDurableAction = InteropConstants.INTEROP_ACTION_VOLATILE_AND_DURABLE ;
-    /**
-     * The early readonly Action.
-     */
-    private static final String earlyReadonlyAction = InteropConstants.INTEROP_ACTION_EARLY_READONLY ;
-    /**
-     * The early aborted Action.
-     */
-    private static final String earlyAbortedAction = InteropConstants.INTEROP_ACTION_EARLY_ABORTED ;
-    /**
-     * The replay commit Action.
-     */
-    private static final String replayCommitAction = InteropConstants.INTEROP_ACTION_REPLAY_COMMIT ;
-    /**
-     * The retry prepared commit Action.
-     */
-    private static final String retryPreparedCommitAction = InteropConstants.INTEROP_ACTION_RETRY_PREPARED_COMMIT ;
-    /**
-     * The retry prepared abort Action.
-     */
-    private static final String retryPreparedAbortAction = InteropConstants.INTEROP_ACTION_RETRY_PREPARED_ABORT ;
-    /**
-     * The retry commit Action.
-     */
-    private static final String retryCommitAction = InteropConstants.INTEROP_ACTION_RETRY_COMMIT ;
-    /**
-     * The prepared after timeout Action.
-     */
-    private static final String preparedAfterTimeoutAction = InteropConstants.INTEROP_ACTION_PREPARED_AFTER_TIMEOUT ;
-    /**
-     * The lost committed Action.
-     */
-    private static final String lostCommittedAction = InteropConstants.INTEROP_ACTION_LOST_COMMITTED ;
-
-    /**
-     * The initiator URI for replies.
-     */
-    private EndpointReference initiator = null;
-
-    /**
-     * Construct the interop synch client.
-     */
-    private AsyncParticipantClient()
-    {
-        //final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
-
-        // Add WS-Addressing
-        //AddressingPolicy.register(handlerRegistry) ;
-        // Add coordination context
-        //CoordinationContextPolicy.register(handlerRegistry) ;
-        // Add client policies
-        //ClientPolicy.register(handlerRegistry) ;
-
-        //soapService = new SoapService(handlerRegistry) ;
-        AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-        final String initiatorURIString = ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_INITIATOR) ;
-        URI uri = null;
-        try {
-            uri = new URI(initiatorURIString);
-            initiator = builder.newEndpointReference(uri);
-        } catch (URISyntaxException e) {
-            // TODO log error here
-        }
-    }
-    /**
-     * Send a completion commit request.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompletionCommit(final AddressingProperties addressingProperties, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, completionCommitAction);
-        port.completionCommit(coordinatorURI);
-    }
-
-    /**
-     * Send a completion rollback request.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompletionRollback(final AddressingProperties addressingProperties, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, completionRollbackAction);
-        port.completionRollback(coordinatorURI);
-    }
-
-    /**
-     * Send a commit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, commitAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.commit();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a rollback request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, rollbackAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.rollback();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a phase2Rollback request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, phase2RollbackAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.phase2Rollback();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a readonly request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, readonlyAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.readonly();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a volatileAndDurable request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, volatileAndDurableAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.volatileAndDurable();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send an earlyReadonly request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, earlyReadonlyAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.earlyReadonly();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a earlyAborted request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendEarlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, earlyAbortedAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.earlyAborted();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a replayCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendReplayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, replayCommitAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.replayCommit();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a retryPreparedCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, retryPreparedCommitAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.retryPreparedCommit();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a retryPreparedAbort request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, retryPreparedAbortAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.retryPreparedAbort();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a retryCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, retryCommitAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.retryCommit();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a preparedAfterTimeout request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, preparedAfterTimeoutAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.preparedAfterTimeout();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a lostCommitted request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendLostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, lostCommittedAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.lostCommitted();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Get the Interop client singleton.
-     * @return The Interop client singleton.
-     */
-    public static AsyncParticipantClient getClient()
-    {
-        return CLIENT ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,476 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.client;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URI;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices11.ServiceRegistry;
+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 com.jboss.transaction.wstf.webservices.sc007.generated.ParticipantPortType;
+
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.EndpointReference;
+import javax.xml.ws.addressing.AddressingBuilder;
+
+/**
+ * The participant client.
+ * @author kevin
+ */
+public class AsyncParticipantClient
+{
+    /**
+     * The client singleton.
+     */
+    private static final AsyncParticipantClient CLIENT = new AsyncParticipantClient() ;
+
+    /**
+     * The completion commit action.
+     */
+    private static final String completionCommitAction = InteropConstants.INTEROP_ACTION_COMPLETION_COMMIT ;
+    /**
+     * The completion rollback Action.
+     */
+    private static final String completionRollbackAction = InteropConstants.INTEROP_ACTION_COMPLETION_ROLLBACK ;
+    /**
+     * The commit Action.
+     */
+    private static final String commitAction = InteropConstants.INTEROP_ACTION_COMMIT ;
+    /**
+     * The rollback Action.
+     */
+    private static final String rollbackAction = InteropConstants.INTEROP_ACTION_ROLLBACK ;
+    /**
+     * The phase 2 rollback Action.
+     */
+    private static final String phase2RollbackAction = InteropConstants.INTEROP_ACTION_PHASE_2_ROLLBACK ;
+    /**
+     * The readonly Action.
+     */
+    private static final String readonlyAction = InteropConstants.INTEROP_ACTION_READONLY ;
+    /**
+     * The volatile and durable Action.
+     */
+    private static final String volatileAndDurableAction = InteropConstants.INTEROP_ACTION_VOLATILE_AND_DURABLE ;
+    /**
+     * The early readonly Action.
+     */
+    private static final String earlyReadonlyAction = InteropConstants.INTEROP_ACTION_EARLY_READONLY ;
+    /**
+     * The early aborted Action.
+     */
+    private static final String earlyAbortedAction = InteropConstants.INTEROP_ACTION_EARLY_ABORTED ;
+    /**
+     * The replay commit Action.
+     */
+    private static final String replayCommitAction = InteropConstants.INTEROP_ACTION_REPLAY_COMMIT ;
+    /**
+     * The retry prepared commit Action.
+     */
+    private static final String retryPreparedCommitAction = InteropConstants.INTEROP_ACTION_RETRY_PREPARED_COMMIT ;
+    /**
+     * The retry prepared abort Action.
+     */
+    private static final String retryPreparedAbortAction = InteropConstants.INTEROP_ACTION_RETRY_PREPARED_ABORT ;
+    /**
+     * The retry commit Action.
+     */
+    private static final String retryCommitAction = InteropConstants.INTEROP_ACTION_RETRY_COMMIT ;
+    /**
+     * The prepared after timeout Action.
+     */
+    private static final String preparedAfterTimeoutAction = InteropConstants.INTEROP_ACTION_PREPARED_AFTER_TIMEOUT ;
+    /**
+     * The lost committed Action.
+     */
+    private static final String lostCommittedAction = InteropConstants.INTEROP_ACTION_LOST_COMMITTED ;
+
+    /**
+     * The initiator URI for replies.
+     */
+    private EndpointReference initiator = null;
+
+    /**
+     * Construct the interop synch client.
+     */
+    private AsyncParticipantClient()
+    {
+        //final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+
+        // Add WS-Addressing
+        //AddressingPolicy.register(handlerRegistry) ;
+        // Add coordination context
+        //CoordinationContextPolicy.register(handlerRegistry) ;
+        // Add client policies
+        //ClientPolicy.register(handlerRegistry) ;
+
+        //soapService = new SoapService(handlerRegistry) ;
+        AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+        final String initiatorURIString = ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_INITIATOR) ;
+        URI uri = null;
+        try {
+            uri = new URI(initiatorURIString);
+            initiator = builder.newEndpointReference(uri);
+        } catch (URISyntaxException e) {
+            // TODO log error here
+        }
+    }
+    /**
+     * Send a completion commit request.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompletionCommit(final AddressingProperties addressingProperties, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, completionCommitAction);
+        port.completionCommit(coordinatorURI);
+    }
+
+    /**
+     * Send a completion rollback request.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompletionRollback(final AddressingProperties addressingProperties, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, completionRollbackAction);
+        port.completionRollback(coordinatorURI);
+    }
+
+    /**
+     * Send a commit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, commitAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.commit();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a rollback request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, rollbackAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.rollback();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a phase2Rollback request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, phase2RollbackAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.phase2Rollback();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a readonly request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, readonlyAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.readonly();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a volatileAndDurable request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, volatileAndDurableAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.volatileAndDurable();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send an earlyReadonly request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, earlyReadonlyAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.earlyReadonly();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a earlyAborted request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendEarlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, earlyAbortedAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.earlyAborted();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a replayCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendReplayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, replayCommitAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.replayCommit();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a retryPreparedCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, retryPreparedCommitAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.retryPreparedCommit();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a retryPreparedAbort request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, retryPreparedAbortAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.retryPreparedAbort();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a retryCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, retryCommitAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.retryCommit();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a preparedAfterTimeout request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, preparedAfterTimeoutAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.preparedAfterTimeout();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a lostCommitted request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendLostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, lostCommittedAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.lostCommitted();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Get the Interop client singleton.
+     * @return The Interop client singleton.
+     */
+    public static AsyncParticipantClient getClient()
+    {
+        return CLIENT ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,99 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.client;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
-import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;
-
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.AddressingBuilder;
-
-/**
- * The initiator client.
- * @author kevin
- */
-public class InitiatorClient
-{
-    /**
-     * The client singleton.
-     */
-    private static final InitiatorClient CLIENT = new InitiatorClient() ;
-    
-    /**
-     * The response action.
-     */
-    private static final String responseAction = InteropConstants.INTEROP_ACTION_RESPONSE ;
-    
-    /**
-     * Construct the interop synch client.
-     */
-    private InitiatorClient()
-    {
-        //final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
-        
-        // Add WS-Addressing
-        //AddressingPolicy.register(handlerRegistry) ;
-        // Add client policies
-        //ClientPolicy.register(handlerRegistry) ;
-        
-        //soapService = new SoapService(handlerRegistry) ;
-    }
-
-    /**
-     * Send a response.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendResponse(final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        InitiatorPortType port = InteropClient.getInitiatorPort(addressingProperties, responseAction);
-        port.response();
-    }
-
-    /**
-     * Send a fault.
-     * @param addressingProperties The addressing context.
-     * @param soapFault The SOAP fault.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault11 soapFault)
-        throws SoapFault, IOException
-    {
-        String soapFaultAction = soapFault.getAction() ;
-        AttributedURI actionURI = null;
-        if (soapFaultAction == null)
-        {
-            soapFaultAction = faultAction;
-        }
-        try {
-            actionURI = builder.newURI(soapFaultAction);
-        } catch (URISyntaxException e) {
-            // TODO log error here
-        }
-        AddressingProperties replyProperties = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId());
-        AddressingHelper.installNoneReplyTo(replyProperties);
-        SoapFaultClient.sendSoapFault(soapFault, addressingProperties, actionURI);
-    }
-
-    private static final String faultAction = AtomicTransactionConstants.WSAT_ACTION_FAULT;
-    private static final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-    /**
-     * Get the Interop client singleton.
-     * @return The Interop client singleton.
-     */
-    public static InitiatorClient getClient()
-    {
-        return CLIENT ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.client;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
+import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;
+
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.AttributedURI;
+import javax.xml.ws.addressing.AddressingBuilder;
+
+/**
+ * The initiator client.
+ * @author kevin
+ */
+public class InitiatorClient
+{
+    /**
+     * The client singleton.
+     */
+    private static final InitiatorClient CLIENT = new InitiatorClient() ;
+    
+    /**
+     * The response action.
+     */
+    private static final String responseAction = InteropConstants.INTEROP_ACTION_RESPONSE ;
+    
+    /**
+     * Construct the interop synch client.
+     */
+    private InitiatorClient()
+    {
+        //final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+        
+        // Add WS-Addressing
+        //AddressingPolicy.register(handlerRegistry) ;
+        // Add client policies
+        //ClientPolicy.register(handlerRegistry) ;
+        
+        //soapService = new SoapService(handlerRegistry) ;
+    }
+
+    /**
+     * Send a response.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendResponse(final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        InitiatorPortType port = InteropClient.getInitiatorPort(addressingProperties, responseAction);
+        port.response();
+    }
+
+    /**
+     * Send a fault.
+     * @param addressingProperties The addressing context.
+     * @param soapFault The SOAP fault.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault11 soapFault)
+        throws SoapFault, IOException
+    {
+        String soapFaultAction = soapFault.getAction() ;
+        AttributedURI actionURI = null;
+        if (soapFaultAction == null)
+        {
+            soapFaultAction = faultAction;
+        }
+        try {
+            actionURI = builder.newURI(soapFaultAction);
+        } catch (URISyntaxException e) {
+            // TODO log error here
+        }
+        AddressingProperties replyProperties = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId());
+        AddressingHelper.installNoneReplyTo(replyProperties);
+        SoapFaultClient.sendSoapFault(soapFault, addressingProperties, actionURI);
+    }
+
+    private static final String faultAction = AtomicTransactionConstants.WSAT_ACTION_FAULT;
+    private static final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+    /**
+     * Get the Interop client singleton.
+     * @return The Interop client singleton.
+     */
+    public static InitiatorClient getClient()
+    {
+        return CLIENT ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,150 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.client;
-
-import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
-
-import javax.xml.ws.addressing.*;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.handler.Handler;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.net.URISyntaxException;
-import java.net.URI;
-
-import com.arjuna.webservices11.ServiceRegistry;
-import com.jboss.transaction.wstf.webservices.sc007.generated.Sc007Service;
-import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;
-import com.jboss.transaction.wstf.webservices.sc007.generated.ParticipantPortType;
-import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
-import com.jboss.transaction.wstf.webservices.handlers.CoordinationContextHandler;
-
-/**
- * Created by IntelliJ IDEA.
- * User: adinn
- * Date: Apr 17, 2008
- * Time: 4:18:34 PM
- * To change this template use File | Settings | File Templates.
- */
-public class InteropClient {
-    // TODO -- do we really need a thread local here or can we just use one service?
-    /**
-     *  thread local which maintains a per thread Sc007 service instance
-     */
-    private static ThreadLocal<Sc007Service> sc007Service = new ThreadLocal<Sc007Service>();
-
-    /**
-     *  builder used to construct addressing info for calls
-     */
-    private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-
-    /**
-     * fetch an Sc007 service unique to the current thread
-     * @return
-     */
-    private static synchronized Sc007Service getSc007Service()
-    {
-        if (sc007Service.get() == null) {
-            sc007Service.set(new Sc007Service());
-        }
-        return sc007Service.get();
-    }
-
-    public static InitiatorPortType getInitiatorPort(AddressingProperties addressingProperties,
-                                                       String action)
-    {
-        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
-        Sc007Service service = getSc007Service();
-        InitiatorPortType port = service.getPort(InitiatorPortType.class);
-        BindingProvider bindingProvider = (BindingProvider)port;
-        AttributedURI toUri = addressingProperties.getTo();
-        List<Handler> customHandlerChain = new ArrayList<Handler>();
-        /*
-         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
-         */
-		customHandlerChain.add(new WSAddressingClientHandler());
-        bindingProvider.getBinding().setHandlerChain(customHandlerChain);
-
-        Map<String, Object> requestContext = bindingProvider.getRequestContext();
-        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
-	    // jbossws should do this for us . . .
-	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
-        try {
-            addressingProperties.setAction(builder.newURI(action));
-            addressingProperties.setFrom(getParticipant());
-        } catch (URISyntaxException use) {
-            // TODO log this error
-        }
-
-        return port;
-    }
-
-    // don't think we ever need this as we get a registration port from the endpoint ref returned by
-    // the activation port request
-    public static ParticipantPortType getParticipantPort(AddressingProperties addressingProperties, String action)
-    {
-        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
-        Sc007Service service = getSc007Service();
-        ParticipantPortType port = service.getPort(ParticipantPortType.class);
-        BindingProvider bindingProvider = (BindingProvider)port;
-        AttributedURI toUri = addressingProperties.getTo();
-        List<Handler> customHandlerChain = new ArrayList<Handler>();
-        /*
-         * we need to add the coordination context handler in the case where we are passing a
-         * coordination context via a header element
-         */
-        customHandlerChain.add(new CoordinationContextHandler());
-        /*
-         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
-         */
-		customHandlerChain.add(new WSAddressingClientHandler());
-		bindingProvider.getBinding().setHandlerChain(customHandlerChain);
-
-        Map<String, Object> requestContext = bindingProvider.getRequestContext();
-        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
-	    // jbossws should do this for us . . .
-	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
-        try {
-            addressingProperties.setAction(builder.newURI(action));
-            addressingProperties.setFrom(getInitiator());
-        } catch (URISyntaxException use) {
-            // TODO log this error
-        }
-
-        return port;
-    }
-
-    private static EndpointReference initiator;
-    private static EndpointReference participant;
-
-    private static synchronized EndpointReference getInitiator()
-    {
-        if (initiator == null) {
-            final String initiatorURIString =
-                ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_INITIATOR);
-            try {
-                URI initiatorURI = new URI(initiatorURIString);
-                initiator = builder.newEndpointReference(initiatorURI);
-            } catch (URISyntaxException use) {
-                // TODO - log fault and throw exception
-            }
-        }
-        return initiator;
-    }
-
-    private static synchronized EndpointReference getParticipant()
-    {
-        if (participant == null) {
-            final String participantURIString =
-                    ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_PARTICIPANT);
-            try {
-                URI participantURI = new URI(participantURIString);
-                participant = builder.newEndpointReference(participantURI);
-            } catch (URISyntaxException use) {
-                // TODO - log fault and throw exception
-            }
-        }
-        return participant;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,170 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.client;
+
+import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
+
+import javax.xml.ws.addressing.*;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.handler.Handler;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.net.URISyntaxException;
+import java.net.URI;
+
+import com.arjuna.webservices11.ServiceRegistry;
+import com.jboss.transaction.wstf.webservices.sc007.generated.Sc007Service;
+import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;
+import com.jboss.transaction.wstf.webservices.sc007.generated.ParticipantPortType;
+import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
+import com.jboss.transaction.wstf.webservices.handlers.CoordinationContextHandler;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: adinn
+ * Date: Apr 17, 2008
+ * Time: 4:18:34 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class InteropClient {
+    // TODO -- do we really need a thread local here or can we just use one service?
+    /**
+     *  thread local which maintains a per thread Sc007 service instance
+     */
+    private static ThreadLocal<Sc007Service> sc007Service = new ThreadLocal<Sc007Service>();
+
+    /**
+     *  builder used to construct addressing info for calls
+     */
+    private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+
+    /**
+     * fetch an Sc007 service unique to the current thread
+     * @return
+     */
+    private static synchronized Sc007Service getSc007Service()
+    {
+        if (sc007Service.get() == null) {
+            sc007Service.set(new Sc007Service());
+        }
+        return sc007Service.get();
+    }
+
+    public static InitiatorPortType getInitiatorPort(AddressingProperties addressingProperties,
+                                                       String action)
+    {
+        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
+        Sc007Service service = getSc007Service();
+        InitiatorPortType port = service.getPort(InitiatorPortType.class);
+        BindingProvider bindingProvider = (BindingProvider)port;
+        AttributedURI toUri = addressingProperties.getTo();
+        List<Handler> customHandlerChain = new ArrayList<Handler>();
+        /*
+         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
+         */
+		customHandlerChain.add(new WSAddressingClientHandler());
+        bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+
+        Map<String, Object> requestContext = bindingProvider.getRequestContext();
+        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
+	    // jbossws should do this for us . . .
+	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
+        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
+        try {
+            addressingProperties.setAction(builder.newURI(action));
+            addressingProperties.setFrom(getParticipant());
+        } catch (URISyntaxException use) {
+            // TODO log this error
+        }
+
+        return port;
+    }
+
+    // don't think we ever need this as we get a registration port from the endpoint ref returned by
+    // the activation port request
+    public static ParticipantPortType getParticipantPort(AddressingProperties addressingProperties, String action)
+    {
+        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
+        Sc007Service service = getSc007Service();
+        ParticipantPortType port = service.getPort(ParticipantPortType.class);
+        BindingProvider bindingProvider = (BindingProvider)port;
+        AttributedURI toUri = addressingProperties.getTo();
+        List<Handler> customHandlerChain = new ArrayList<Handler>();
+        /*
+         * we need to add the coordination context handler in the case where we are passing a
+         * coordination context via a header element
+         */
+        customHandlerChain.add(new CoordinationContextHandler());
+        /*
+         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
+         */
+		customHandlerChain.add(new WSAddressingClientHandler());
+		bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+
+        Map<String, Object> requestContext = bindingProvider.getRequestContext();
+        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
+	    // jbossws should do this for us . . .
+	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
+        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
+        try {
+            addressingProperties.setAction(builder.newURI(action));
+            addressingProperties.setFrom(getInitiator());
+        } catch (URISyntaxException use) {
+            // TODO log this error
+        }
+
+        return port;
+    }
+
+    private static EndpointReference initiator;
+    private static EndpointReference participant;
+
+    private static synchronized EndpointReference getInitiator()
+    {
+        if (initiator == null) {
+            final String initiatorURIString =
+                ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_INITIATOR);
+            try {
+                URI initiatorURI = new URI(initiatorURIString);
+                initiator = builder.newEndpointReference(initiatorURI);
+            } catch (URISyntaxException use) {
+                // TODO - log fault and throw exception
+            }
+        }
+        return initiator;
+    }
+
+    private static synchronized EndpointReference getParticipant()
+    {
+        if (participant == null) {
+            final String participantURIString =
+                    ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_PARTICIPANT);
+            try {
+                URI participantURI = new URI(participantURIString);
+                participant = builder.newEndpointReference(participantURI);
+            } catch (URISyntaxException use) {
+                // TODO - log fault and throw exception
+            }
+        }
+        return participant;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,278 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.client;
-
-import java.io.IOException;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-import com.arjuna.webservices.*;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
-
-/**
- * The participant client.
- * @author kevin
- */
-public class SyncParticipantClient
-{
-    /**
-     * The client singleton.
-     */
-    private static final SyncParticipantClient CLIENT = new SyncParticipantClient() ;
-    
-    /**
-     * The completion commit action.
-     */
-    private static final String completionCommitAction = InteropConstants.INTEROP_ACTION_COMPLETION_COMMIT ;
-    /**
-     * The completion rollback Action.
-     */
-    private static final String completionRollbackAction = InteropConstants.INTEROP_ACTION_COMPLETION_ROLLBACK ;
-    /**
-     * The commit Action.
-     */
-    private static final String commitAction = InteropConstants.INTEROP_ACTION_COMMIT ;
-    /**
-     * The rollback Action.
-     */
-    private static final String rollbackAction = InteropConstants.INTEROP_ACTION_ROLLBACK ;
-    /**
-     * The phase 2 rollback Action.
-     */
-    private static final String phase2RollbackAction = InteropConstants.INTEROP_ACTION_PHASE_2_ROLLBACK ;
-    /**
-     * The readonly Action.
-     */
-    private static final String readonlyAction = InteropConstants.INTEROP_ACTION_READONLY ;
-    /**
-     * The volatile and durable Action.
-     */
-    private static final String volatileAndDurableAction = InteropConstants.INTEROP_ACTION_VOLATILE_AND_DURABLE ;
-    /**
-     * The early readonly Action.
-     */
-    private static final String earlyReadonlyAction = InteropConstants.INTEROP_ACTION_EARLY_READONLY ;
-    /**
-     * The early aborted Action.
-     */
-    private static final String earlyAbortedAction = InteropConstants.INTEROP_ACTION_EARLY_ABORTED ;
-    /**
-     * The replay commit Action.
-     */
-    private static final String replayCommitAction = InteropConstants.INTEROP_ACTION_REPLAY_COMMIT ;
-    /**
-     * The retry prepared commit Action.
-     */
-    private static final String retryPreparedCommitAction = InteropConstants.INTEROP_ACTION_RETRY_PREPARED_COMMIT ;
-    /**
-     * The retry prepared abort Action.
-     */
-    private static final String retryPreparedAbortAction = InteropConstants.INTEROP_ACTION_RETRY_PREPARED_ABORT ;
-    /**
-     * The retry commit Action.
-     */
-    private static final String retryCommitAction = InteropConstants.INTEROP_ACTION_RETRY_COMMIT ;
-    /**
-     * The prepared after timeout Action.
-     */
-    private static final String preparedAfterTimeoutAction = InteropConstants.INTEROP_ACTION_PREPARED_AFTER_TIMEOUT ;
-    /**
-     * The lost committed Action.
-     */
-    private static final String lostCommittedAction = InteropConstants.INTEROP_ACTION_LOST_COMMITTED ;
-    
-    /**
-     * Construct the interop synch client.
-     */
-    private SyncParticipantClient()
-    {
-    }
-
-    /**
-     * Send a completion commit request.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompletionCommit(final AddressingProperties addressingProperties, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a completion rollback request.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompletionRollback(final AddressingProperties addressingProperties, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a commit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a rollback request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a phase2Rollback request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a readonly request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a volatileAndDurable request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send an earlyReadonly request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a earlyAborted request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendEarlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a replayCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendReplayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a retryPreparedCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a retryPreparedAbort request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a retryCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a preparedAfterTimeout request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a lostCommitted request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendLostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Get the Interop client singleton.
-     * @return The Interop client singleton.
-     */
-    public static SyncParticipantClient getClient()
-    {
-        return CLIENT ;
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,298 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.client;
+
+import java.io.IOException;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+import com.arjuna.webservices.*;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
+
+/**
+ * The participant client.
+ * @author kevin
+ */
+public class SyncParticipantClient
+{
+    /**
+     * The client singleton.
+     */
+    private static final SyncParticipantClient CLIENT = new SyncParticipantClient() ;
+    
+    /**
+     * The completion commit action.
+     */
+    private static final String completionCommitAction = InteropConstants.INTEROP_ACTION_COMPLETION_COMMIT ;
+    /**
+     * The completion rollback Action.
+     */
+    private static final String completionRollbackAction = InteropConstants.INTEROP_ACTION_COMPLETION_ROLLBACK ;
+    /**
+     * The commit Action.
+     */
+    private static final String commitAction = InteropConstants.INTEROP_ACTION_COMMIT ;
+    /**
+     * The rollback Action.
+     */
+    private static final String rollbackAction = InteropConstants.INTEROP_ACTION_ROLLBACK ;
+    /**
+     * The phase 2 rollback Action.
+     */
+    private static final String phase2RollbackAction = InteropConstants.INTEROP_ACTION_PHASE_2_ROLLBACK ;
+    /**
+     * The readonly Action.
+     */
+    private static final String readonlyAction = InteropConstants.INTEROP_ACTION_READONLY ;
+    /**
+     * The volatile and durable Action.
+     */
+    private static final String volatileAndDurableAction = InteropConstants.INTEROP_ACTION_VOLATILE_AND_DURABLE ;
+    /**
+     * The early readonly Action.
+     */
+    private static final String earlyReadonlyAction = InteropConstants.INTEROP_ACTION_EARLY_READONLY ;
+    /**
+     * The early aborted Action.
+     */
+    private static final String earlyAbortedAction = InteropConstants.INTEROP_ACTION_EARLY_ABORTED ;
+    /**
+     * The replay commit Action.
+     */
+    private static final String replayCommitAction = InteropConstants.INTEROP_ACTION_REPLAY_COMMIT ;
+    /**
+     * The retry prepared commit Action.
+     */
+    private static final String retryPreparedCommitAction = InteropConstants.INTEROP_ACTION_RETRY_PREPARED_COMMIT ;
+    /**
+     * The retry prepared abort Action.
+     */
+    private static final String retryPreparedAbortAction = InteropConstants.INTEROP_ACTION_RETRY_PREPARED_ABORT ;
+    /**
+     * The retry commit Action.
+     */
+    private static final String retryCommitAction = InteropConstants.INTEROP_ACTION_RETRY_COMMIT ;
+    /**
+     * The prepared after timeout Action.
+     */
+    private static final String preparedAfterTimeoutAction = InteropConstants.INTEROP_ACTION_PREPARED_AFTER_TIMEOUT ;
+    /**
+     * The lost committed Action.
+     */
+    private static final String lostCommittedAction = InteropConstants.INTEROP_ACTION_LOST_COMMITTED ;
+    
+    /**
+     * Construct the interop synch client.
+     */
+    private SyncParticipantClient()
+    {
+    }
+
+    /**
+     * Send a completion commit request.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompletionCommit(final AddressingProperties addressingProperties, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a completion rollback request.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompletionRollback(final AddressingProperties addressingProperties, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a commit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a rollback request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a phase2Rollback request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a readonly request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a volatileAndDurable request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send an earlyReadonly request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a earlyAborted request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendEarlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a replayCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendReplayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a retryPreparedCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a retryPreparedAbort request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a retryCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a preparedAfterTimeout request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a lostCommitted request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendLostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Get the Interop client singleton.
+     * @return The Interop client singleton.
+     */
+    public static SyncParticipantClient getClient()
+    {
+        return CLIENT ;
+    }
+}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/InitiatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/InitiatorPortType.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/InitiatorPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,28 +0,0 @@
-
-package com.jboss.transaction.wstf.webservices.sc007.generated;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebService(name = "InitiatorPortType", targetNamespace = "http://www.wstf.org/sc007")
-public interface InitiatorPortType {
-
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Response", action = "http://www.wstf.org/docs/scenarios/sc007/Response")
-    @Oneway
-    @RequestWrapper(localName = "Response", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void response();
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/InitiatorPortType.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/InitiatorPortType.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/InitiatorPortType.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/InitiatorPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.wstf.webservices.sc007.generated;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebService(name = "InitiatorPortType", targetNamespace = "http://www.wstf.org/sc007")
+public interface InitiatorPortType {
+
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Response", action = "http://www.wstf.org/docs/scenarios/sc007/Response")
+    @Oneway
+    @RequestWrapper(localName = "Response", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void response();
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ObjectFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ObjectFactory.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ObjectFactory.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,203 +0,0 @@
-
-package com.jboss.transaction.wstf.webservices.sc007.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.jboss.transaction.wstf.webservices.sc007.generated package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
- at XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _Response_QNAME = new QName("http://www.wstf.org/sc007", "Response");
-    private final static QName _Readonly_QNAME = new QName("http://www.wstf.org/sc007", "Readonly");
-    private final static QName _VolatileAndDurable_QNAME = new QName("http://www.wstf.org/sc007", "VolatileAndDurable");
-    private final static QName _ReplayCommit_QNAME = new QName("http://www.wstf.org/sc007", "ReplayCommit");
-    private final static QName _EarlyReadonly_QNAME = new QName("http://www.wstf.org/sc007", "EarlyReadonly");
-    private final static QName _PreparedAfterTimeout_QNAME = new QName("http://www.wstf.org/sc007", "PreparedAfterTimeout");
-    private final static QName _Phase2Rollback_QNAME = new QName("http://www.wstf.org/sc007", "Phase2Rollback");
-    private final static QName _EarlyAborted_QNAME = new QName("http://www.wstf.org/sc007", "EarlyAborted");
-    private final static QName _Commit_QNAME = new QName("http://www.wstf.org/sc007", "Commit");
-    private final static QName _Rollback_QNAME = new QName("http://www.wstf.org/sc007", "Rollback");
-    private final static QName _CompletionCommit_QNAME = new QName("http://www.wstf.org/sc007", "CompletionCommit");
-    private final static QName _RetryCommit_QNAME = new QName("http://www.wstf.org/sc007", "RetryCommit");
-    private final static QName _RetryPreparedCommit_QNAME = new QName("http://www.wstf.org/sc007", "RetryPreparedCommit");
-    private final static QName _RetryPreparedAbort_QNAME = new QName("http://www.wstf.org/sc007", "RetryPreparedAbort");
-    private final static QName _LostCommitted_QNAME = new QName("http://www.wstf.org/sc007", "LostCommitted");
-    private final static QName _CompletionRollback_QNAME = new QName("http://www.wstf.org/sc007", "CompletionRollback");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.jboss.transaction.wstf.webservices.sc007.generated
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link TestMessageType }
-     * 
-     */
-    public TestMessageType createTestMessageType() {
-        return new TestMessageType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "Response")
-    public JAXBElement<TestMessageType> createResponse(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Response_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "Readonly")
-    public JAXBElement<TestMessageType> createReadonly(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Readonly_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "VolatileAndDurable")
-    public JAXBElement<TestMessageType> createVolatileAndDurable(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_VolatileAndDurable_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "ReplayCommit")
-    public JAXBElement<TestMessageType> createReplayCommit(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_ReplayCommit_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "EarlyReadonly")
-    public JAXBElement<TestMessageType> createEarlyReadonly(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_EarlyReadonly_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "PreparedAfterTimeout")
-    public JAXBElement<TestMessageType> createPreparedAfterTimeout(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_PreparedAfterTimeout_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "Phase2Rollback")
-    public JAXBElement<TestMessageType> createPhase2Rollback(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Phase2Rollback_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "EarlyAborted")
-    public JAXBElement<TestMessageType> createEarlyAborted(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_EarlyAborted_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "Commit")
-    public JAXBElement<TestMessageType> createCommit(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Commit_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "Rollback")
-    public JAXBElement<TestMessageType> createRollback(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Rollback_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "CompletionCommit")
-    public JAXBElement<String> createCompletionCommit(String value) {
-        return new JAXBElement<String>(_CompletionCommit_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "RetryCommit")
-    public JAXBElement<TestMessageType> createRetryCommit(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_RetryCommit_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "RetryPreparedCommit")
-    public JAXBElement<TestMessageType> createRetryPreparedCommit(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_RetryPreparedCommit_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "RetryPreparedAbort")
-    public JAXBElement<TestMessageType> createRetryPreparedAbort(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_RetryPreparedAbort_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "LostCommitted")
-    public JAXBElement<TestMessageType> createLostCommitted(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_LostCommitted_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "CompletionRollback")
-    public JAXBElement<String> createCompletionRollback(String value) {
-        return new JAXBElement<String>(_CompletionRollback_QNAME, String.class, null, value);
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ObjectFactory.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ObjectFactory.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ObjectFactory.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ObjectFactory.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,223 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.wstf.webservices.sc007.generated;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the com.jboss.transaction.wstf.webservices.sc007.generated package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+ at XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _Response_QNAME = new QName("http://www.wstf.org/sc007", "Response");
+    private final static QName _Readonly_QNAME = new QName("http://www.wstf.org/sc007", "Readonly");
+    private final static QName _VolatileAndDurable_QNAME = new QName("http://www.wstf.org/sc007", "VolatileAndDurable");
+    private final static QName _ReplayCommit_QNAME = new QName("http://www.wstf.org/sc007", "ReplayCommit");
+    private final static QName _EarlyReadonly_QNAME = new QName("http://www.wstf.org/sc007", "EarlyReadonly");
+    private final static QName _PreparedAfterTimeout_QNAME = new QName("http://www.wstf.org/sc007", "PreparedAfterTimeout");
+    private final static QName _Phase2Rollback_QNAME = new QName("http://www.wstf.org/sc007", "Phase2Rollback");
+    private final static QName _EarlyAborted_QNAME = new QName("http://www.wstf.org/sc007", "EarlyAborted");
+    private final static QName _Commit_QNAME = new QName("http://www.wstf.org/sc007", "Commit");
+    private final static QName _Rollback_QNAME = new QName("http://www.wstf.org/sc007", "Rollback");
+    private final static QName _CompletionCommit_QNAME = new QName("http://www.wstf.org/sc007", "CompletionCommit");
+    private final static QName _RetryCommit_QNAME = new QName("http://www.wstf.org/sc007", "RetryCommit");
+    private final static QName _RetryPreparedCommit_QNAME = new QName("http://www.wstf.org/sc007", "RetryPreparedCommit");
+    private final static QName _RetryPreparedAbort_QNAME = new QName("http://www.wstf.org/sc007", "RetryPreparedAbort");
+    private final static QName _LostCommitted_QNAME = new QName("http://www.wstf.org/sc007", "LostCommitted");
+    private final static QName _CompletionRollback_QNAME = new QName("http://www.wstf.org/sc007", "CompletionRollback");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.jboss.transaction.wstf.webservices.sc007.generated
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link TestMessageType }
+     * 
+     */
+    public TestMessageType createTestMessageType() {
+        return new TestMessageType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "Response")
+    public JAXBElement<TestMessageType> createResponse(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Response_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "Readonly")
+    public JAXBElement<TestMessageType> createReadonly(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Readonly_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "VolatileAndDurable")
+    public JAXBElement<TestMessageType> createVolatileAndDurable(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_VolatileAndDurable_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "ReplayCommit")
+    public JAXBElement<TestMessageType> createReplayCommit(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_ReplayCommit_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "EarlyReadonly")
+    public JAXBElement<TestMessageType> createEarlyReadonly(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_EarlyReadonly_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "PreparedAfterTimeout")
+    public JAXBElement<TestMessageType> createPreparedAfterTimeout(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_PreparedAfterTimeout_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "Phase2Rollback")
+    public JAXBElement<TestMessageType> createPhase2Rollback(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Phase2Rollback_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "EarlyAborted")
+    public JAXBElement<TestMessageType> createEarlyAborted(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_EarlyAborted_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "Commit")
+    public JAXBElement<TestMessageType> createCommit(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Commit_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "Rollback")
+    public JAXBElement<TestMessageType> createRollback(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Rollback_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "CompletionCommit")
+    public JAXBElement<String> createCompletionCommit(String value) {
+        return new JAXBElement<String>(_CompletionCommit_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "RetryCommit")
+    public JAXBElement<TestMessageType> createRetryCommit(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_RetryCommit_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "RetryPreparedCommit")
+    public JAXBElement<TestMessageType> createRetryPreparedCommit(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_RetryPreparedCommit_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "RetryPreparedAbort")
+    public JAXBElement<TestMessageType> createRetryPreparedAbort(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_RetryPreparedAbort_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "LostCommitted")
+    public JAXBElement<TestMessageType> createLostCommitted(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_LostCommitted_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.wstf.org/sc007", name = "CompletionRollback")
+    public JAXBElement<String> createCompletionRollback(String value) {
+        return new JAXBElement<String>(_CompletionRollback_QNAME, String.class, null, value);
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ParticipantPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ParticipantPortType.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ParticipantPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,148 +0,0 @@
-
-package com.jboss.transaction.wstf.webservices.sc007.generated;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.RequestWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebService(name = "ParticipantPortType", targetNamespace = "http://www.wstf.org/sc007")
-public interface ParticipantPortType {
-
-
-    /**
-     * 
-     * @param parameters
-     */
-    @WebMethod(operationName = "CompletionCommit", action = "http://www.wstf.org/docs/scenarios/sc007/CompletionCommit")
-    @Oneway
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public void completionCommit(
-        @WebParam(name = "CompletionCommit", targetNamespace = "http://www.wstf.org/sc007", partName = "parameters")
-        String parameters);
-
-    /**
-     * 
-     * @param parameters
-     */
-    @WebMethod(operationName = "CompletionRollback", action = "http://www.wstf.org/docs/scenarios/sc007/CompletionRollback")
-    @Oneway
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public void completionRollback(
-        @WebParam(name = "CompletionRollback", targetNamespace = "http://www.wstf.org/sc007", partName = "parameters")
-        String parameters);
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Commit", action = "http://www.wstf.org/docs/scenarios/sc007/Commit")
-    @Oneway
-    @RequestWrapper(localName = "Commit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void commit();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Rollback", action = "http://www.wstf.org/docs/scenarios/sc007/Rollback")
-    @Oneway
-    @RequestWrapper(localName = "Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void rollback();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Phase2Rollback", action = "http://www.wstf.org/docs/scenarios/sc007/Phase2Rollback")
-    @Oneway
-    @RequestWrapper(localName = "Phase2Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void phase2Rollback();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Readonly", action = "http://www.wstf.org/docs/scenarios/sc007/Readonly")
-    @Oneway
-    @RequestWrapper(localName = "Readonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void readonly();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "VolatileAndDurable", action = "http://www.wstf.org/docs/scenarios/sc007/VolatileAndDurable")
-    @Oneway
-    @RequestWrapper(localName = "VolatileAndDurable", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void volatileAndDurable();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "EarlyReadonly", action = "http://www.wstf.org/docs/scenarios/sc007/EarlyReadonly")
-    @Oneway
-    @RequestWrapper(localName = "EarlyReadonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void earlyReadonly();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "EarlyAborted", action = "http://www.wstf.org/docs/scenarios/sc007/EarlyAborted")
-    @Oneway
-    @RequestWrapper(localName = "EarlyAborted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void earlyAborted();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "ReplayCommit", action = "http://www.wstf.org/docs/scenarios/sc007/ReplayCommit")
-    @Oneway
-    @RequestWrapper(localName = "ReplayCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void replayCommit();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "RetryPreparedCommit", action = "http://www.wstf.org/docs/scenarios/sc007/RetryPreparedCommit")
-    @Oneway
-    @RequestWrapper(localName = "RetryPreparedCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void retryPreparedCommit();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "RetryPreparedAbort", action = "http://www.wstf.org/docs/scenarios/sc007/RetryPreparedAbort")
-    @Oneway
-    @RequestWrapper(localName = "RetryPreparedAbort", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void retryPreparedAbort();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "RetryCommit", action = "http://www.wstf.org/docs/scenarios/sc007/RetryCommit")
-    @Oneway
-    @RequestWrapper(localName = "RetryCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void retryCommit();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "PreparedAfterTimeout", action = "http://www.wstf.org/docs/scenarios/sc007/PreparedAfterTimeout")
-    @Oneway
-    @RequestWrapper(localName = "PreparedAfterTimeout", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void preparedAfterTimeout();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "LostCommitted", action = "http://www.wstf.org/docs/scenarios/sc007/LostCommitted")
-    @Oneway
-    @RequestWrapper(localName = "LostCommitted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
-    public void lostCommitted();
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ParticipantPortType.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ParticipantPortType.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ParticipantPortType.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/ParticipantPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,168 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.wstf.webservices.sc007.generated;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.RequestWrapper;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebService(name = "ParticipantPortType", targetNamespace = "http://www.wstf.org/sc007")
+public interface ParticipantPortType {
+
+
+    /**
+     * 
+     * @param parameters
+     */
+    @WebMethod(operationName = "CompletionCommit", action = "http://www.wstf.org/docs/scenarios/sc007/CompletionCommit")
+    @Oneway
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void completionCommit(
+        @WebParam(name = "CompletionCommit", targetNamespace = "http://www.wstf.org/sc007", partName = "parameters")
+        String parameters);
+
+    /**
+     * 
+     * @param parameters
+     */
+    @WebMethod(operationName = "CompletionRollback", action = "http://www.wstf.org/docs/scenarios/sc007/CompletionRollback")
+    @Oneway
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void completionRollback(
+        @WebParam(name = "CompletionRollback", targetNamespace = "http://www.wstf.org/sc007", partName = "parameters")
+        String parameters);
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Commit", action = "http://www.wstf.org/docs/scenarios/sc007/Commit")
+    @Oneway
+    @RequestWrapper(localName = "Commit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void commit();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Rollback", action = "http://www.wstf.org/docs/scenarios/sc007/Rollback")
+    @Oneway
+    @RequestWrapper(localName = "Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void rollback();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Phase2Rollback", action = "http://www.wstf.org/docs/scenarios/sc007/Phase2Rollback")
+    @Oneway
+    @RequestWrapper(localName = "Phase2Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void phase2Rollback();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Readonly", action = "http://www.wstf.org/docs/scenarios/sc007/Readonly")
+    @Oneway
+    @RequestWrapper(localName = "Readonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void readonly();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "VolatileAndDurable", action = "http://www.wstf.org/docs/scenarios/sc007/VolatileAndDurable")
+    @Oneway
+    @RequestWrapper(localName = "VolatileAndDurable", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void volatileAndDurable();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "EarlyReadonly", action = "http://www.wstf.org/docs/scenarios/sc007/EarlyReadonly")
+    @Oneway
+    @RequestWrapper(localName = "EarlyReadonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void earlyReadonly();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "EarlyAborted", action = "http://www.wstf.org/docs/scenarios/sc007/EarlyAborted")
+    @Oneway
+    @RequestWrapper(localName = "EarlyAborted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void earlyAborted();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "ReplayCommit", action = "http://www.wstf.org/docs/scenarios/sc007/ReplayCommit")
+    @Oneway
+    @RequestWrapper(localName = "ReplayCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void replayCommit();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "RetryPreparedCommit", action = "http://www.wstf.org/docs/scenarios/sc007/RetryPreparedCommit")
+    @Oneway
+    @RequestWrapper(localName = "RetryPreparedCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void retryPreparedCommit();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "RetryPreparedAbort", action = "http://www.wstf.org/docs/scenarios/sc007/RetryPreparedAbort")
+    @Oneway
+    @RequestWrapper(localName = "RetryPreparedAbort", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void retryPreparedAbort();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "RetryCommit", action = "http://www.wstf.org/docs/scenarios/sc007/RetryCommit")
+    @Oneway
+    @RequestWrapper(localName = "RetryCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void retryCommit();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "PreparedAfterTimeout", action = "http://www.wstf.org/docs/scenarios/sc007/PreparedAfterTimeout")
+    @Oneway
+    @RequestWrapper(localName = "PreparedAfterTimeout", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void preparedAfterTimeout();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "LostCommitted", action = "http://www.wstf.org/docs/scenarios/sc007/LostCommitted")
+    @Oneway
+    @RequestWrapper(localName = "LostCommitted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
+    public void lostCommitted();
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/Sc007Service.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/Sc007Service.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/Sc007Service.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,68 +0,0 @@
-
-package com.jboss.transaction.wstf.webservices.sc007.generated;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebServiceClient(name = "sc007Service", targetNamespace = "http://www.wstf.org/sc007", wsdlLocation = "wsdl/sc007.wsdl")
-public class Sc007Service
-    extends Service
-{
-
-    private final static URL SC007SERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.jboss.transaction.wstf.webservices.sc007.generated.Sc007Service.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.jboss.transaction.wstf.webservices.sc007.generated.Sc007Service.class.getResource(".");
-            url = new URL(baseUrl, "wsdl/sc007.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'wsdl/sc007.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        SC007SERVICE_WSDL_LOCATION = url;
-    }
-
-    public Sc007Service(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public Sc007Service() {
-        super(SC007SERVICE_WSDL_LOCATION, new QName("http://www.wstf.org/sc007", "sc007Service"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns InitiatorPortType
-     */
-    @WebEndpoint(name = "sc007InitiatorPort")
-    public InitiatorPortType getSc007InitiatorPort() {
-        return super.getPort(new QName("http://www.wstf.org/sc007", "sc007InitiatorPort"), InitiatorPortType.class);
-    }
-
-    /**
-     * 
-     * @return
-     *     returns ParticipantPortType
-     */
-    @WebEndpoint(name = "sc007ParticipantPort")
-    public ParticipantPortType getSc007ParticipantPort() {
-        return super.getPort(new QName("http://www.wstf.org/sc007", "sc007ParticipantPort"), ParticipantPortType.class);
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/Sc007Service.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/Sc007Service.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/Sc007Service.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/Sc007Service.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.wstf.webservices.sc007.generated;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebServiceClient(name = "sc007Service", targetNamespace = "http://www.wstf.org/sc007", wsdlLocation = "wsdl/sc007.wsdl")
+public class Sc007Service
+    extends Service
+{
+
+    private final static URL SC007SERVICE_WSDL_LOCATION;
+    private final static Logger logger = Logger.getLogger(com.jboss.transaction.wstf.webservices.sc007.generated.Sc007Service.class.getName());
+
+    static {
+        URL url = null;
+        try {
+            URL baseUrl;
+            baseUrl = com.jboss.transaction.wstf.webservices.sc007.generated.Sc007Service.class.getResource(".");
+            url = new URL(baseUrl, "wsdl/sc007.wsdl");
+        } catch (MalformedURLException e) {
+            logger.warning("Failed to create URL for the wsdl Location: 'wsdl/sc007.wsdl', retrying as a local file");
+            logger.warning(e.getMessage());
+        }
+        SC007SERVICE_WSDL_LOCATION = url;
+    }
+
+    public Sc007Service(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public Sc007Service() {
+        super(SC007SERVICE_WSDL_LOCATION, new QName("http://www.wstf.org/sc007", "sc007Service"));
+    }
+
+    /**
+     * 
+     * @return
+     *     returns InitiatorPortType
+     */
+    @WebEndpoint(name = "sc007InitiatorPort")
+    public InitiatorPortType getSc007InitiatorPort() {
+        return super.getPort(new QName("http://www.wstf.org/sc007", "sc007InitiatorPort"), InitiatorPortType.class);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ParticipantPortType
+     */
+    @WebEndpoint(name = "sc007ParticipantPort")
+    public ParticipantPortType getSc007ParticipantPort() {
+        return super.getPort(new QName("http://www.wstf.org/sc007", "sc007ParticipantPort"), ParticipantPortType.class);
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/TestMessageType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/TestMessageType.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/TestMessageType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,32 +0,0 @@
-
-package com.jboss.transaction.wstf.webservices.sc007.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TestMessageType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TestMessageType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "TestMessageType")
-public class TestMessageType {
-
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/TestMessageType.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/TestMessageType.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/TestMessageType.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/TestMessageType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.wstf.webservices.sc007.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for TestMessageType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TestMessageType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "TestMessageType")
+public class TestMessageType {
+
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/package-info.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/package-info.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/package-info.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,2 +0,0 @@
- at javax.xml.bind.annotation.XmlSchema(namespace = "http://www.wstf.org/sc007")
-package com.jboss.transaction.wstf.webservices.sc007.generated;

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/package-info.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/package-info.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/package-info.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/generated/package-info.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+ at javax.xml.bind.annotation.XmlSchema(namespace = "http://www.wstf.org/sc007")
+package com.jboss.transaction.wstf.webservices.sc007.generated;

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,22 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.participant;
-
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.Prepared;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The commit durable 2PC participant
- */
-public class CommitDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Prepared() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.participant;
+
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.Prepared;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The commit durable 2PC participant
+ */
+public class CommitDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Prepared() ;
+    }    
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,37 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.participant;
-
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.Prepared;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The durable 2PC participant which fails the first call to commit.
- */
-public class CommitFailureDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * The drop commit flag.
-     */
-    private boolean dropCommit ;
-    
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Prepared() ;
-    }
-    
-    public void commit()
-        throws WrongStateException, SystemException
-    {
-        if (!dropCommit)
-        {
-            dropCommit = true ;
-            throw new IllegalStateException("Forced failure of commit") ;
-        }
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.participant;
+
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.Prepared;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The durable 2PC participant which fails the first call to commit.
+ */
+public class CommitFailureDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * The drop commit flag.
+     */
+    private boolean dropCommit ;
+    
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Prepared() ;
+    }
+    
+    public void commit()
+        throws WrongStateException, SystemException
+    {
+        if (!dropCommit)
+        {
+            dropCommit = true ;
+            throw new IllegalStateException("Forced failure of commit") ;
+        }
+    }
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureRecoveryDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureRecoveryDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureRecoveryDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,69 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.participant;
-
-import java.util.TimerTask;
-
-import com.arjuna.webservices.util.TransportTimer;
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.Prepared;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-import com.arjuna.wst11.messaging.engines.ParticipantEngine;
-
-/**
- * The durable 2PC participant which fails the first call to commit and recovers.
- */
-public class CommitFailureRecoveryDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * The participant engine.
-     */
-    private ParticipantEngine engine ;
-    /**
-     * The set recovery flag.
-     */
-    private boolean setRecovery ;
-    /**
-     * The recovering flag.
-     */
-    private boolean recovering ;
-    
-    /**
-     * Set the participant engine.
-     * @param engine The participant engine.
-     */
-    public void setEngine(final ParticipantEngine engine)
-    {
-        this.engine = engine ;
-    }
-    
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Prepared() ;
-    }
-    
-    public void commit()
-        throws WrongStateException, SystemException
-    {
-        if (!setRecovery)
-        {
-            setRecovery = true ;
-            final TimerTask timerTask = new TimerTask() {
-                public void run() {
-                    recovering = true ;
-                    engine.recovery() ;
-                }
-            } ;
-            TransportTimer.getTimer().schedule(timerTask, 2000) ;
-        }
-        
-        if (!recovering)
-        {
-            throw new IllegalStateException("Forced failure of commit") ;
-        }
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureRecoveryDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureRecoveryDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureRecoveryDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitFailureRecoveryDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.participant;
+
+import java.util.TimerTask;
+
+import com.arjuna.webservices.util.TransportTimer;
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.Prepared;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+import com.arjuna.wst11.messaging.engines.ParticipantEngine;
+
+/**
+ * The durable 2PC participant which fails the first call to commit and recovers.
+ */
+public class CommitFailureRecoveryDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * The participant engine.
+     */
+    private ParticipantEngine engine ;
+    /**
+     * The set recovery flag.
+     */
+    private boolean setRecovery ;
+    /**
+     * The recovering flag.
+     */
+    private boolean recovering ;
+    
+    /**
+     * Set the participant engine.
+     * @param engine The participant engine.
+     */
+    public void setEngine(final ParticipantEngine engine)
+    {
+        this.engine = engine ;
+    }
+    
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Prepared() ;
+    }
+    
+    public void commit()
+        throws WrongStateException, SystemException
+    {
+        if (!setRecovery)
+        {
+            setRecovery = true ;
+            final TimerTask timerTask = new TimerTask() {
+                public void run() {
+                    recovering = true ;
+                    engine.recovery() ;
+                }
+            } ;
+            TransportTimer.getTimer().schedule(timerTask, 2000) ;
+        }
+        
+        if (!recovering)
+        {
+            throw new IllegalStateException("Forced failure of commit") ;
+        }
+    }
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitVolatile2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitVolatile2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitVolatile2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,22 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.participant;
-
-import com.arjuna.wst.Prepared;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Volatile2PCParticipant;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The commit volatile 2PC participant
- */
-public class CommitVolatile2PCParticipant extends ParticipantAdapter implements Volatile2PCParticipant
-{
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Prepared() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitVolatile2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitVolatile2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitVolatile2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/CommitVolatile2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.participant;
+
+import com.arjuna.wst.Prepared;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Volatile2PCParticipant;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The commit volatile 2PC participant
+ */
+public class CommitVolatile2PCParticipant extends ParticipantAdapter implements Volatile2PCParticipant
+{
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Prepared() ;
+    }    
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ParticipantAdapter.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ParticipantAdapter.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ParticipantAdapter.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,44 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.participant;
-
-import com.arjuna.wst.Participant;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The base participant adapter.
- */
-public abstract class ParticipantAdapter implements Participant
-{
-    /**
-     * Commit the participant.
-     */
-    public void commit()
-        throws WrongStateException, SystemException
-    {
-    }
-
-    /**
-     * Rollback the participant.
-     */
-    public void rollback()
-        throws WrongStateException, SystemException
-    {
-    }
-    
-    /**
-     * Handle an error on the participant.
-     */
-    public void error()
-        throws SystemException
-    {
-    }
-
-    /**
-     * Handle an unknown on the participant.
-     */
-    public void unknown()
-        throws SystemException
-    {
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ParticipantAdapter.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ParticipantAdapter.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ParticipantAdapter.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ParticipantAdapter.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.participant;
+
+import com.arjuna.wst.Participant;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The base participant adapter.
+ */
+public abstract class ParticipantAdapter implements Participant
+{
+    /**
+     * Commit the participant.
+     */
+    public void commit()
+        throws WrongStateException, SystemException
+    {
+    }
+
+    /**
+     * Rollback the participant.
+     */
+    public void rollback()
+        throws WrongStateException, SystemException
+    {
+    }
+    
+    /**
+     * Handle an error on the participant.
+     */
+    public void error()
+        throws SystemException
+    {
+    }
+
+    /**
+     * Handle an unknown on the participant.
+     */
+    public void unknown()
+        throws SystemException
+    {
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ReadonlyDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ReadonlyDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ReadonlyDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,22 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.participant;
-
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.ReadOnly;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The readonly durable 2PC participant
- */
-public class ReadonlyDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * Vote readonly.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new ReadOnly() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ReadonlyDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ReadonlyDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ReadonlyDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/ReadonlyDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.participant;
+
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.ReadOnly;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The readonly durable 2PC participant
+ */
+public class ReadonlyDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * Vote readonly.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new ReadOnly() ;
+    }    
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/RollbackDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/RollbackDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/RollbackDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,22 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.participant;
-
-import com.arjuna.wst.Aborted;
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The rollback durable 2PC participant
- */
-public class RollbackDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * Vote to abort.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Aborted() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/RollbackDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/RollbackDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/RollbackDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/RollbackDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.participant;
+
+import com.arjuna.wst.Aborted;
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The rollback durable 2PC participant
+ */
+public class RollbackDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * Vote to abort.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Aborted() ;
+    }    
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,22 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.participant;
-
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.Prepared;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The VolatileAndDurable durable 2PC participant
- */
-public class VolatileAndDurableDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Prepared() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.participant;
+
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.Prepared;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The VolatileAndDurable durable 2PC participant
+ */
+public class VolatileAndDurableDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Prepared() ;
+    }    
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableVolatile2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableVolatile2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableVolatile2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,47 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.participant;
-
-import com.arjuna.ats.arjuna.common.Uid;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wst.ReadOnly;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Volatile2PCParticipant;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-import com.jboss.transaction.wstf.webservices.sc007.InteropUtil;
-
-/**
- * The VolatileAndDurable volatile 2PC participant
- */
-public class VolatileAndDurableVolatile2PCParticipant extends ParticipantAdapter implements Volatile2PCParticipant
-{
-    /**
-     * The current coordination context.
-     */
-    private final CoordinationContextType coordinationContext ;
-    
-    /**
-     * Construct the participant.
-     * @param coordinationContext The coordination context.
-     */
-    public VolatileAndDurableVolatile2PCParticipant(final CoordinationContextType coordinationContext)
-    {
-        this.coordinationContext = coordinationContext ;
-    }
-    
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        try
-        {
-            InteropUtil.registerDurable2PC(coordinationContext, new VolatileAndDurableDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SystemException(th.getMessage()) ;
-        }
-        return new ReadOnly() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableVolatile2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableVolatile2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableVolatile2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/participant/VolatileAndDurableVolatile2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.participant;
+
+import com.arjuna.ats.arjuna.common.Uid;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wst.ReadOnly;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Volatile2PCParticipant;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+import com.jboss.transaction.wstf.webservices.sc007.InteropUtil;
+
+/**
+ * The VolatileAndDurable volatile 2PC participant
+ */
+public class VolatileAndDurableVolatile2PCParticipant extends ParticipantAdapter implements Volatile2PCParticipant
+{
+    /**
+     * The current coordination context.
+     */
+    private final CoordinationContextType coordinationContext ;
+    
+    /**
+     * Construct the participant.
+     * @param coordinationContext The coordination context.
+     */
+    public VolatileAndDurableVolatile2PCParticipant(final CoordinationContextType coordinationContext)
+    {
+        this.coordinationContext = coordinationContext ;
+    }
+    
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        try
+        {
+            InteropUtil.registerDurable2PC(coordinationContext, new VolatileAndDurableDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SystemException(th.getMessage()) ;
+        }
+        return new ReadOnly() ;
+    }    
+}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag.  All rights reserved. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.wstf.webservices.sc007.processors;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.base.processors.Callback;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The callback for the initiator client.
- * @author kevin
- */
-public abstract class InitiatorCallback extends Callback
-{
-    /**
-     * A response.
-     * @param addressingProperties The current addressing context.
-     */
-    public abstract void response(final AddressingProperties addressingProperties) ;
-
-    /**
-     * A SOAP fault response.
-     * @param soapFault The SOAP fault response.
-     * @param addressingProperties The current addressing context.
-     */
-    public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties) ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag.  All rights reserved. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.processors;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.base.processors.Callback;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The callback for the initiator client.
+ * @author kevin
+ */
+public abstract class InitiatorCallback extends Callback
+{
+    /**
+     * A response.
+     * @param addressingProperties The current addressing context.
+     */
+    public abstract void response(final AddressingProperties addressingProperties) ;
+
+    /**
+     * A SOAP fault response.
+     * @param soapFault The SOAP fault response.
+     * @param addressingProperties The current addressing context.
+     */
+    public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties) ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag.  All rights reserved. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.wstf.webservices.sc007.processors;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.base.processors.Callback;
-import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The Initiator processor.
- * @author kevin
- */
-public class InitiatorProcessor extends BaseWSAddrResponseProcessor
-{
-    /**
-     * The initiator singleton.
-     */
-    private static final InitiatorProcessor INITIATOR = new InitiatorProcessor() ;
-    
-    /**
-     * Get the initiator singleton.
-     * @return The singleton.
-     */
-    public static InitiatorProcessor getInitiator()
-    {
-        return INITIATOR ;
-    }
-
-    /**
-     * Handle a response response.
-     * @param addressingProperties The current addressing context.
-     */
-    public void handleResponse(final AddressingProperties addressingProperties)
-    {
-        handleCallbacks(new CallbackExecutorAdapter() {
-            public void execute(final Callback callback) {
-                ((InitiatorCallback)callback).response(addressingProperties) ;
-            }
-        }, getIDs(addressingProperties)) ;
-    }
-
-    /**
-     * Register a SOAP fault response.
-     * @param soapFault The SOAP fault response.
-     * @param addressingProperties The current addressing context.
-     */
-    public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
-    {
-        handleCallbacks(new CallbackExecutorAdapter() {
-            public void execute(final Callback callback) {
-                ((InitiatorCallback)callback).soapFault(soapFault, addressingProperties) ;
-            }
-        }, getIDs(addressingProperties)) ;
-    }
-
-    /**
-     * Register a callback for the specific message id.
-     * @param messageID The message ID.
-     * @param callback The callback for the response.
-     */
-    public void registerCallback(final String messageID, final InitiatorCallback callback)
-    {
-        register(messageID, callback) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag.  All rights reserved. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.processors;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.base.processors.Callback;
+import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The Initiator processor.
+ * @author kevin
+ */
+public class InitiatorProcessor extends BaseWSAddrResponseProcessor
+{
+    /**
+     * The initiator singleton.
+     */
+    private static final InitiatorProcessor INITIATOR = new InitiatorProcessor() ;
+    
+    /**
+     * Get the initiator singleton.
+     * @return The singleton.
+     */
+    public static InitiatorProcessor getInitiator()
+    {
+        return INITIATOR ;
+    }
+
+    /**
+     * Handle a response response.
+     * @param addressingProperties The current addressing context.
+     */
+    public void handleResponse(final AddressingProperties addressingProperties)
+    {
+        handleCallbacks(new CallbackExecutorAdapter() {
+            public void execute(final Callback callback) {
+                ((InitiatorCallback)callback).response(addressingProperties) ;
+            }
+        }, getIDs(addressingProperties)) ;
+    }
+
+    /**
+     * Register a SOAP fault response.
+     * @param soapFault The SOAP fault response.
+     * @param addressingProperties The current addressing context.
+     */
+    public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+    {
+        handleCallbacks(new CallbackExecutorAdapter() {
+            public void execute(final Callback callback) {
+                ((InitiatorCallback)callback).soapFault(soapFault, addressingProperties) ;
+            }
+        }, getIDs(addressingProperties)) ;
+    }
+
+    /**
+     * Register a callback for the specific message id.
+     * @param messageID The message ID.
+     * @param callback The callback for the response.
+     */
+    public void registerCallback(final String messageID, final InitiatorCallback callback)
+    {
+        register(messageID, callback) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,358 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag.  All rights reserved. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.wstf.webservices.sc007.processors;
-
-import com.arjuna.ats.arjuna.common.Uid;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wst.CompletionCoordinatorParticipant;
-import com.arjuna.wst11.messaging.engines.ParticipantEngine;
-import com.arjuna.webservices11.SoapFault11;
-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;
-import com.jboss.transaction.wstf.webservices.sc007.participant.CommitFailureRecoveryDurable2PCParticipant;
-import com.jboss.transaction.wstf.webservices.sc007.participant.CommitVolatile2PCParticipant;
-import com.jboss.transaction.wstf.webservices.sc007.participant.ReadonlyDurable2PCParticipant;
-import com.jboss.transaction.wstf.webservices.sc007.participant.RollbackDurable2PCParticipant;
-import com.jboss.transaction.wstf.webservices.sc007.participant.VolatileAndDurableVolatile2PCParticipant;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The Participant processor.
- * @author kevin
- */
-public class ParticipantProcessor
-{
-    /**
-     * The participant.
-     */
-    private static ParticipantProcessor PARTICIPANT = new ParticipantProcessor() ;
-    
-    /**
-     * Get the participant.
-     * @return The participant.
-     */
-    public static ParticipantProcessor getParticipant()
-    {
-        return PARTICIPANT ;
-    }
-    
-    /**
-     * Execute the CompletionCommit
-     * @param coordinatorURI The address of the coordinator to employ
-     * @param addressingProperties The current addressing context.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void completionCommit(final String coordinatorURI, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(coordinatorURI) ;
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the CompletionRollback
-     * @param coordinatorURI The address of the coordinator to employ.
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void completionRollback(final String coordinatorURI, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CoordinationContextType context = InteropUtil.createCoordinationContext(coordinatorURI) ;
-            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.rollback() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Commit
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void commit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Rollback
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            InteropUtil.registerDurable2PC(coordinationContext, new RollbackDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Phase2Rollback
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void phase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            InteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
-            InteropUtil.registerDurable2PC(coordinationContext, new RollbackDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Readonly
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void readonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            InteropUtil.registerDurable2PC(coordinationContext, new ReadonlyDurable2PCParticipant(), new Uid().toString()) ;
-            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the VolatileAndDurable
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void volatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            InteropUtil.registerVolatile2PC(coordinationContext, new VolatileAndDurableVolatile2PCParticipant(coordinationContext), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the EarlyReadonly
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void earlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final ParticipantEngine engine = InteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
-            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-            engine.earlyReadonly() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the EarlyAborted
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void earlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final ParticipantEngine engine = InteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
-            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-            engine.earlyRollback() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the ReplayCommit
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void replayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CommitFailureRecoveryDurable2PCParticipant participant = new CommitFailureRecoveryDurable2PCParticipant() ;
-            final ParticipantEngine engine = InteropUtil.registerDurable2PC(coordinationContext, participant, new Uid().toString()) ;
-            participant.setEngine(engine) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the RetryPreparedCommit
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void retryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the RetryPreparedAbort
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void retryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the RetryCommit
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void retryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            InteropUtil.registerDurable2PC(coordinationContext, new CommitFailureDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the PreparedAfterTimeout
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void preparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            InteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
-            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the LostCommitted
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void lostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            InteropUtil.registerDurable2PC(coordinationContext, new CommitFailureDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,358 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag.  All rights reserved. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.processors;
+
+import com.arjuna.ats.arjuna.common.Uid;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wst.CompletionCoordinatorParticipant;
+import com.arjuna.wst11.messaging.engines.ParticipantEngine;
+import com.arjuna.webservices11.SoapFault11;
+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;
+import com.jboss.transaction.wstf.webservices.sc007.participant.CommitFailureRecoveryDurable2PCParticipant;
+import com.jboss.transaction.wstf.webservices.sc007.participant.CommitVolatile2PCParticipant;
+import com.jboss.transaction.wstf.webservices.sc007.participant.ReadonlyDurable2PCParticipant;
+import com.jboss.transaction.wstf.webservices.sc007.participant.RollbackDurable2PCParticipant;
+import com.jboss.transaction.wstf.webservices.sc007.participant.VolatileAndDurableVolatile2PCParticipant;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The Participant processor.
+ * @author kevin
+ */
+public class ParticipantProcessor
+{
+    /**
+     * The participant.
+     */
+    private static ParticipantProcessor PARTICIPANT = new ParticipantProcessor() ;
+    
+    /**
+     * Get the participant.
+     * @return The participant.
+     */
+    public static ParticipantProcessor getParticipant()
+    {
+        return PARTICIPANT ;
+    }
+    
+    /**
+     * Execute the CompletionCommit
+     * @param coordinatorURI The address of the coordinator to employ
+     * @param addressingProperties The current addressing context.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void completionCommit(final String coordinatorURI, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(coordinatorURI) ;
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the CompletionRollback
+     * @param coordinatorURI The address of the coordinator to employ.
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void completionRollback(final String coordinatorURI, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CoordinationContextType context = InteropUtil.createCoordinationContext(coordinatorURI) ;
+            final CompletionCoordinatorParticipant participant = InteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.rollback() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Commit
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void commit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Rollback
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            InteropUtil.registerDurable2PC(coordinationContext, new RollbackDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Phase2Rollback
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void phase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            InteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
+            InteropUtil.registerDurable2PC(coordinationContext, new RollbackDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Readonly
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void readonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            InteropUtil.registerDurable2PC(coordinationContext, new ReadonlyDurable2PCParticipant(), new Uid().toString()) ;
+            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the VolatileAndDurable
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void volatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            InteropUtil.registerVolatile2PC(coordinationContext, new VolatileAndDurableVolatile2PCParticipant(coordinationContext), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the EarlyReadonly
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void earlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final ParticipantEngine engine = InteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
+            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+            engine.earlyReadonly() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the EarlyAborted
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void earlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final ParticipantEngine engine = InteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
+            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+            engine.earlyRollback() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the ReplayCommit
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void replayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CommitFailureRecoveryDurable2PCParticipant participant = new CommitFailureRecoveryDurable2PCParticipant() ;
+            final ParticipantEngine engine = InteropUtil.registerDurable2PC(coordinationContext, participant, new Uid().toString()) ;
+            participant.setEngine(engine) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the RetryPreparedCommit
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void retryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the RetryPreparedAbort
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void retryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the RetryCommit
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void retryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            InteropUtil.registerDurable2PC(coordinationContext, new CommitFailureDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the PreparedAfterTimeout
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void preparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            InteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
+            InteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the LostCommitted
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void lostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            InteropUtil.registerDurable2PC(coordinationContext, new CommitFailureDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,72 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.sei;
-
-import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorProcessor;
-import com.arjuna.webservices11.SoapFault11;
-
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
-import javax.xml.ws.handler.MessageContext;
-import javax.annotation.Resource;
-
-/**
- * Implementor class for OASIS WS-Interop 1.1 Initiator Service
- */
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.WebParam;
-import javax.jws.*;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.jbossts.xts.soapfault.Fault;
-
-
-/**
- * Implementation class for WSTX 1.1 AT Interop Test Initiator service
- */
- at WebService(name = "InitiatorPortType",
-        targetNamespace = "http://www.wstf.org/sc007",
-        wsdlLocation="/WEB-INF/wsdl/sc007.wsdl",
-        portName = "sc007InitiatorPort",
-        serviceName="Sc007Service")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="initiatorhandlers.xml")
-public class InitiatorPortTypeImpl {
-
-    /**
-     * injected resource providing access to WSA addressing properties
-     */
-    @Resource
-    private WebServiceContext webServiceCtx;
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Response", action = "http://www.wstf.org/docs/scenarios/sc007/Response")
-    @Oneway
-    @RequestWrapper(localName = "Response", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void response()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-
-        InitiatorProcessor.getInitiator().handleResponse(inboundAddressProperties) ;
-    }
-
-    @WebMethod(operationName = "SoapFault", action = "http://www.wstf.org/docs/scenarios/sc007/SoapFault")
-    @Oneway
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public void soapFault(
-            @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
-            Fault fault)
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-
-        SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
-        InitiatorProcessor.getInitiator().handleSoapFault(soapFaultInternal, inboundAddressProperties) ;
-    }
-
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.sei;
+
+import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorProcessor;
+import com.arjuna.webservices11.SoapFault11;
+
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.handler.MessageContext;
+import javax.annotation.Resource;
+
+/**
+ * Implementor class for OASIS WS-Interop 1.1 Initiator Service
+ */
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.WebParam;
+import javax.jws.*;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.jbossts.xts.soapfault.Fault;
+
+
+/**
+ * Implementation class for WSTX 1.1 AT Interop Test Initiator service
+ */
+ at WebService(name = "InitiatorPortType",
+        targetNamespace = "http://www.wstf.org/sc007",
+        wsdlLocation="/WEB-INF/wsdl/sc007.wsdl",
+        portName = "sc007InitiatorPort",
+        serviceName="Sc007Service")
+// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
+ at HandlerChain(file="initiatorhandlers.xml")
+public class InitiatorPortTypeImpl {
+
+    /**
+     * injected resource providing access to WSA addressing properties
+     */
+    @Resource
+    private WebServiceContext webServiceCtx;
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Response", action = "http://www.wstf.org/docs/scenarios/sc007/Response")
+    @Oneway
+    @RequestWrapper(localName = "Response", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void response()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+
+        InitiatorProcessor.getInitiator().handleResponse(inboundAddressProperties) ;
+    }
+
+    @WebMethod(operationName = "SoapFault", action = "http://www.wstf.org/docs/scenarios/sc007/SoapFault")
+    @Oneway
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void soapFault(
+            @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
+            Fault fault)
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+
+        SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
+        InitiatorProcessor.getInitiator().handleSoapFault(soapFaultInternal, inboundAddressProperties) ;
+    }
+
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,379 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.sei;
-
-import com.jboss.transaction.wstf.webservices.sc007.processors.ParticipantProcessor;
-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.SoapFault11;
-import com.arjuna.wsc11.messaging.MessageId;
-
-import javax.jws.*;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.ProtocolException;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
-import javax.xml.ws.handler.MessageContext;
-import javax.annotation.Resource;
-
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-
-import java.net.URI;
-
-
-/**
- * Implementation class for WSTX 1.1 AT Interop Test Initiator service
- */
- at WebService(name = "ParticipantPortType",
-        targetNamespace = "http://www.wstf.org/sc007",
-        portName="sc007ParticipantPort",
-        wsdlLocation="/WEB-INF/wsdl/sc007.wsdl",
-        serviceName="Sc007Service")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="participanthandlers.xml")
-public class ParticipantPortTypeImpl {
-
-    /**
-     * injected resource providing access to WSA addressing properties
-     */
-    @Resource
-    private WebServiceContext webServiceCtx;
-
-    /**
-     *
-     * @param parameters
-     */
-    @WebMethod(operationName = "CompletionCommit", action = "http://www.wstf.org/docs/scenarios/sc007/CompletionCommit")
-    @Oneway
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public void completionCommit(
-            @WebParam(name = "CompletionCommit", targetNamespace = "http://www.wstf.org/sc007", partName = "parameters")
-            String parameters)
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        try {
-            ParticipantProcessor.getParticipant().completionCommit(parameters, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     * @param parameters
-     */
-    @WebMethod(operationName = "CompletionRollback", action = "http://www.wstf.org/docs/scenarios/sc007/CompletionRollback")
-    @Oneway
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public void completionRollback(
-        @WebParam(name = "CompletionRollback", targetNamespace = "http://www.wstf.org/sc007", partName = "parameters")
-        String parameters)
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        try {
-            ParticipantProcessor.getParticipant().completionRollback(parameters, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Commit", action = "http://www.wstf.org/docs/scenarios/sc007/Commit")
-    @Oneway
-    @RequestWrapper(localName = "Commit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void commit()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().commit(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Rollback", action = "http://www.wstf.org/docs/scenarios/sc007/Rollback")
-    @Oneway
-    @RequestWrapper(localName = "Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void rollback()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().rollback(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Phase2Rollback", action = "http://www.wstf.org/docs/scenarios/sc007/Phase2Rollback")
-    @Oneway
-    @RequestWrapper(localName = "Phase2Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void phase2Rollback()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().phase2Rollback(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Readonly", action = "http://www.wstf.org/docs/scenarios/sc007/Readonly")
-    @Oneway
-    @RequestWrapper(localName = "Readonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void readonly()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().readonly(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "VolatileAndDurable", action = "http://www.wstf.org/docs/scenarios/sc007/VolatileAndDurable")
-    @Oneway
-    @RequestWrapper(localName = "VolatileAndDurable", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void volatileAndDurable()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().volatileAndDurable(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "EarlyReadonly", action = "http://www.wstf.org/docs/scenarios/sc007/EarlyReadonly")
-    @Oneway
-    @RequestWrapper(localName = "EarlyReadonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void earlyReadonly()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().earlyReadonly(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "EarlyAborted", action = "http://www.wstf.org/docs/scenarios/sc007/EarlyAborted")
-    @Oneway
-    @RequestWrapper(localName = "EarlyAborted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void earlyAborted()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().earlyAborted(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "ReplayCommit", action = "http://www.wstf.org/docs/scenarios/sc007/ReplayCommit")
-    @Oneway
-    @RequestWrapper(localName = "ReplayCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void replayCommit()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().replayCommit(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "RetryPreparedCommit", action = "http://www.wstf.org/docs/scenarios/sc007/RetryPreparedCommit")
-    @Oneway
-    @RequestWrapper(localName = "RetryPreparedCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void retryPreparedCommit()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().retryPreparedCommit(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "RetryPreparedAbort", action = "http://www.wstf.org/docs/scenarios/sc007/RetryPreparedAbort")
-    @Oneway
-    @RequestWrapper(localName = "RetryPreparedAbort", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void retryPreparedAbort()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().retryPreparedAbort(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "RetryCommit", action = "http://www.wstf.org/docs/scenarios/sc007/RetryCommit")
-    @Oneway
-    @RequestWrapper(localName = "RetryCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void retryCommit()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().retryCommit(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "PreparedAfterTimeout", action = "http://www.wstf.org/docs/scenarios/sc007/PreparedAfterTimeout")
-    @Oneway
-    @RequestWrapper(localName = "PreparedAfterTimeout", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void preparedAfterTimeout()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().preparedAfterTimeout(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "LostCommitted", action = "http://www.wstf.org/docs/scenarios/sc007/LostCommitted")
-    @Oneway
-    @RequestWrapper(localName = "LostCommitted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
-    public void lostCommitted()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ParticipantProcessor.getParticipant().lostCommitted(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     * send an acknowledgement notifying a successfuly processed request
-     *
-     * @param inboundAddressProperties identifes who to reply to and what message id the response should relate to
-     */
-    private void sendResponse(AddressingProperties inboundAddressProperties)
-    {
-        AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
-
-        try {
-            InitiatorClient.getClient().sendResponse(outboundAddressProperties);
-        } catch (Throwable th) {
-            URI uri = outboundAddressProperties.getTo().getURI();
-            System.out.println("com.jboss.transaction.txinterop.webservices.sc007.sei.ParticipantPortTypeImpl_1: unable to send response to " + uri);
-            throw new ProtocolException(th);
-        }
-    }
-
-    /**
-     * send a soap fault notifying an unsuccessfuly processed request
-     *
-     * @param inboundAddressProperties identifes who to reply to and what message id the fault message should relate to
-     */
-    private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
-    {
-        try {
-            InitiatorClient.getClient().sendSoapFault(inboundAddressProperties, sf);
-        } catch (Throwable th) {
-            System.out.println("com.jboss.transaction.txinterop.webservices.sc007.sei.ParticipantPortTypeImpl_2: unable to log soap fault " + sf);
-            throw new ProtocolException(th);
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,399 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.sei;
+
+import com.jboss.transaction.wstf.webservices.sc007.processors.ParticipantProcessor;
+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.SoapFault11;
+import com.arjuna.wsc11.messaging.MessageId;
+
+import javax.jws.*;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.ProtocolException;
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.handler.MessageContext;
+import javax.annotation.Resource;
+
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+
+import java.net.URI;
+
+
+/**
+ * Implementation class for WSTX 1.1 AT Interop Test Initiator service
+ */
+ at WebService(name = "ParticipantPortType",
+        targetNamespace = "http://www.wstf.org/sc007",
+        portName="sc007ParticipantPort",
+        wsdlLocation="/WEB-INF/wsdl/sc007.wsdl",
+        serviceName="Sc007Service")
+// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
+ at HandlerChain(file="participanthandlers.xml")
+public class ParticipantPortTypeImpl {
+
+    /**
+     * injected resource providing access to WSA addressing properties
+     */
+    @Resource
+    private WebServiceContext webServiceCtx;
+
+    /**
+     *
+     * @param parameters
+     */
+    @WebMethod(operationName = "CompletionCommit", action = "http://www.wstf.org/docs/scenarios/sc007/CompletionCommit")
+    @Oneway
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void completionCommit(
+            @WebParam(name = "CompletionCommit", targetNamespace = "http://www.wstf.org/sc007", partName = "parameters")
+            String parameters)
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        try {
+            ParticipantProcessor.getParticipant().completionCommit(parameters, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     * @param parameters
+     */
+    @WebMethod(operationName = "CompletionRollback", action = "http://www.wstf.org/docs/scenarios/sc007/CompletionRollback")
+    @Oneway
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void completionRollback(
+        @WebParam(name = "CompletionRollback", targetNamespace = "http://www.wstf.org/sc007", partName = "parameters")
+        String parameters)
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        try {
+            ParticipantProcessor.getParticipant().completionRollback(parameters, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Commit", action = "http://www.wstf.org/docs/scenarios/sc007/Commit")
+    @Oneway
+    @RequestWrapper(localName = "Commit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void commit()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().commit(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Rollback", action = "http://www.wstf.org/docs/scenarios/sc007/Rollback")
+    @Oneway
+    @RequestWrapper(localName = "Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void rollback()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().rollback(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Phase2Rollback", action = "http://www.wstf.org/docs/scenarios/sc007/Phase2Rollback")
+    @Oneway
+    @RequestWrapper(localName = "Phase2Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void phase2Rollback()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().phase2Rollback(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Readonly", action = "http://www.wstf.org/docs/scenarios/sc007/Readonly")
+    @Oneway
+    @RequestWrapper(localName = "Readonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void readonly()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().readonly(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "VolatileAndDurable", action = "http://www.wstf.org/docs/scenarios/sc007/VolatileAndDurable")
+    @Oneway
+    @RequestWrapper(localName = "VolatileAndDurable", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void volatileAndDurable()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().volatileAndDurable(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "EarlyReadonly", action = "http://www.wstf.org/docs/scenarios/sc007/EarlyReadonly")
+    @Oneway
+    @RequestWrapper(localName = "EarlyReadonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void earlyReadonly()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().earlyReadonly(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "EarlyAborted", action = "http://www.wstf.org/docs/scenarios/sc007/EarlyAborted")
+    @Oneway
+    @RequestWrapper(localName = "EarlyAborted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void earlyAborted()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().earlyAborted(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "ReplayCommit", action = "http://www.wstf.org/docs/scenarios/sc007/ReplayCommit")
+    @Oneway
+    @RequestWrapper(localName = "ReplayCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void replayCommit()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().replayCommit(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "RetryPreparedCommit", action = "http://www.wstf.org/docs/scenarios/sc007/RetryPreparedCommit")
+    @Oneway
+    @RequestWrapper(localName = "RetryPreparedCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void retryPreparedCommit()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().retryPreparedCommit(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "RetryPreparedAbort", action = "http://www.wstf.org/docs/scenarios/sc007/RetryPreparedAbort")
+    @Oneway
+    @RequestWrapper(localName = "RetryPreparedAbort", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void retryPreparedAbort()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().retryPreparedAbort(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "RetryCommit", action = "http://www.wstf.org/docs/scenarios/sc007/RetryCommit")
+    @Oneway
+    @RequestWrapper(localName = "RetryCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void retryCommit()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().retryCommit(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "PreparedAfterTimeout", action = "http://www.wstf.org/docs/scenarios/sc007/PreparedAfterTimeout")
+    @Oneway
+    @RequestWrapper(localName = "PreparedAfterTimeout", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void preparedAfterTimeout()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().preparedAfterTimeout(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "LostCommitted", action = "http://www.wstf.org/docs/scenarios/sc007/LostCommitted")
+    @Oneway
+    @RequestWrapper(localName = "LostCommitted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+    public void lostCommitted()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ParticipantProcessor.getParticipant().lostCommitted(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     * send an acknowledgement notifying a successfuly processed request
+     *
+     * @param inboundAddressProperties identifes who to reply to and what message id the response should relate to
+     */
+    private void sendResponse(AddressingProperties inboundAddressProperties)
+    {
+        AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
+
+        try {
+            InitiatorClient.getClient().sendResponse(outboundAddressProperties);
+        } catch (Throwable th) {
+            URI uri = outboundAddressProperties.getTo().getURI();
+            System.out.println("com.jboss.transaction.txinterop.webservices.sc007.sei.ParticipantPortTypeImpl_1: unable to send response to " + uri);
+            throw new ProtocolException(th);
+        }
+    }
+
+    /**
+     * send a soap fault notifying an unsuccessfuly processed request
+     *
+     * @param inboundAddressProperties identifes who to reply to and what message id the fault message should relate to
+     */
+    private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
+    {
+        try {
+            InitiatorClient.getClient().sendSoapFault(inboundAddressProperties, sf);
+        } catch (Throwable th) {
+            System.out.println("com.jboss.transaction.txinterop.webservices.sc007.sei.ParticipantPortTypeImpl_2: unable to log soap fault " + sf);
+            throw new ProtocolException(th);
+        }
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/InitiatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/InitiatorInitialisation.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/InitiatorInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,39 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.server;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContext;
-
-import com.arjuna.webservices11.ServiceRegistry;
-import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
-
-/**
- * Initialise the interop initiator service.
- * @author kevin
- */
-public class InitiatorInitialisation implements ServletContextListener
-{
-    /**
-     * The context has been initialized.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextInitialized(final ServletContextEvent servletContextEvent)
-    {
-        ServletContext context = servletContextEvent.getServletContext();
-        String baseURI = context.getInitParameter("BaseURI");
-        final String uri = baseURI + "/InitiatorService";
-
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.registerServiceProvider(InteropConstants.SERVICE_INITIATOR, uri) ;
-    }
-
-    /**
-     * The context is about to be destroyed.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextDestroyed(final ServletContextEvent servletContextEvent)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.removeServiceProvider(InteropConstants.SERVICE_INITIATOR) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/InitiatorInitialisation.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/InitiatorInitialisation.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/InitiatorInitialisation.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/InitiatorInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.server;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContext;
+
+import com.arjuna.webservices11.ServiceRegistry;
+import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
+
+/**
+ * Initialise the interop initiator service.
+ * @author kevin
+ */
+public class InitiatorInitialisation implements ServletContextListener
+{
+    /**
+     * The context has been initialized.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextInitialized(final ServletContextEvent servletContextEvent)
+    {
+        ServletContext context = servletContextEvent.getServletContext();
+        String baseURI = context.getInitParameter("BaseURI");
+        final String uri = baseURI + "/InitiatorService";
+
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.registerServiceProvider(InteropConstants.SERVICE_INITIATOR, uri) ;
+    }
+
+    /**
+     * The context is about to be destroyed.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextDestroyed(final ServletContextEvent servletContextEvent)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.removeServiceProvider(InteropConstants.SERVICE_INITIATOR) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/ParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/ParticipantInitialisation.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/ParticipantInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,39 +0,0 @@
-package com.jboss.transaction.wstf.webservices.sc007.server;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContext;
-
-import com.arjuna.webservices11.ServiceRegistry;
-import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
-
-/**
- * Initialise the interop initiator service.
- * @author kevin
- */
-public class ParticipantInitialisation implements ServletContextListener
-{
-    /**
-     * The context has been initialized.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextInitialized(final ServletContextEvent servletContextEvent)
-    {
-        ServletContext context = servletContextEvent.getServletContext();
-        String baseURI = context.getInitParameter("BaseURI");
-        final String uri = baseURI + "/ParticipantService";
-
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.registerServiceProvider(InteropConstants.SERVICE_PARTICIPANT, uri) ;
-    }
-
-    /**
-     * The context is about to be destroyed.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextDestroyed(final ServletContextEvent servletContextEvent)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.removeServiceProvider(InteropConstants.SERVICE_PARTICIPANT) ;
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/ParticipantInitialisation.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/ParticipantInitialisation.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/ParticipantInitialisation.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/server/ParticipantInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.sc007.server;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContext;
+
+import com.arjuna.webservices11.ServiceRegistry;
+import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
+
+/**
+ * Initialise the interop initiator service.
+ * @author kevin
+ */
+public class ParticipantInitialisation implements ServletContextListener
+{
+    /**
+     * The context has been initialized.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextInitialized(final ServletContextEvent servletContextEvent)
+    {
+        ServletContext context = servletContextEvent.getServletContext();
+        String baseURI = context.getInitParameter("BaseURI");
+        final String uri = baseURI + "/ParticipantService";
+
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.registerServiceProvider(InteropConstants.SERVICE_PARTICIPANT, uri) ;
+    }
+
+    /**
+     * The context is about to be destroyed.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextDestroyed(final ServletContextEvent servletContextEvent)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.removeServiceProvider(InteropConstants.SERVICE_PARTICIPANT) ;
+    }
+}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/details.jsp
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web/details.jsp	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/details.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,90 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@page import="com.jboss.transaction.wstf.test.TestConstants"%>
-<%@page import="java.util.Enumeration"%>
-<%@page import="junit.framework.TestResult"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@page import="junit.framework.TestFailure"%>
-<%@page import="junit.framework.TestCase"%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop detail page</title>
-</head>
-<body>
-<h1>Results</h1>
-<%
-	final TestResult testResult = (TestResult)session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT) ;
-	if (testResult == null)
-	{
-%>
-No JUnit test results generated.
-<%
-	}
-	else
-	{
-		final String type = request.getParameter("type") ;
-		
-		Enumeration detailEnum = null ;
-		if (type != null)
-		{
-		    if ("error".equals(type))
-		    {
-		        detailEnum = testResult.errors() ;
-		    }
-		    else if ("failure".equals(type))
-		    {
-		        detailEnum = testResult.failures() ;
-		    }
-		}
-		
-		Integer indexInt = null ;
-		if (detailEnum != null)
-		{
-			final String indexVal = request.getParameter("index") ;
-			try
-			{
-			    indexInt = Integer.valueOf(indexVal) ;
-			}
-			catch (final NumberFormatException nfe) {}
-		}
-		
-		TestFailure testFailure = null ;
-		if (indexInt != null)
-		{
-		    int index = indexInt.intValue() ;
-		    if (index > 0)
-		    {
-			    while(detailEnum.hasMoreElements())
-			    {
-		        		final Object current = detailEnum.nextElement() ;
-		        		if (--index == 0)
-		        		{
-		        		    testFailure = (TestFailure)current ;
-		        		    break ;
-		        		}
-			    }
-		    }
-		}
-		
-		if (testFailure == null)
-		{
-%>
-<p>Invalid request parameters</p>
-<%
-		}
-		else
-		{
-		    final TestCase failure = (TestCase)testFailure.failedTest() ;
-%>
-<p>Test: <%= failure.getName() %></p>
-<pre>
-<%= testFailure.trace() %>
-</pre>
-<%
-		}
-	}
-%>
-<p>Return to <a href="results.jsp">results page</a></p>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/details.jsp (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web/details.jsp)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/details.jsp	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/details.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,110 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@page import="com.jboss.transaction.wstf.test.TestConstants"%>
+<%@page import="java.util.Enumeration"%>
+<%@page import="junit.framework.TestResult"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<%@page import="junit.framework.TestFailure"%>
+<%@page import="junit.framework.TestCase"%>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JBoss Transactions WS-TX Interop detail page</title>
+</head>
+<body>
+<h1>Results</h1>
+<%
+	final TestResult testResult = (TestResult)session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT) ;
+	if (testResult == null)
+	{
+%>
+No JUnit test results generated.
+<%
+	}
+	else
+	{
+		final String type = request.getParameter("type") ;
+		
+		Enumeration detailEnum = null ;
+		if (type != null)
+		{
+		    if ("error".equals(type))
+		    {
+		        detailEnum = testResult.errors() ;
+		    }
+		    else if ("failure".equals(type))
+		    {
+		        detailEnum = testResult.failures() ;
+		    }
+		}
+		
+		Integer indexInt = null ;
+		if (detailEnum != null)
+		{
+			final String indexVal = request.getParameter("index") ;
+			try
+			{
+			    indexInt = Integer.valueOf(indexVal) ;
+			}
+			catch (final NumberFormatException nfe) {}
+		}
+		
+		TestFailure testFailure = null ;
+		if (indexInt != null)
+		{
+		    int index = indexInt.intValue() ;
+		    if (index > 0)
+		    {
+			    while(detailEnum.hasMoreElements())
+			    {
+		        		final Object current = detailEnum.nextElement() ;
+		        		if (--index == 0)
+		        		{
+		        		    testFailure = (TestFailure)current ;
+		        		    break ;
+		        		}
+			    }
+		    }
+		}
+		
+		if (testFailure == null)
+		{
+%>
+<p>Invalid request parameters</p>
+<%
+		}
+		else
+		{
+		    final TestCase failure = (TestCase)testFailure.failedTest() ;
+%>
+<p>Test: <%= failure.getName() %></p>
+<pre>
+<%= testFailure.trace() %>
+</pre>
+<%
+		}
+	}
+%>
+<p>Return to <a href="results.jsp">results page</a></p>
+</body>
+</html>
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/index.jsp
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web/index.jsp	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/index.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,54 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@page import="java.util.Iterator"%>
-<%@page import="java.util.Map"%>
-<%@page import="com.arjuna.webservices11.ServiceRegistry"%>
-<%@page import="com.jboss.transaction.wstf.test.TestConstants"%>
-<%@page import="com.jboss.transaction.wstf.webservices.InteropConstants"%>
-
-<%!
-private final static String SERVICE_URI = ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_PARTICIPANT) ;%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WSTF Sc007 Interop</title>
-</head>
-<body>
-<h1>JBoss Transactions WSTF Sc007 Interop</h1>
-<h2>Introduction</h2>
-<p>This web application implements the <a href="http://www.wstf.org/docs/scenarios/sc007/sc007.xml">scenario sc007</a> interoperability tests specified by the <a href="http://www.wstf.org/">Web Services Test Forum</a> Group.</p>
-<p>Please send any queries to the <a href="mailto:adinn at redhat.com?subject=Interop%20query">Red Hat Test Forum contact</a></p>
-<h2>Sc007 tests</h2>
-<p>Enter the URL of the sc007 participant service to be used to run these tests and a timeout for each individual test<br>
- n.b. the JBoss participant has URL http://endpoint.jbossts.org:9090/sc007/ParticipantService</p>
-<form action="test" method="post">
-<p>Sc007 Participant Service URI: <input name="<%= TestConstants.PARAM_SERVICE_URI %>" maxlength="2000" size="100" value="<%= SERVICE_URI %>"/></p>
-<p>Test timeout: <input name="<%= TestConstants.PARAM_TEST_TIMEOUT %>" maxlength="10" size="10" value="120000"/></p>
-<!-- the current JaxWS based interop11 tests only runs synchronous tests for now
-<p>Asynchronous Test application: <input name="<%= TestConstants.PARAM_ASYNC_TEST %>" type="checkbox" checked="checked"/></p>
--->
-<select name="<%= TestConstants.PARAM_TEST %>">
-<option value="<%= TestConstants.NAME_ALL_TESTS %>">All AT tests</option>
-<%
-
-  final Map descriptions = TestConstants.DESCRIPTIONS ;
-  final Iterator entryIter = descriptions.entrySet().iterator() ;
-  while(entryIter.hasNext())
-  {
-      final Map.Entry entry = (Map.Entry)entryIter.next() ;
-      final String testName = (String)entry.getKey() ;
-      final String testDescription = (String)entry.getValue() ;
-%>
-<option value="<%= testName %>"><%=testName + " - " + testDescription%></option>
-<%
-
-}
-%>
-</select>
-<p>
-<input type="submit" value="Execute"/>
-</p>
-</form>
-</body>
-</html>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/index.jsp (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web/index.jsp)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/index.jsp	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/index.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,74 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@page import="java.util.Iterator"%>
+<%@page import="java.util.Map"%>
+<%@page import="com.arjuna.webservices11.ServiceRegistry"%>
+<%@page import="com.jboss.transaction.wstf.test.TestConstants"%>
+<%@page import="com.jboss.transaction.wstf.webservices.InteropConstants"%>
+
+<%!
+private final static String SERVICE_URI = ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_PARTICIPANT) ;%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JBoss Transactions WSTF Sc007 Interop</title>
+</head>
+<body>
+<h1>JBoss Transactions WSTF Sc007 Interop</h1>
+<h2>Introduction</h2>
+<p>This web application implements the <a href="http://www.wstf.org/docs/scenarios/sc007/sc007.xml">scenario sc007</a> interoperability tests specified by the <a href="http://www.wstf.org/">Web Services Test Forum</a> Group.</p>
+<p>Please send any queries to the <a href="mailto:adinn at redhat.com?subject=Interop%20query">Red Hat Test Forum contact</a></p>
+<h2>Sc007 tests</h2>
+<p>Enter the URL of the sc007 participant service to be used to run these tests and a timeout for each individual test<br>
+ n.b. the JBoss participant has URL http://endpoint.jbossts.org:9090/sc007/ParticipantService</p>
+<form action="test" method="post">
+<p>Sc007 Participant Service URI: <input name="<%= TestConstants.PARAM_SERVICE_URI %>" maxlength="2000" size="100" value="<%= SERVICE_URI %>"/></p>
+<p>Test timeout: <input name="<%= TestConstants.PARAM_TEST_TIMEOUT %>" maxlength="10" size="10" value="120000"/></p>
+<!-- the current JaxWS based interop11 tests only runs synchronous tests for now
+<p>Asynchronous Test application: <input name="<%= TestConstants.PARAM_ASYNC_TEST %>" type="checkbox" checked="checked"/></p>
+-->
+<select name="<%= TestConstants.PARAM_TEST %>">
+<option value="<%= TestConstants.NAME_ALL_TESTS %>">All AT tests</option>
+<%
+
+  final Map descriptions = TestConstants.DESCRIPTIONS ;
+  final Iterator entryIter = descriptions.entrySet().iterator() ;
+  while(entryIter.hasNext())
+  {
+      final Map.Entry entry = (Map.Entry)entryIter.next() ;
+      final String testName = (String)entry.getKey() ;
+      final String testDescription = (String)entry.getValue() ;
+%>
+<option value="<%= testName %>"><%=testName + " - " + testDescription%></option>
+<%
+
+}
+%>
+</select>
+<p>
+<input type="submit" value="Execute"/>
+</p>
+</form>
+</body>
+</html>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/invalidParameters.html
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web/invalidParameters.html	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/invalidParameters.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop invalid parameters page</title>
-</head>
-<body>
-Unfortunately the parameters specified are invalid, please resubmit the request. &nbsp;If the request repeatedly fails please contact the <a href="mailto:adinn at redhat.com?subject=Interop%20invalid%20parameters">Red Hat Test Forum contact</a>
-<p>Return to <a href="index.jsp">main page</a></p>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/invalidParameters.html (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web/invalidParameters.html)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/invalidParameters.html	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/invalidParameters.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,31 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JBoss Transactions WS-TX Interop invalid parameters page</title>
+</head>
+<body>
+Unfortunately the parameters specified are invalid, please resubmit the request. &nbsp;If the request repeatedly fails please contact the <a href="mailto:adinn at redhat.com?subject=Interop%20invalid%20parameters">Red Hat Test Forum contact</a>
+<p>Return to <a href="index.jsp">main page</a></p>
+</body>
+</html>
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/results.jsp
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web/results.jsp	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/results.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,90 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@page import="com.jboss.transaction.wstf.test.TestConstants"%>
-<%@page import="java.util.Enumeration"%>
-<%@page import="junit.framework.TestCase"%>
-<%@page import="junit.framework.TestFailure"%>
-<%@page import="junit.framework.TestResult"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop results page</title>
-</head>
-<body>
-<h1>Results</h1>
-<h2>Processed results</h2>
-<%
-	final String logName = (String)session.getAttribute(TestConstants.ATTRIBUTE_LOG_NAME) ;
-    if (logName != null)
-    {
-%>
-<p>View <a href="logs/<%= logName %>">log file</a></p>
-<%
-    }
-%>
-<h2>JUnit results</h2>
-<%
-	final TestResult testResult = (TestResult)session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT) ;
-	if (testResult == null)
-	{
-%>
-No JUnit test results generated.
-<%
-	}
-	else
-	{
-		final int runCount = testResult.runCount() ;
-		final int errorCount = testResult.errorCount() ;
-		final int failureCount = testResult.failureCount() ;
-%>
-<p>Run count: <%= runCount %></p>
-<p>Error count: <%= errorCount %></p>
-<p>Failure count: <%= failureCount %></p>
-<%
-		if ((errorCount > 0) || (failureCount > 0))
-		{
-			if (errorCount > 0)
-			{
-				final Enumeration enumeration = testResult.errors() ;
-%>
-<H3>Errors</H3>
-<%
-				int count = 0 ;
-				while(enumeration.hasMoreElements())
-				{
-				    final TestFailure testFailure = (TestFailure)enumeration.nextElement() ;
-				    count++ ;
-				    final TestCase failedTest = (TestCase)testFailure.failedTest() ;
-				    final String name = failedTest.getName() ;
-				    final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
-%>
-<p><a href="details.jsp?type=error&index=<%= count %>"><%= name %></a> <%= description %></p>
-<%
-				}
-			}
-			if (failureCount > 0)
-			{
-				final Enumeration enumeration = testResult.failures() ;
-%>
-<H3>Failures</H3>
-<%
-				int count = 0 ;
-				while(enumeration.hasMoreElements())
-				{
-				    final TestFailure testFailure = (TestFailure)enumeration.nextElement() ;
-				    count++ ;
-				    final TestCase failedTest = (TestCase)testFailure.failedTest() ;
-				    final String name = failedTest.getName() ;
-				    final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
-%>
-<p><a href="details.jsp?type=failure&index=<%= count %>"><%= name %></a> <%= description %></p>
-<%
-				}
-			}
-		}
-	}
-%>
-<p>Return to <a href="index.jsp">main page</a></p>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/results.jsp (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web/results.jsp)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/results.jsp	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web/results.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,110 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@page import="com.jboss.transaction.wstf.test.TestConstants"%>
+<%@page import="java.util.Enumeration"%>
+<%@page import="junit.framework.TestCase"%>
+<%@page import="junit.framework.TestFailure"%>
+<%@page import="junit.framework.TestResult"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JBoss Transactions WS-TX Interop results page</title>
+</head>
+<body>
+<h1>Results</h1>
+<h2>Processed results</h2>
+<%
+	final String logName = (String)session.getAttribute(TestConstants.ATTRIBUTE_LOG_NAME) ;
+    if (logName != null)
+    {
+%>
+<p>View <a href="logs/<%= logName %>">log file</a></p>
+<%
+    }
+%>
+<h2>JUnit results</h2>
+<%
+	final TestResult testResult = (TestResult)session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT) ;
+	if (testResult == null)
+	{
+%>
+No JUnit test results generated.
+<%
+	}
+	else
+	{
+		final int runCount = testResult.runCount() ;
+		final int errorCount = testResult.errorCount() ;
+		final int failureCount = testResult.failureCount() ;
+%>
+<p>Run count: <%= runCount %></p>
+<p>Error count: <%= errorCount %></p>
+<p>Failure count: <%= failureCount %></p>
+<%
+		if ((errorCount > 0) || (failureCount > 0))
+		{
+			if (errorCount > 0)
+			{
+				final Enumeration enumeration = testResult.errors() ;
+%>
+<H3>Errors</H3>
+<%
+				int count = 0 ;
+				while(enumeration.hasMoreElements())
+				{
+				    final TestFailure testFailure = (TestFailure)enumeration.nextElement() ;
+				    count++ ;
+				    final TestCase failedTest = (TestCase)testFailure.failedTest() ;
+				    final String name = failedTest.getName() ;
+				    final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
+%>
+<p><a href="details.jsp?type=error&index=<%= count %>"><%= name %></a> <%= description %></p>
+<%
+				}
+			}
+			if (failureCount > 0)
+			{
+				final Enumeration enumeration = testResult.failures() ;
+%>
+<H3>Failures</H3>
+<%
+				int count = 0 ;
+				while(enumeration.hasMoreElements())
+				{
+				    final TestFailure testFailure = (TestFailure)enumeration.nextElement() ;
+				    count++ ;
+				    final TestCase failedTest = (TestCase)testFailure.failedTest() ;
+				    final String name = failedTest.getName() ;
+				    final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
+%>
+<p><a href="details.jsp?type=failure&index=<%= count %>"><%= name %></a> <%= description %></p>
+<%
+				}
+			}
+		}
+	}
+%>
+<p>Return to <a href="index.jsp">main page</a></p>
+</body>
+</html>
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web.xml	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	version="2.4">
-    <display-name>JBoss WSTF interop</display-name>
-
-    <description>JBoss WSTF interop</description>
-
-    <!-- base URL for location of Interop services -->
-    <context-param>
-        <param-name>BaseURI</param-name>
-        <param-value>http://@HOST@:@PORT@/sc007</param-value>
-    </context-param>
-
-    <!-- Initialise Interop 11 services -->
-    <listener>
-        <listener-class>com.jboss.transaction.wstf.webservices.sc007.server.ParticipantInitialisation</listener-class>
-    </listener>
-    <listener>
-        <listener-class>com.jboss.transaction.wstf.webservices.sc007.server.InitiatorInitialisation</listener-class>
-    </listener>
-
-    <!-- Define Interop 11 Server Endpoints -->
-    <servlet>
-      <servlet-name>WSTF Sc007 Initiator Service</servlet-name>
-      <servlet-class>com.jboss.transaction.wstf.webservices.sc007.sei.InitiatorPortTypeImpl</servlet-class>
-      <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-      <servlet-name>WSTF Sc007 Participant Service</servlet-name>
-      <servlet-class>com.jboss.transaction.wstf.webservices.sc007.sei.ParticipantPortTypeImpl</servlet-class>
-      <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <!-- Define Sc007 JaxWS Server Endpoint Mappings -->
-    <servlet-mapping>
-      <servlet-name>WSTF Sc007 Initiator Service</servlet-name>
-      <url-pattern>/InitiatorService</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-      <servlet-name>WSTF Sc007 Participant Service</servlet-name>
-      <url-pattern>/ParticipantService</url-pattern>
-    </servlet-mapping>
-
-    <!-- define proxy, logging and junit test runner servlets -->
-    <servlet>
-        <servlet-name>HTTP Proxy Servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.wstf.proxy.ProxyListenerService</servlet-class>
-        <!--
-          The base URI of the proxy servlet.
-         -->
-        <init-param>
-            <param-name>proxyServiceURI</param-name>
-            <param-value>http://@HOST@:@PORT@/sc007/proxy</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>JUnit test servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.wstf.test.TestServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>XML results servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.wstf.test.XMLResultsServlet</servlet-class>
-    </servlet>
-
-    <servlet>
-        <servlet-name>Log servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.wstf.test.TestLogServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-	<!-- servlet mappings -->
-    <servlet-mapping>
-        <servlet-name>HTTP Proxy Servlet</servlet-name>
-        <url-pattern>/proxy/*</url-pattern>
-    </servlet-mapping>
-    
-    <servlet-mapping>
-        <servlet-name>JUnit test servlet</servlet-name>
-        <url-pattern>/test</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>XML results servlet</servlet-name>
-        <url-pattern>/xmlresults</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>Log servlet</servlet-name>
-        <url-pattern>/logs/*</url-pattern>
-    </servlet-mapping>
-    
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-    </welcome-file-list>
-</web-app>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web.xml (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web.xml)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web.xml	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTFSC07-interop/web.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	version="2.4">
+    <display-name>JBoss WSTF interop</display-name>
+
+    <description>JBoss WSTF interop</description>
+
+    <!-- base URL for location of Interop services -->
+    <context-param>
+        <param-name>BaseURI</param-name>
+        <param-value>http://@HOST@:@PORT@/sc007</param-value>
+    </context-param>
+
+    <!-- Initialise Interop 11 services -->
+    <listener>
+        <listener-class>com.jboss.transaction.wstf.webservices.sc007.server.ParticipantInitialisation</listener-class>
+    </listener>
+    <listener>
+        <listener-class>com.jboss.transaction.wstf.webservices.sc007.server.InitiatorInitialisation</listener-class>
+    </listener>
+
+    <!-- Define Interop 11 Server Endpoints -->
+    <servlet>
+      <servlet-name>WSTF Sc007 Initiator Service</servlet-name>
+      <servlet-class>com.jboss.transaction.wstf.webservices.sc007.sei.InitiatorPortTypeImpl</servlet-class>
+      <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
+      <servlet-name>WSTF Sc007 Participant Service</servlet-name>
+      <servlet-class>com.jboss.transaction.wstf.webservices.sc007.sei.ParticipantPortTypeImpl</servlet-class>
+      <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <!-- Define Sc007 JaxWS Server Endpoint Mappings -->
+    <servlet-mapping>
+      <servlet-name>WSTF Sc007 Initiator Service</servlet-name>
+      <url-pattern>/InitiatorService</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+      <servlet-name>WSTF Sc007 Participant Service</servlet-name>
+      <url-pattern>/ParticipantService</url-pattern>
+    </servlet-mapping>
+
+    <!-- define proxy, logging and junit test runner servlets -->
+    <servlet>
+        <servlet-name>HTTP Proxy Servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.wstf.proxy.ProxyListenerService</servlet-class>
+        <!--
+          The base URI of the proxy servlet.
+         -->
+        <init-param>
+            <param-name>proxyServiceURI</param-name>
+            <param-value>http://@HOST@:@PORT@/sc007/proxy</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>JUnit test servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.wstf.test.TestServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>XML results servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.wstf.test.XMLResultsServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>Log servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.wstf.test.TestLogServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+	<!-- servlet mappings -->
+    <servlet-mapping>
+        <servlet-name>HTTP Proxy Servlet</servlet-name>
+        <url-pattern>/proxy/*</url-pattern>
+    </servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>JUnit test servlet</servlet-name>
+        <url-pattern>/test</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>XML results servlet</servlet-name>
+        <url-pattern>/xmlresults</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>Log servlet</servlet-name>
+        <url-pattern>/logs/*</url-pattern>
+    </servlet-mapping>
+    
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+</web-app>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/README.txt
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/README.txt	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/README.txt	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,52 +0,0 @@
-This latest version of the WSTX11 test code uses the JaxWS based
-implementation of XTS 1.1 (JBossTS 4.4.CR1 onwards) which runs on
-JBoss AS 5.0.0.CR1 with the default deployed version of Web Services,
-JBossWS 3.0.2 Native.
-
-Implementation of this version of the interop code required modifying
-the interop Initiator and Participant services so that they
-communicate via JaxWS. This is because they have to use the WSCOOR
-CoordinationContext types generated by the JaxWS wsdl compiler when
-talking to the 1.1. services and hence when talking to each other
-which invaldiates use of the serialisation code in Kev's roll-yer-own
-soap stack (a plus point is that they can use use JaxB to
-serialise/deserialise these types so the switch is not very complex).
-
-The JaxWS fault notification problem has been resolved in the XTS code
-and in this code. In summary, the problem arises because JaxWS only
-provides for dispatch of faults as immediate (failure)
-acknowledgements to incoming messages while the WS protocols require
-asynchronous dispatch of faults to known endpoints after the
-originating one way message has been acknowledged and the transport
-closed.
-
-The solution for both XTS and the iterop application is to
-define a fault dispatch service API (wsdl) use JaxWS to generate a
-corresponding client service class and stub. On the client side the
-stub is invoke to send a fault message to the reply/fault address with
-the requisite action in the message header. On the server side the
-service implementation class implements a WebMethod specifying the
-corresponding action. Note that this fault handling method is not
-specified in the published XTS/interop wsdl.
-
-With JBossWS native this solution works fine. With JBossWS Metro it
-fails on two counts. Firstly, Metro compains about a the
-implementation class providing a WebMethod which is not defined in the
-wsdl (this is definitely over-picky -- someone could quite
-legitimately want to employ the same class to implement several web
-services). Secondly, even if the wsdl is modified to include the extra
-fault dispatch operation Metro refuses to deliver a message whose
-input is a soap fault (this is totally brain dead!).
-
-All the AT and BA interop tests run successfully against another JBoss
-XTS instance (with the exception of BA Mixed Outcome which is not
-implemented).
-
-They all run successfully against the IBM interop endpoint when JBoss
-provides the initiator service and IBM provides the participant
-service.
-
-They all run successfully against the IBM interop endpoint when JBoss
-is providing the participant service and IBM provides the initiator
-service apart from two failures caused by an error in the IBM
-implementation.

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/README.txt (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/README.txt)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/README.txt	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/README.txt	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,52 @@
+This latest version of the WSTX11 test code uses the JaxWS based
+implementation of XTS 1.1 (JBossTS 4.4.CR1 onwards) which runs on
+JBoss AS 5.0.0.CR1 with the default deployed version of Web Services,
+JBossWS 3.0.2 Native.
+
+Implementation of this version of the interop code required modifying
+the interop Initiator and Participant services so that they
+communicate via JaxWS. This is because they have to use the WSCOOR
+CoordinationContext types generated by the JaxWS wsdl compiler when
+talking to the 1.1. services and hence when talking to each other
+which invaldiates use of the serialisation code in Kev's roll-yer-own
+soap stack (a plus point is that they can use use JaxB to
+serialise/deserialise these types so the switch is not very complex).
+
+The JaxWS fault notification problem has been resolved in the XTS code
+and in this code. In summary, the problem arises because JaxWS only
+provides for dispatch of faults as immediate (failure)
+acknowledgements to incoming messages while the WS protocols require
+asynchronous dispatch of faults to known endpoints after the
+originating one way message has been acknowledged and the transport
+closed.
+
+The solution for both XTS and the iterop application is to
+define a fault dispatch service API (wsdl) use JaxWS to generate a
+corresponding client service class and stub. On the client side the
+stub is invoke to send a fault message to the reply/fault address with
+the requisite action in the message header. On the server side the
+service implementation class implements a WebMethod specifying the
+corresponding action. Note that this fault handling method is not
+specified in the published XTS/interop wsdl.
+
+With JBossWS native this solution works fine. With JBossWS Metro it
+fails on two counts. Firstly, Metro compains about a the
+implementation class providing a WebMethod which is not defined in the
+wsdl (this is definitely over-picky -- someone could quite
+legitimately want to employ the same class to implement several web
+services). Secondly, even if the wsdl is modified to include the extra
+fault dispatch operation Metro refuses to deliver a message whose
+input is a soap fault (this is totally brain dead!).
+
+All the AT and BA interop tests run successfully against another JBoss
+XTS instance (with the exception of BA Mixed Outcome which is not
+implemented).
+
+They all run successfully against the IBM interop endpoint when JBoss
+provides the initiator service and IBM provides the participant
+service.
+
+They all run successfully against the IBM interop endpoint when JBoss
+is providing the participant service and IBM provides the initiator
+service apart from two failures caused by an error in the IBM
+implementation.

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/build.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,138 +0,0 @@
-<?xml version="1.0"?>
-<project name="project" default="war">
-    <description>
-        JBoss Transactions WS-Addressing interop test
-    </description>
-
-	<property environment="env"/>
-	
-	<property name="host" value="localhost"/>
-	<property name="port" value="8080"/>
-	
-	<property name="jboss.dir" location="${env.JBOSS_HOME}"/>
-	<property name="jboss.deploy.dir" location="${jboss.dir}/server/default/deploy"/>
-	
-	<property name="build.dir" location="build"/>
-	<property name="build.classes.dir" location="${build.dir}/classes"/>
-	<property name="build.lib.dir" location="${build.dir}/lib"/>
-	<property name="build.war.file" location="${build.lib.dir}/interop11.war"/>
-	<property name="build.webxml.file" location="${build.lib.dir}/web.xml"/>
-	
-	<property name="src.dir" location="src"/>
-	<property name="dd.dir" location="dd/"/>
-	<property name="webxml.file" location="web.xml"/>
-	<property name="lib.dir" location="lib"/>
-	<property name="web.dir" location="web"/>
-	
-	<property name="jboss.client.lib.dir" location="${jboss.dir}/client"/>
-	<property name="jboss.lib.dir" location="${jboss.dir}/lib"/>
-	<property name="jboss.common.lib.dir" location="${jboss.dir}/common/lib"/>
-	<!-- export XTS_HOME=/home/adinn/jboss/jbossts/trunk/XTS/xts-install -->
-	<property name="xts.home" location="${env.XTS_HOME}"/>
-	<property name="xts.lib.dir" location="${xts.home}/lib"/>
-	<property name="xts.ext.lib.dir" location="${xts.lib.dir}/ext"/>
-
-	<echo>jboss.dir = ${jboss.dir}</echo>
-	<echo>xts.home = ${xts.home}</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"/>
-	-->
-	<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
-            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"/>
-	<property name="jboss.compile.lib.jars" value="dom4j.jar"/>
-	<property name="jboss.compile.common.libs" value="servlet-api.jar"/>
-
-	<property name="dist.compile.libs" value="junit.jar saxon.jar"/>
-
-	<!--
-	<property name="dist.dependency.libs" value="wstx-asl-2.0.3.jar"/>
-	<property name="dist.libs" value="${dist.compile.libs} ${dist.dependency.libs}"/>
-	-->
-	<property name="dist.libs" value="${dist.compile.libs}"/>
-	<property name="dist.xts.libs" value="${xts11.compile.libs} ${xts.compile.libs}"/>
-	<property name="dist.xts.ext.libs" value="${xts.ext.compile.libs}"/>
-
-	<property name="compile.debug" value="true"/>
-	
-	<path id="classpath">
-		<fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
-		<fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
-		<fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
-		<fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
-		<fileset dir="${jboss.lib.dir}" includes="${jboss.compile.lib.jars}"/>
-		<fileset dir="${jboss.common.lib.dir}" includes="${jboss.compile.common.libs}"/>
-	</path>
-	<property name="classpath" refid="classpath"/>
-	
-	<target name="init">
-		<mkdir dir="${build.dir}"/>
-		<mkdir dir="${build.classes.dir}"/>
-		<mkdir dir="${build.lib.dir}"/>
-	</target>
-	
-	<target name="compile" depends="init">
-		<javac classpathref="classpath" destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}"/>
-	</target>
-	
-    <target name="war" depends="compile">
-    	    <copy file="${webxml.file}" tofile="${build.webxml.file}" overwrite="yes">
-    	    		<filterset>
-    	    			<filter token="HOST" value="${host}"/>
-    	    			<filter token="PORT" value="${port}"/>
-    	    		</filterset>
-            </copy>
-        <!-- todo put one copy of each handler file in WEB-INF and refer to it correctly from SEI class annotation-->
-        <copy file="${dd.dir}/interop11/initiatorhandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/atinterop/sei" overwrite="yes">
-        </copy>
-        <copy file="${dd.dir}/interop11/participanthandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/atinterop/sei" overwrite="yes">
-        </copy>
-        <copy file="${dd.dir}/interop11/initiatorhandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/bainterop/sei" overwrite="yes">
-        </copy>
-        <copy file="${dd.dir}/interop11/participanthandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/bainterop/sei" overwrite="yes">
-        </copy>
-	<!-- wsdl gets loaded relative to service implementation class -->
-        <copy toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/atinterop/generated"
-	      overwrite="yes">
-            <fileset dir="${dd.dir}/interop11"
-                    includes="wsdl/interopat*.wsdl"/>
-        </copy>
-        <copy toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/bainterop/generated"
-	      overwrite="yes">
-            <fileset dir="${dd.dir}/interop11"
-                    includes="wsdl/interopba*.wsdl"/>
-        </copy>
-        <copy toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/soapfault/generated"
-	      overwrite="yes">
-            <fileset dir="${dd.dir}/interop11"
-                    includes="wsdl/soapfault.wsdl"/>
-        </copy>
-            <war destfile="${build.war.file}" webxml="${build.webxml.file}">
-    			<classes dir="${build.classes.dir}"/>
-    			<classes dir="${src.dir}" excludes="**/*.java"/>
-                <lib dir="${lib.dir}" includes="${dist.libs}"/>
-                <!--
-		    <lib dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
-		-->
-                <webinf dir="${dd.dir}/interop11" includes="wsdl/*.wsdl"/>
-		<fileset dir="${web.dir}"/>
-    		</war>
-    </target>
-	
-	<target name="deploy" depends="war">
-		<copy file="${build.war.file}" todir="${jboss.deploy.dir}"/>
-	</target>
-	
-	<target name="undeploy">
-		<delete file="${jboss.deploy.dir}/interop11.war"/>
-	</target>
-
-	<target name="clean">
-		<delete dir="${build.dir}"/>
-	</target>
-</project>
-

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/build.xml (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/build.xml	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/build.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<project name="project" default="war">
+    <description>
+        JBoss Transactions WS-Addressing interop test
+    </description>
+
+	<property environment="env"/>
+	
+	<property name="host" value="localhost"/>
+	<property name="port" value="8080"/>
+	
+	<property name="jboss.dir" location="${env.JBOSS_HOME}"/>
+	<property name="jboss.deploy.dir" location="${jboss.dir}/server/default/deploy"/>
+	
+	<property name="build.dir" location="build"/>
+	<property name="build.classes.dir" location="${build.dir}/classes"/>
+	<property name="build.lib.dir" location="${build.dir}/lib"/>
+	<property name="build.war.file" location="${build.lib.dir}/interop11.war"/>
+	<property name="build.webxml.file" location="${build.lib.dir}/web.xml"/>
+	
+	<property name="src.dir" location="src"/>
+	<property name="dd.dir" location="dd/"/>
+	<property name="webxml.file" location="web.xml"/>
+	<property name="lib.dir" location="lib"/>
+	<property name="web.dir" location="web"/>
+	
+	<property name="jboss.client.lib.dir" location="${jboss.dir}/client"/>
+	<property name="jboss.lib.dir" location="${jboss.dir}/lib"/>
+	<property name="jboss.common.lib.dir" location="${jboss.dir}/common/lib"/>
+	<!-- export XTS_HOME=/home/adinn/jboss/jbossts/trunk/XTS/xts-install -->
+	<property name="xts.home" location="${env.XTS_HOME}"/>
+	<property name="xts.lib.dir" location="${xts.home}/lib"/>
+	<property name="xts.ext.lib.dir" location="${xts.lib.dir}/ext"/>
+
+	<echo>jboss.dir = ${jboss.dir}</echo>
+	<echo>xts.home = ${xts.home}</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"/>
+	-->
+	<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
+            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"/>
+	<property name="jboss.compile.lib.jars" value="dom4j.jar"/>
+	<property name="jboss.compile.common.libs" value="servlet-api.jar"/>
+
+	<property name="dist.compile.libs" value="junit.jar saxon.jar"/>
+
+	<!--
+	<property name="dist.dependency.libs" value="wstx-asl-2.0.3.jar"/>
+	<property name="dist.libs" value="${dist.compile.libs} ${dist.dependency.libs}"/>
+	-->
+	<property name="dist.libs" value="${dist.compile.libs}"/>
+	<property name="dist.xts.libs" value="${xts11.compile.libs} ${xts.compile.libs}"/>
+	<property name="dist.xts.ext.libs" value="${xts.ext.compile.libs}"/>
+
+	<property name="compile.debug" value="true"/>
+	
+	<path id="classpath">
+		<fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
+		<fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
+		<fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
+		<fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
+		<fileset dir="${jboss.lib.dir}" includes="${jboss.compile.lib.jars}"/>
+		<fileset dir="${jboss.common.lib.dir}" includes="${jboss.compile.common.libs}"/>
+	</path>
+	<property name="classpath" refid="classpath"/>
+	
+	<target name="init">
+		<mkdir dir="${build.dir}"/>
+		<mkdir dir="${build.classes.dir}"/>
+		<mkdir dir="${build.lib.dir}"/>
+	</target>
+	
+	<target name="compile" depends="init">
+		<javac classpathref="classpath" destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}"/>
+	</target>
+	
+    <target name="war" depends="compile">
+    	    <copy file="${webxml.file}" tofile="${build.webxml.file}" overwrite="yes">
+    	    		<filterset>
+    	    			<filter token="HOST" value="${host}"/>
+    	    			<filter token="PORT" value="${port}"/>
+    	    		</filterset>
+            </copy>
+        <!-- todo put one copy of each handler file in WEB-INF and refer to it correctly from SEI class annotation-->
+        <copy file="${dd.dir}/interop11/initiatorhandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/atinterop/sei" overwrite="yes">
+        </copy>
+        <copy file="${dd.dir}/interop11/participanthandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/atinterop/sei" overwrite="yes">
+        </copy>
+        <copy file="${dd.dir}/interop11/initiatorhandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/bainterop/sei" overwrite="yes">
+        </copy>
+        <copy file="${dd.dir}/interop11/participanthandlers.xml" toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/bainterop/sei" overwrite="yes">
+        </copy>
+	<!-- wsdl gets loaded relative to service implementation class -->
+        <copy toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/atinterop/generated"
+	      overwrite="yes">
+            <fileset dir="${dd.dir}/interop11"
+                    includes="wsdl/interopat*.wsdl"/>
+        </copy>
+        <copy toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/bainterop/generated"
+	      overwrite="yes">
+            <fileset dir="${dd.dir}/interop11"
+                    includes="wsdl/interopba*.wsdl"/>
+        </copy>
+        <copy toDir="${build.classes.dir}/com/jboss/transaction/txinterop/webservices/soapfault/generated"
+	      overwrite="yes">
+            <fileset dir="${dd.dir}/interop11"
+                    includes="wsdl/soapfault.wsdl"/>
+        </copy>
+            <war destfile="${build.war.file}" webxml="${build.webxml.file}">
+    			<classes dir="${build.classes.dir}"/>
+    			<classes dir="${src.dir}" excludes="**/*.java"/>
+                <lib dir="${lib.dir}" includes="${dist.libs}"/>
+                <!--
+		    <lib dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
+		-->
+                <webinf dir="${dd.dir}/interop11" includes="wsdl/*.wsdl"/>
+		<fileset dir="${web.dir}"/>
+    		</war>
+    </target>
+	
+	<target name="deploy" depends="war">
+		<copy file="${build.war.file}" todir="${jboss.deploy.dir}"/>
+	</target>
+	
+	<target name="undeploy">
+		<delete file="${jboss.deploy.dir}/interop11.war"/>
+	</target>
+
+	<target name="clean">
+		<delete dir="${build.dir}"/>
+	</target>
+</project>
+

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11 (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/build.sh	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/build.sh	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,36 +0,0 @@
-#
-#
-#
-
-if [ ! -d tmp ] ; then
-    mkdir tmp
-fi
-
-if [ ! -d tmp/classes ] ; then
-    mkdir tmp/classes
-fi
-
-if [ ! -d tmp/src ] ; then
-    mkdir tmp/src
-fi
-
-# delete old generated versions -- any changes should be made to a copy!
-
-rm -rf tmp/classes/* tmp/src/*
-
-#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interop11-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 -p com.jboss.transaction.txinterop.webservices.atinterop.generated wsdl/interopat-initiator-binding.wsdl
-
-#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interop11-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 -p com.jboss.transaction.txinterop.webservices.atinterop.generated wsdl/interopat-participant-binding.wsdl
-
-#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interop11-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 -p com.jboss.transaction.txinterop.webservices.bainterop.generated wsdl/interopba-initiator-binding.wsdl
-
-#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interop11-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 -p com.jboss.transaction.txinterop.webservices.bainterop.generated wsdl/interopba-participant-binding.wsdl
-
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interopat-initiator-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.txinterop.webservices.atinterop.generated wsdl/interopat-initiator-binding.wsdl
-
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interopat-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.txinterop.webservices.atinterop.generated wsdl/interopat-participant-binding.wsdl
-
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interopba-initiator-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.txinterop.webservices.bainterop.generated wsdl/interopba-initiator-binding.wsdl
-
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interopba-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.txinterop.webservices.bainterop.generated wsdl/interopba-participant-binding.wsdl
-

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/build.sh (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/build.sh)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/build.sh	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/build.sh	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,53 @@
+#---
+# JBoss, Home of Professional Open Source
+# Copyright 2007, Red Hat Middleware LLC, and individual contributors
+# as indicated by the @author tags.
+# See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU Lesser General Public License, v. 2.1.
+# This program is distributed in the hope that it will be useful, but WITHOUT A
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License,
+# v.2.1 along with this distribution; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.
+#
+# (C) 2005-2006,
+# @author JBoss Inc.
+#--- 
+
+if [ ! -d tmp ] ; then
+    mkdir tmp
+fi
+
+if [ ! -d tmp/classes ] ; then
+    mkdir tmp/classes
+fi
+
+if [ ! -d tmp/src ] ; then
+    mkdir tmp/src
+fi
+
+# delete old generated versions -- any changes should be made to a copy!
+
+rm -rf tmp/classes/* tmp/src/*
+
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interop11-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 -p com.jboss.transaction.txinterop.webservices.atinterop.generated wsdl/interopat-initiator-binding.wsdl
+
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interop11-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 -p com.jboss.transaction.txinterop.webservices.atinterop.generated wsdl/interopat-participant-binding.wsdl
+
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interop11-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 -p com.jboss.transaction.txinterop.webservices.bainterop.generated wsdl/interopba-initiator-binding.wsdl
+
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interop11-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 -p com.jboss.transaction.txinterop.webservices.bainterop.generated wsdl/interopba-participant-binding.wsdl
+
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interopat-initiator-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.txinterop.webservices.atinterop.generated wsdl/interopat-initiator-binding.wsdl
+
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interopat-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.txinterop.webservices.atinterop.generated wsdl/interopat-participant-binding.wsdl
+
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interopba-initiator-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.txinterop.webservices.bainterop.generated wsdl/interopba-initiator-binding.wsdl
+
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/interopba-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.txinterop.webservices.bainterop.generated wsdl/interopba-participant-binding.wsdl
+

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2007, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU General Public License, v. 2.0.
-  This program is distributed in the hope that it will be useful, but WITHOUT A 
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License,
-  v. 2.0 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-  MA  02110-1301, USA.
-  
-  (C) 2007,
-  @author JBoss Inc.
--->
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" 
-xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
-    <handler-chain>
-	<handler>
-		<handler-name>WS Addressing Server Handler</handler-name>
-		<handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
-	</handler>
-    </handler-chain>
-</handler-chains>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  JBoss, Home of Professional Open Source
+  Copyright 2007, Red Hat Middleware LLC, and individual contributors
+  as indicated by the @author tags. 
+  See the copyright.txt in the distribution for a full listing 
+  of individual contributors.
+  This copyrighted material is made available to anyone wishing to use,
+  modify, copy, or redistribute it subject to the terms and conditions
+  of the GNU General Public License, v. 2.0.
+  This program is distributed in the hope that it will be useful, but WITHOUT A 
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License,
+  v. 2.0 along with this distribution; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+  MA  02110-1301, USA.
+  
+  (C) 2007,
+  @author JBoss Inc.
+-->
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" 
+xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
+    <handler-chain>
+	<handler>
+		<handler-name>WS Addressing Server Handler</handler-name>
+		<handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
+	</handler>
+    </handler-chain>
+</handler-chains>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2007, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU General Public License, v. 2.0.
-  This program is distributed in the hope that it will be useful, but WITHOUT A 
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License,
-  v. 2.0 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-  MA  02110-1301, USA.
-  
-  (C) 2007,
-  @author JBoss Inc.
--->
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" 
-xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
-    <handler-chain>
-	<handler>
-		<handler-name>Coordination Context Handler</handler-name>
-		<handler-class>com.jboss.transaction.txinterop.webservices.handlers.CoordinationContextHandler</handler-class>
-	</handler>
-	<handler>
-		<handler-name>WS Addressing Server Handler</handler-name>
-		<handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
-	</handler>
-    </handler-chain>
-</handler-chains>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  JBoss, Home of Professional Open Source
+  Copyright 2007, Red Hat Middleware LLC, and individual contributors
+  as indicated by the @author tags. 
+  See the copyright.txt in the distribution for a full listing 
+  of individual contributors.
+  This copyrighted material is made available to anyone wishing to use,
+  modify, copy, or redistribute it subject to the terms and conditions
+  of the GNU General Public License, v. 2.0.
+  This program is distributed in the hope that it will be useful, but WITHOUT A 
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License,
+  v. 2.0 along with this distribution; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+  MA  02110-1301, USA.
+  
+  (C) 2007,
+  @author JBoss Inc.
+-->
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" 
+xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee">
+    <handler-chain>
+	<handler>
+		<handler-name>Coordination Context Handler</handler-name>
+		<handler-class>com.jboss.transaction.txinterop.webservices.handlers.CoordinationContextHandler</handler-class>
+	</handler>
+	<handler>
+		<handler-name>WS Addressing Server Handler</handler-name>
+		<handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class>
+	</handler>
+    </handler-chain>
+</handler-chains>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-binding.wsdl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions
-        xmlns:s="http://www.w3.org/2001/XMLSchema"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
-        xmlns:tns="http://fabrikam123.com"
-        targetNamespace="http://fabrikam123.com"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-    <import
-       namespace="http://fabrikam123.com"
-       location="interopat.wsdl"/>
-
-    <binding name="Initiator_SOAPBinding" type="tns:InitiatorPortType">
-      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-      <operation name="Response">
-        <soap:operation soapAction="http://fabrikam123.com/Response"/>
-        <input message="tns:Response">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-    </binding>
-
-    <binding name="Participant_SOAPBinding" type="tns:ParticipantPortType">
-      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-      <operation name="CompletionCommit">
-        <soap:operation soapAction="http://fabrikam123.com/CompletionCommit"/>
-        <input message="tns:CompletionCommit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="CompletionRollback">
-        <soap:operation soapAction="http://fabrikam123.com/CompletionRollback"/>
-        <input message="tns:CompletionRollback">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Commit">
-        <soap:operation soapAction="http://fabrikam123.com/Commit"/>
-        <input message="tns:Commit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Rollback">
-        <soap:operation soapAction="http://fabrikam123.com/Rollback"/>
-        <input message="tns:Rollback">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Phase2Rollback">
-        <soap:operation soapAction="http://fabrikam123.com/Phase2Rollback"/>
-        <input message="tns:Phase2Rollback">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Readonly">
-        <soap:operation soapAction="http://fabrikam123.com/Readonly"/>
-        <input message="tns:Readonly">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="VolatileAndDurable">
-        <soap:operation soapAction="http://fabrikam123.com/VolatileAndDurable"/>
-        <input message="tns:VolatileAndDurable">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="EarlyReadonly">
-        <soap:operation soapAction="http://fabrikam123.com/EarlyReadonly"/>
-        <input message="tns:EarlyReadonly">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="EarlyAborted">
-        <soap:operation soapAction="http://fabrikam123.com/EarlyAborted"/>
-        <input message="tns:EarlyAborted">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="ReplayCommit">
-        <soap:operation soapAction="http://fabrikam123.com/ReplayCommit"/>
-        <input message="tns:ReplayCommit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="RetryPreparedCommit">
-        <soap:operation soapAction="http://fabrikam123.com/RetryPreparedCommit"/>
-        <input message="tns:RetryPreparedCommit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="RetryPreparedAbort">
-        <soap:operation soapAction="http://fabrikam123.com/RetryPreparedAbort"/>
-        <input message="tns:RetryPreparedAbort">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="RetryCommit">
-        <soap:operation soapAction="http://fabrikam123.com/RetryCommit"/>
-        <input message="tns:RetryCommit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="PreparedAfterTimeout">
-        <soap:operation soapAction="http://fabrikam123.com/PreparedAfterTimeout"/>
-        <input message="tns:PreparedAfterTimeout">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="LostCommitted">
-        <soap:operation soapAction="http://fabrikam123.com/LostCommitted"/>
-        <input message="tns:LostCommitted">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-    </binding>
-
-    <service name="InteropService">
-      <port binding="tns:Initiator_SOAPBinding" name="InitiatorPortType">
-	<wsaw:UsingAddressing required="true"/>
-	<soap:address location="http://localhost:9000/interopat/InteropService"/>
-      </port>
-      <port binding="tns:Participant_SOAPBinding" name="ParticipantPortType">
-	<wsaw:UsingAddressing required="true"/>
-	<soap:address location="http://localhost:9000/interopat/ParticipantService"/>
-      </port>
-    </service>
-
-</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-binding.wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-binding.wsdl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-binding.wsdl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<definitions
+        xmlns:s="http://www.w3.org/2001/XMLSchema"
+        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
+        xmlns:tns="http://fabrikam123.com"
+        targetNamespace="http://fabrikam123.com"
+        xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <import
+       namespace="http://fabrikam123.com"
+       location="interopat.wsdl"/>
+
+    <binding name="Initiator_SOAPBinding" type="tns:InitiatorPortType">
+      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+      <operation name="Response">
+        <soap:operation soapAction="http://fabrikam123.com/Response"/>
+        <input message="tns:Response">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+    </binding>
+
+    <binding name="Participant_SOAPBinding" type="tns:ParticipantPortType">
+      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+      <operation name="CompletionCommit">
+        <soap:operation soapAction="http://fabrikam123.com/CompletionCommit"/>
+        <input message="tns:CompletionCommit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="CompletionRollback">
+        <soap:operation soapAction="http://fabrikam123.com/CompletionRollback"/>
+        <input message="tns:CompletionRollback">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Commit">
+        <soap:operation soapAction="http://fabrikam123.com/Commit"/>
+        <input message="tns:Commit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Rollback">
+        <soap:operation soapAction="http://fabrikam123.com/Rollback"/>
+        <input message="tns:Rollback">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Phase2Rollback">
+        <soap:operation soapAction="http://fabrikam123.com/Phase2Rollback"/>
+        <input message="tns:Phase2Rollback">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Readonly">
+        <soap:operation soapAction="http://fabrikam123.com/Readonly"/>
+        <input message="tns:Readonly">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="VolatileAndDurable">
+        <soap:operation soapAction="http://fabrikam123.com/VolatileAndDurable"/>
+        <input message="tns:VolatileAndDurable">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="EarlyReadonly">
+        <soap:operation soapAction="http://fabrikam123.com/EarlyReadonly"/>
+        <input message="tns:EarlyReadonly">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="EarlyAborted">
+        <soap:operation soapAction="http://fabrikam123.com/EarlyAborted"/>
+        <input message="tns:EarlyAborted">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="ReplayCommit">
+        <soap:operation soapAction="http://fabrikam123.com/ReplayCommit"/>
+        <input message="tns:ReplayCommit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="RetryPreparedCommit">
+        <soap:operation soapAction="http://fabrikam123.com/RetryPreparedCommit"/>
+        <input message="tns:RetryPreparedCommit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="RetryPreparedAbort">
+        <soap:operation soapAction="http://fabrikam123.com/RetryPreparedAbort"/>
+        <input message="tns:RetryPreparedAbort">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="RetryCommit">
+        <soap:operation soapAction="http://fabrikam123.com/RetryCommit"/>
+        <input message="tns:RetryCommit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="PreparedAfterTimeout">
+        <soap:operation soapAction="http://fabrikam123.com/PreparedAfterTimeout"/>
+        <input message="tns:PreparedAfterTimeout">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="LostCommitted">
+        <soap:operation soapAction="http://fabrikam123.com/LostCommitted"/>
+        <input message="tns:LostCommitted">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+    </binding>
+
+    <service name="InteropService">
+      <port binding="tns:Initiator_SOAPBinding" name="InitiatorPortType">
+	<wsaw:UsingAddressing required="true"/>
+	<soap:address location="http://localhost:9000/interopat/InteropService"/>
+      </port>
+      <port binding="tns:Participant_SOAPBinding" name="ParticipantPortType">
+	<wsaw:UsingAddressing required="true"/>
+	<soap:address location="http://localhost:9000/interopat/ParticipantService"/>
+      </port>
+    </service>
+
+</definitions>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-initiator-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-initiator-binding.wsdl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-initiator-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions
-        xmlns:s="http://www.w3.org/2001/XMLSchema"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
-        xmlns:tns="http://fabrikam123.com"
-        targetNamespace="http://fabrikam123.com"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-    <import
-       namespace="http://fabrikam123.com"
-       location="interopat.wsdl"/>
-
-    <binding name="Initiator_SOAPBinding" type="tns:InitiatorPortType">
-      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-      <operation name="Response">
-        <soap:operation soapAction="http://fabrikam123.com/Response"/>
-        <input message="tns:Response">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-    </binding>
-
-    <service name="InitiatorService">
-      <port binding="tns:Initiator_SOAPBinding" name="InitiatorPortType">
-	<wsaw:UsingAddressing required="true"/>
-	<soap:address location="http://localhost:9000/interopat/InitiatorService"/>
-      </port>
-    </service>
-
-</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-initiator-binding.wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-initiator-binding.wsdl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-initiator-binding.wsdl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-initiator-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<definitions
+        xmlns:s="http://www.w3.org/2001/XMLSchema"
+        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
+        xmlns:tns="http://fabrikam123.com"
+        targetNamespace="http://fabrikam123.com"
+        xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <import
+       namespace="http://fabrikam123.com"
+       location="interopat.wsdl"/>
+
+    <binding name="Initiator_SOAPBinding" type="tns:InitiatorPortType">
+      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+      <operation name="Response">
+        <soap:operation soapAction="http://fabrikam123.com/Response"/>
+        <input message="tns:Response">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+    </binding>
+
+    <service name="InitiatorService">
+      <port binding="tns:Initiator_SOAPBinding" name="InitiatorPortType">
+	<wsaw:UsingAddressing required="true"/>
+	<soap:address location="http://localhost:9000/interopat/InitiatorService"/>
+      </port>
+    </service>
+
+</definitions>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-participant-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-participant-binding.wsdl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-participant-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions
-        xmlns:s="http://www.w3.org/2001/XMLSchema"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
-        xmlns:tns="http://fabrikam123.com"
-        targetNamespace="http://fabrikam123.com"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-    <import
-       namespace="http://fabrikam123.com"
-       location="interopat.wsdl"/>
-
-    <binding name="Participant_SOAPBinding" type="tns:ParticipantPortType">
-      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-      <operation name="CompletionCommit">
-        <soap:operation soapAction="http://fabrikam123.com/CompletionCommit"/>
-        <input message="tns:CompletionCommit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="CompletionRollback">
-        <soap:operation soapAction="http://fabrikam123.com/CompletionRollback"/>
-        <input message="tns:CompletionRollback">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Commit">
-        <soap:operation soapAction="http://fabrikam123.com/Commit"/>
-        <input message="tns:Commit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Rollback">
-        <soap:operation soapAction="http://fabrikam123.com/Rollback"/>
-        <input message="tns:Rollback">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Phase2Rollback">
-        <soap:operation soapAction="http://fabrikam123.com/Phase2Rollback"/>
-        <input message="tns:Phase2Rollback">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Readonly">
-        <soap:operation soapAction="http://fabrikam123.com/Readonly"/>
-        <input message="tns:Readonly">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="VolatileAndDurable">
-        <soap:operation soapAction="http://fabrikam123.com/VolatileAndDurable"/>
-        <input message="tns:VolatileAndDurable">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="EarlyReadonly">
-        <soap:operation soapAction="http://fabrikam123.com/EarlyReadonly"/>
-        <input message="tns:EarlyReadonly">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="EarlyAborted">
-        <soap:operation soapAction="http://fabrikam123.com/EarlyAborted"/>
-        <input message="tns:EarlyAborted">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="ReplayCommit">
-        <soap:operation soapAction="http://fabrikam123.com/ReplayCommit"/>
-        <input message="tns:ReplayCommit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="RetryPreparedCommit">
-        <soap:operation soapAction="http://fabrikam123.com/RetryPreparedCommit"/>
-        <input message="tns:RetryPreparedCommit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="RetryPreparedAbort">
-        <soap:operation soapAction="http://fabrikam123.com/RetryPreparedAbort"/>
-        <input message="tns:RetryPreparedAbort">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="RetryCommit">
-        <soap:operation soapAction="http://fabrikam123.com/RetryCommit"/>
-        <input message="tns:RetryCommit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="PreparedAfterTimeout">
-        <soap:operation soapAction="http://fabrikam123.com/PreparedAfterTimeout"/>
-        <input message="tns:PreparedAfterTimeout">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="LostCommitted">
-        <soap:operation soapAction="http://fabrikam123.com/LostCommitted"/>
-        <input message="tns:LostCommitted">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-    </binding>
-
-    <service name="ParticipantService">
-      <port binding="tns:Participant_SOAPBinding" name="ParticipantPortType">
-	<wsaw:UsingAddressing required="true"/>
-	<soap:address location="http://localhost:9000/interopat/ParticipantService"/>
-      </port>
-    </service>
-
-</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-participant-binding.wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-participant-binding.wsdl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-participant-binding.wsdl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat-participant-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<definitions
+        xmlns:s="http://www.w3.org/2001/XMLSchema"
+        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
+        xmlns:tns="http://fabrikam123.com"
+        targetNamespace="http://fabrikam123.com"
+        xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <import
+       namespace="http://fabrikam123.com"
+       location="interopat.wsdl"/>
+
+    <binding name="Participant_SOAPBinding" type="tns:ParticipantPortType">
+      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+      <operation name="CompletionCommit">
+        <soap:operation soapAction="http://fabrikam123.com/CompletionCommit"/>
+        <input message="tns:CompletionCommit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="CompletionRollback">
+        <soap:operation soapAction="http://fabrikam123.com/CompletionRollback"/>
+        <input message="tns:CompletionRollback">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Commit">
+        <soap:operation soapAction="http://fabrikam123.com/Commit"/>
+        <input message="tns:Commit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Rollback">
+        <soap:operation soapAction="http://fabrikam123.com/Rollback"/>
+        <input message="tns:Rollback">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Phase2Rollback">
+        <soap:operation soapAction="http://fabrikam123.com/Phase2Rollback"/>
+        <input message="tns:Phase2Rollback">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Readonly">
+        <soap:operation soapAction="http://fabrikam123.com/Readonly"/>
+        <input message="tns:Readonly">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="VolatileAndDurable">
+        <soap:operation soapAction="http://fabrikam123.com/VolatileAndDurable"/>
+        <input message="tns:VolatileAndDurable">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="EarlyReadonly">
+        <soap:operation soapAction="http://fabrikam123.com/EarlyReadonly"/>
+        <input message="tns:EarlyReadonly">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="EarlyAborted">
+        <soap:operation soapAction="http://fabrikam123.com/EarlyAborted"/>
+        <input message="tns:EarlyAborted">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="ReplayCommit">
+        <soap:operation soapAction="http://fabrikam123.com/ReplayCommit"/>
+        <input message="tns:ReplayCommit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="RetryPreparedCommit">
+        <soap:operation soapAction="http://fabrikam123.com/RetryPreparedCommit"/>
+        <input message="tns:RetryPreparedCommit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="RetryPreparedAbort">
+        <soap:operation soapAction="http://fabrikam123.com/RetryPreparedAbort"/>
+        <input message="tns:RetryPreparedAbort">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="RetryCommit">
+        <soap:operation soapAction="http://fabrikam123.com/RetryCommit"/>
+        <input message="tns:RetryCommit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="PreparedAfterTimeout">
+        <soap:operation soapAction="http://fabrikam123.com/PreparedAfterTimeout"/>
+        <input message="tns:PreparedAfterTimeout">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="LostCommitted">
+        <soap:operation soapAction="http://fabrikam123.com/LostCommitted"/>
+        <input message="tns:LostCommitted">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+    </binding>
+
+    <service name="ParticipantService">
+      <port binding="tns:Participant_SOAPBinding" name="ParticipantPortType">
+	<wsaw:UsingAddressing required="true"/>
+	<soap:address location="http://localhost:9000/interopat/ParticipantService"/>
+      </port>
+    </service>
+
+</definitions>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat.wsdl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions
-        xmlns:s="http://www.w3.org/2001/XMLSchema"
-        xmlns:tns="http://fabrikam123.com"
-        targetNamespace="http://fabrikam123.com"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-    <types>
-         <s:schema elementFormDefault="qualified" targetNamespace="http://fabrikam123.com">
-             <s:complexType name="TestMessageType">
-                 <s:sequence />
-             </s:complexType>
-             <s:element name="Response" type="tns:TestMessageType" />
-             <s:element name="CompletionCommit" type="s:string" />
-             <s:element name="CompletionRollback" type="s:string" />
-             <s:element name="Commit" type="tns:TestMessageType" />
-             <s:element name="Rollback" type="tns:TestMessageType" />
-             <s:element name="Phase2Rollback" type="tns:TestMessageType" />
-             <s:element name="Readonly" type="tns:TestMessageType" />
-             <s:element name="VolatileAndDurable" type="tns:TestMessageType" />
-             <s:element name="EarlyReadonly" type="tns:TestMessageType" />
-             <s:element name="EarlyAborted" type="tns:TestMessageType" />
-             <s:element name="ReplayCommit" type="tns:TestMessageType" />
-             <s:element name="RetryPreparedCommit" type="tns:TestMessageType" />
-             <s:element name="RetryPreparedAbort" type="tns:TestMessageType" />
-             <s:element name="RetryCommit" type="tns:TestMessageType" />
-             <s:element name="PreparedAfterTimeout" type="tns:TestMessageType" />
-             <s:element name="LostCommitted" type="tns:TestMessageType" />
-         </s:schema>
-    </types>
-    <message name="CompletionCommit">
-         <part name="parameters" element="tns:CompletionCommit" />
-    </message>
-    <message name="CompletionRollback">
-         <part name="parameters" element="tns:CompletionRollback" />
-    </message>
-    <message name="Commit">
-         <part name="parameters" element="tns:Commit" />
-    </message>
-    <message name="Rollback">
-         <part name="parameters" element="tns:Rollback" />
-    </message>
-    <message name="Phase2Rollback">
-         <part name="parameters" element="tns:Phase2Rollback" />
-    </message>
-    <message name="Readonly">
-         <part name="parameters" element="tns:Readonly" />
-    </message>
-    <message name="VolatileAndDurable">
-         <part name="parameters" element="tns:VolatileAndDurable" />
-    </message>
-    <message name="EarlyReadonly">
-         <part name="parameters" element="tns:EarlyReadonly" />
-    </message>
-    <message name="EarlyAborted">
-         <part name="parameters" element="tns:EarlyAborted" />
-    </message>
-    <message name="ReplayCommit">
-         <part name="parameters" element="tns:ReplayCommit" />
-    </message>
-    <message name="RetryPreparedCommit">
-         <part name="parameters" element="tns:RetryPreparedCommit" />
-    </message>
-    <message name="RetryPreparedAbort">
-         <part name="parameters" element="tns:RetryPreparedAbort" />
-    </message>
-    <message name="RetryCommit">
-         <part name="parameters" element="tns:RetryCommit" />
-    </message>
-    <message name="PreparedAfterTimeout">
-         <part name="parameters" element="tns:PreparedAfterTimeout" />
-    </message>
-    <message name="LostCommitted">
-        <part name="parameters" element="tns:LostCommitted" />
-    </message>
-    <message name="Response">
-        <part name="parameters" element="tns:Response" />
-    </message>
-    <portType name="InitiatorPortType">
-        <operation name="Response">
-            <input name="Response" message="tns:Response" />
-        </operation>
-    </portType>
-    <portType name="ParticipantPortType">
-        <operation name="CompletionCommit"><!-- Scenario 1.1 -->
-            <input name="CompletionCommit" message="tns:CompletionCommit" />
-        </operation>
-        <operation name="CompletionRollback"><!-- Scenario 1.2 -->
-            <input name="CompletionRollback" message="tns:CompletionRollback" />
-        </operation>
-        <operation name="Commit"><!-- Scenario 2.1 -->
-            <input name="Commit" message="tns:Commit" />
-        </operation>
-        <operation name="Rollback"><!-- Scenario 2.2 -->
-            <input name="Rollback" message="tns:Rollback" />
-        </operation>
-        <operation name="Phase2Rollback"><!-- Scenario 3.1 -->
-            <input name="Phase2Rollback" message="tns:Phase2Rollback" />
-        </operation>
-        <operation name="Readonly"><!-- Scenario 3.2 -->
-            <input name="Readonly" message="tns:Readonly" />
-        </operation>
-        <operation name="VolatileAndDurable"><!-- Scenario 3.3 -->
-            <input name="VolatileAndDurable" message="tns:VolatileAndDurable" />
-        </operation>
-        <operation name="EarlyReadonly"><!-- Scenario 4.1 -->
-            <input name="EarlyReadonly" message="tns:EarlyReadonly" />
-        </operation>
-        <operation name="EarlyAborted"><!-- Scenario 4.2 -->
-            <input name="EarlyAborted" message="tns:EarlyAborted" />
-        </operation>
-        <operation name="ReplayCommit"><!-- Scenario 5.1 -->
-            <input name="ReplayCommit" message="tns:ReplayCommit" />
-        </operation>
-        <operation name="RetryPreparedCommit"><!-- Scenario 5.2 -->
-            <input name="RetryPreparedCommit" message="tns:RetryPreparedCommit" />
-        </operation>
-        <operation name="RetryPreparedAbort"><!-- Scenario 5.3 -->
-            <input name="RetryPreparedAbort" message="tns:RetryPreparedAbort" />
-        </operation>
-        <operation name="RetryCommit"><!-- Scenario 5.4 -->
-            <input name="RetryCommit" message="tns:RetryCommit" />
-        </operation>
-        <operation name="PreparedAfterTimeout"><!-- Scenario 5.5 -->
-            <input name="PreparedAfterTimeout" message="tns:PreparedAfterTimeout" />
-        </operation>
-        <operation name="LostCommitted"><!-- Scenario 5.6 -->
-            <input name="LostCommitted" message="tns:LostCommitted" />
-        </operation>
-    </portType>
-</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat.wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat.wsdl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat.wsdl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopat.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<definitions
+        xmlns:s="http://www.w3.org/2001/XMLSchema"
+        xmlns:tns="http://fabrikam123.com"
+        targetNamespace="http://fabrikam123.com"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <types>
+         <s:schema elementFormDefault="qualified" targetNamespace="http://fabrikam123.com">
+             <s:complexType name="TestMessageType">
+                 <s:sequence />
+             </s:complexType>
+             <s:element name="Response" type="tns:TestMessageType" />
+             <s:element name="CompletionCommit" type="s:string" />
+             <s:element name="CompletionRollback" type="s:string" />
+             <s:element name="Commit" type="tns:TestMessageType" />
+             <s:element name="Rollback" type="tns:TestMessageType" />
+             <s:element name="Phase2Rollback" type="tns:TestMessageType" />
+             <s:element name="Readonly" type="tns:TestMessageType" />
+             <s:element name="VolatileAndDurable" type="tns:TestMessageType" />
+             <s:element name="EarlyReadonly" type="tns:TestMessageType" />
+             <s:element name="EarlyAborted" type="tns:TestMessageType" />
+             <s:element name="ReplayCommit" type="tns:TestMessageType" />
+             <s:element name="RetryPreparedCommit" type="tns:TestMessageType" />
+             <s:element name="RetryPreparedAbort" type="tns:TestMessageType" />
+             <s:element name="RetryCommit" type="tns:TestMessageType" />
+             <s:element name="PreparedAfterTimeout" type="tns:TestMessageType" />
+             <s:element name="LostCommitted" type="tns:TestMessageType" />
+         </s:schema>
+    </types>
+    <message name="CompletionCommit">
+         <part name="parameters" element="tns:CompletionCommit" />
+    </message>
+    <message name="CompletionRollback">
+         <part name="parameters" element="tns:CompletionRollback" />
+    </message>
+    <message name="Commit">
+         <part name="parameters" element="tns:Commit" />
+    </message>
+    <message name="Rollback">
+         <part name="parameters" element="tns:Rollback" />
+    </message>
+    <message name="Phase2Rollback">
+         <part name="parameters" element="tns:Phase2Rollback" />
+    </message>
+    <message name="Readonly">
+         <part name="parameters" element="tns:Readonly" />
+    </message>
+    <message name="VolatileAndDurable">
+         <part name="parameters" element="tns:VolatileAndDurable" />
+    </message>
+    <message name="EarlyReadonly">
+         <part name="parameters" element="tns:EarlyReadonly" />
+    </message>
+    <message name="EarlyAborted">
+         <part name="parameters" element="tns:EarlyAborted" />
+    </message>
+    <message name="ReplayCommit">
+         <part name="parameters" element="tns:ReplayCommit" />
+    </message>
+    <message name="RetryPreparedCommit">
+         <part name="parameters" element="tns:RetryPreparedCommit" />
+    </message>
+    <message name="RetryPreparedAbort">
+         <part name="parameters" element="tns:RetryPreparedAbort" />
+    </message>
+    <message name="RetryCommit">
+         <part name="parameters" element="tns:RetryCommit" />
+    </message>
+    <message name="PreparedAfterTimeout">
+         <part name="parameters" element="tns:PreparedAfterTimeout" />
+    </message>
+    <message name="LostCommitted">
+        <part name="parameters" element="tns:LostCommitted" />
+    </message>
+    <message name="Response">
+        <part name="parameters" element="tns:Response" />
+    </message>
+    <portType name="InitiatorPortType">
+        <operation name="Response">
+            <input name="Response" message="tns:Response" />
+        </operation>
+    </portType>
+    <portType name="ParticipantPortType">
+        <operation name="CompletionCommit"><!-- Scenario 1.1 -->
+            <input name="CompletionCommit" message="tns:CompletionCommit" />
+        </operation>
+        <operation name="CompletionRollback"><!-- Scenario 1.2 -->
+            <input name="CompletionRollback" message="tns:CompletionRollback" />
+        </operation>
+        <operation name="Commit"><!-- Scenario 2.1 -->
+            <input name="Commit" message="tns:Commit" />
+        </operation>
+        <operation name="Rollback"><!-- Scenario 2.2 -->
+            <input name="Rollback" message="tns:Rollback" />
+        </operation>
+        <operation name="Phase2Rollback"><!-- Scenario 3.1 -->
+            <input name="Phase2Rollback" message="tns:Phase2Rollback" />
+        </operation>
+        <operation name="Readonly"><!-- Scenario 3.2 -->
+            <input name="Readonly" message="tns:Readonly" />
+        </operation>
+        <operation name="VolatileAndDurable"><!-- Scenario 3.3 -->
+            <input name="VolatileAndDurable" message="tns:VolatileAndDurable" />
+        </operation>
+        <operation name="EarlyReadonly"><!-- Scenario 4.1 -->
+            <input name="EarlyReadonly" message="tns:EarlyReadonly" />
+        </operation>
+        <operation name="EarlyAborted"><!-- Scenario 4.2 -->
+            <input name="EarlyAborted" message="tns:EarlyAborted" />
+        </operation>
+        <operation name="ReplayCommit"><!-- Scenario 5.1 -->
+            <input name="ReplayCommit" message="tns:ReplayCommit" />
+        </operation>
+        <operation name="RetryPreparedCommit"><!-- Scenario 5.2 -->
+            <input name="RetryPreparedCommit" message="tns:RetryPreparedCommit" />
+        </operation>
+        <operation name="RetryPreparedAbort"><!-- Scenario 5.3 -->
+            <input name="RetryPreparedAbort" message="tns:RetryPreparedAbort" />
+        </operation>
+        <operation name="RetryCommit"><!-- Scenario 5.4 -->
+            <input name="RetryCommit" message="tns:RetryCommit" />
+        </operation>
+        <operation name="PreparedAfterTimeout"><!-- Scenario 5.5 -->
+            <input name="PreparedAfterTimeout" message="tns:PreparedAfterTimeout" />
+        </operation>
+        <operation name="LostCommitted"><!-- Scenario 5.6 -->
+            <input name="LostCommitted" message="tns:LostCommitted" />
+        </operation>
+    </portType>
+</definitions>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-binding.wsdl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions
-        xmlns:s="http://www.w3.org/2001/XMLSchema"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
-        xmlns:tns="http://fabrikam123.com/wsba"
-        targetNamespace="http://fabrikam123.com/wsba"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-    <import
-       namespace="http://fabrikam123.com/wsba"
-       location="interopba.wsdl"/>
-
-    <binding name="Initiator_SOAPBinding" type="tns:InitiatorPortType">
-      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-      <operation name="Response">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/Response"/>
-        <input message="tns:Response">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-    </binding>
-
-    <binding name="Participant_SOAPBinding" type="tns:ParticipantPortType">
-      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-      <operation name="Cancel">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/Cancel"/>
-        <input message="tns:Cancel">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Exit">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/Exit"/>
-        <input message="tns:Exit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Fail">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/Fail"/>
-        <input message="tns:Fail">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="CannotComplete">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/CannotComplete"/>
-        <input message="tns:CannotComplete">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="ParticipantCompleteClose">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/ParticipantCompleteClose"/>
-        <input message="tns:ParticipantCompleteClose">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="CoordinatorCompleteClose">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/CoordinatorCompleteClose"/>
-        <input message="tns:CoordinatorCompleteClose">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="UnsolicitedComplete">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/UnsolicitedComplete"/>
-        <input message="tns:UnsolicitedComplete">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Compensate">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/Compensate"/>
-        <input message="tns:Compensate">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="CompensationFail">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/CompensationFail"/>
-        <input message="tns:CompensationFail">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="ParticipantCancelCompletedRace">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/ParticipantCancelCompletedRace"/>
-        <input message="tns:ParticipantCancelCompletedRace">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="MessageLossAndRecovery">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/MessageLossAndRecovery"/>
-        <input message="tns:MessageLossAndRecovery">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="MixedOutcome">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/MixedOutcome"/>
-        <input message="tns:MixedOutcome">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-    </binding>
-
-    <service name="InteropService">
-      <port binding="tns:Initiator_SOAPBinding" name="InitiatorPortType">
-	<wsaw:UsingAddressing required="true"/>
-	<soap:address location="http://localhost:9000/interopba/InteropService"/>
-      </port>
-      <port binding="tns:Participant_SOAPBinding" name="ParticipantPortType">
-	<wsaw:UsingAddressing required="true"/>
-	<soap:address location="http://localhost:9000/interopba/ParticipantService"/>
-      </port>
-    </service>
-
-</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-binding.wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-binding.wsdl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-binding.wsdl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<definitions
+        xmlns:s="http://www.w3.org/2001/XMLSchema"
+        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
+        xmlns:tns="http://fabrikam123.com/wsba"
+        targetNamespace="http://fabrikam123.com/wsba"
+        xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <import
+       namespace="http://fabrikam123.com/wsba"
+       location="interopba.wsdl"/>
+
+    <binding name="Initiator_SOAPBinding" type="tns:InitiatorPortType">
+      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+      <operation name="Response">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/Response"/>
+        <input message="tns:Response">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+    </binding>
+
+    <binding name="Participant_SOAPBinding" type="tns:ParticipantPortType">
+      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+      <operation name="Cancel">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/Cancel"/>
+        <input message="tns:Cancel">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Exit">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/Exit"/>
+        <input message="tns:Exit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Fail">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/Fail"/>
+        <input message="tns:Fail">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="CannotComplete">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/CannotComplete"/>
+        <input message="tns:CannotComplete">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="ParticipantCompleteClose">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/ParticipantCompleteClose"/>
+        <input message="tns:ParticipantCompleteClose">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="CoordinatorCompleteClose">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/CoordinatorCompleteClose"/>
+        <input message="tns:CoordinatorCompleteClose">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="UnsolicitedComplete">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/UnsolicitedComplete"/>
+        <input message="tns:UnsolicitedComplete">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Compensate">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/Compensate"/>
+        <input message="tns:Compensate">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="CompensationFail">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/CompensationFail"/>
+        <input message="tns:CompensationFail">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="ParticipantCancelCompletedRace">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/ParticipantCancelCompletedRace"/>
+        <input message="tns:ParticipantCancelCompletedRace">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="MessageLossAndRecovery">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/MessageLossAndRecovery"/>
+        <input message="tns:MessageLossAndRecovery">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="MixedOutcome">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/MixedOutcome"/>
+        <input message="tns:MixedOutcome">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+    </binding>
+
+    <service name="InteropService">
+      <port binding="tns:Initiator_SOAPBinding" name="InitiatorPortType">
+	<wsaw:UsingAddressing required="true"/>
+	<soap:address location="http://localhost:9000/interopba/InteropService"/>
+      </port>
+      <port binding="tns:Participant_SOAPBinding" name="ParticipantPortType">
+	<wsaw:UsingAddressing required="true"/>
+	<soap:address location="http://localhost:9000/interopba/ParticipantService"/>
+      </port>
+    </service>
+
+</definitions>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-initiator-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-initiator-binding.wsdl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-initiator-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions
-        xmlns:s="http://www.w3.org/2001/XMLSchema"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
-        xmlns:tns="http://fabrikam123.com/wsba"
-        targetNamespace="http://fabrikam123.com/wsba"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-    <import
-       namespace="http://fabrikam123.com/wsba"
-       location="interopba.wsdl"/>
-
-    <binding name="Initiator_SOAPBinding" type="tns:InitiatorPortType">
-      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-      <operation name="Response">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/Response"/>
-        <input message="tns:Response">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-    </binding>
-
-    <service name="InitiatorService">
-      <port binding="tns:Initiator_SOAPBinding" name="InitiatorPortType">
-	<wsaw:UsingAddressing required="true"/>
-	<soap:address location="http://localhost:9000/interopba/InitiatorService"/>
-      </port>
-    </service>
-
-</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-initiator-binding.wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-initiator-binding.wsdl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-initiator-binding.wsdl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-initiator-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<definitions
+        xmlns:s="http://www.w3.org/2001/XMLSchema"
+        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
+        xmlns:tns="http://fabrikam123.com/wsba"
+        targetNamespace="http://fabrikam123.com/wsba"
+        xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <import
+       namespace="http://fabrikam123.com/wsba"
+       location="interopba.wsdl"/>
+
+    <binding name="Initiator_SOAPBinding" type="tns:InitiatorPortType">
+      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+      <operation name="Response">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/Response"/>
+        <input message="tns:Response">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+    </binding>
+
+    <service name="InitiatorService">
+      <port binding="tns:Initiator_SOAPBinding" name="InitiatorPortType">
+	<wsaw:UsingAddressing required="true"/>
+	<soap:address location="http://localhost:9000/interopba/InitiatorService"/>
+      </port>
+    </service>
+
+</definitions>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-participant-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-participant-binding.wsdl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-participant-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions
-        xmlns:s="http://www.w3.org/2001/XMLSchema"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
-        xmlns:tns="http://fabrikam123.com/wsba"
-        targetNamespace="http://fabrikam123.com/wsba"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-    <import
-       namespace="http://fabrikam123.com/wsba"
-       location="interopba.wsdl"/>
-
-    <binding name="Participant_SOAPBinding" type="tns:ParticipantPortType">
-      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-      <operation name="Cancel">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/Cancel"/>
-        <input message="tns:Cancel">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Exit">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/Exit"/>
-        <input message="tns:Exit">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Fail">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/Fail"/>
-        <input message="tns:Fail">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="CannotComplete">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/CannotComplete"/>
-        <input message="tns:CannotComplete">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="ParticipantCompleteClose">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/ParticipantCompleteClose"/>
-        <input message="tns:ParticipantCompleteClose">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="CoordinatorCompleteClose">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/CoordinatorCompleteClose"/>
-        <input message="tns:CoordinatorCompleteClose">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="UnsolicitedComplete">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/UnsolicitedComplete"/>
-        <input message="tns:UnsolicitedComplete">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="Compensate">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/Compensate"/>
-        <input message="tns:Compensate">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="CompensationFail">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/CompensationFail"/>
-        <input message="tns:CompensationFail">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="ParticipantCancelCompletedRace">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/ParticipantCancelCompletedRace"/>
-        <input message="tns:ParticipantCancelCompletedRace">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="MessageLossAndRecovery">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/MessageLossAndRecovery"/>
-        <input message="tns:MessageLossAndRecovery">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-      <operation name="MixedOutcome">
-        <soap:operation soapAction="http://fabrikam123.com/wsba/MixedOutcome"/>
-        <input message="tns:MixedOutcome">
-          <soap:body use="literal"/>
-        </input>
-      </operation>
-    </binding>
-
-    <service name="ParticipantService">
-      <port binding="tns:Participant_SOAPBinding" name="ParticipantPortType">
-	<wsaw:UsingAddressing required="true"/>
-	<soap:address location="http://localhost:9000/interopba/ParticipantService"/>
-      </port>
-    </service>
-
-</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-participant-binding.wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-participant-binding.wsdl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-participant-binding.wsdl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba-participant-binding.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<definitions
+        xmlns:s="http://www.w3.org/2001/XMLSchema"
+        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+        xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
+        xmlns:tns="http://fabrikam123.com/wsba"
+        targetNamespace="http://fabrikam123.com/wsba"
+        xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <import
+       namespace="http://fabrikam123.com/wsba"
+       location="interopba.wsdl"/>
+
+    <binding name="Participant_SOAPBinding" type="tns:ParticipantPortType">
+      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+      <operation name="Cancel">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/Cancel"/>
+        <input message="tns:Cancel">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Exit">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/Exit"/>
+        <input message="tns:Exit">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Fail">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/Fail"/>
+        <input message="tns:Fail">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="CannotComplete">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/CannotComplete"/>
+        <input message="tns:CannotComplete">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="ParticipantCompleteClose">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/ParticipantCompleteClose"/>
+        <input message="tns:ParticipantCompleteClose">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="CoordinatorCompleteClose">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/CoordinatorCompleteClose"/>
+        <input message="tns:CoordinatorCompleteClose">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="UnsolicitedComplete">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/UnsolicitedComplete"/>
+        <input message="tns:UnsolicitedComplete">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="Compensate">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/Compensate"/>
+        <input message="tns:Compensate">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="CompensationFail">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/CompensationFail"/>
+        <input message="tns:CompensationFail">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="ParticipantCancelCompletedRace">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/ParticipantCancelCompletedRace"/>
+        <input message="tns:ParticipantCancelCompletedRace">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="MessageLossAndRecovery">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/MessageLossAndRecovery"/>
+        <input message="tns:MessageLossAndRecovery">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+      <operation name="MixedOutcome">
+        <soap:operation soapAction="http://fabrikam123.com/wsba/MixedOutcome"/>
+        <input message="tns:MixedOutcome">
+          <soap:body use="literal"/>
+        </input>
+      </operation>
+    </binding>
+
+    <service name="ParticipantService">
+      <port binding="tns:Participant_SOAPBinding" name="ParticipantPortType">
+	<wsaw:UsingAddressing required="true"/>
+	<soap:address location="http://localhost:9000/interopba/ParticipantService"/>
+      </port>
+    </service>
+
+</definitions>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba.wsdl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions 
-    xmlns:s="http://www.w3.org/2001/XMLSchema" 
-    xmlns:tns="http://fabrikam123.com/wsba" 
-    targetNamespace="http://fabrikam123.com/wsba"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <types>
-    <s:schema elementFormDefault="qualified" 
-        targetNamespace="http://fabrikam123.com/wsba">
-      <s:complexType name="TestMessageType">
-        <s:sequence />
-      </s:complexType>
-      <s:element name="Response" type="tns:TestMessageType" />
-      <s:element name="Cancel" type="tns:TestMessageType" /> 
-      <s:element name="Exit" type="tns:TestMessageType" /> 
-      <s:element name="Fail" type="tns:TestMessageType" /> 
-      <s:element name="CannotComplete" type="tns:TestMessageType" /> 
-      <s:element name="ParticipantCompleteClose" type="tns:TestMessageType" /> 
-      <s:element name="CoordinatorCompleteClose" type="tns:TestMessageType" /> 
-      <s:element name="UnsolicitedComplete" type="tns:TestMessageType" /> 
-      <s:element name="Compensate" type="tns:TestMessageType" /> 
-      <s:element name="CompensationFail" type="tns:TestMessageType" /> 
-      <s:element name="ParticipantCancelCompletedRace" type="tns:TestMessageType" /> 
-      <s:element name="MessageLossAndRecovery" type="tns:TestMessageType" /> 
-      <s:element name="MixedOutcome" type="tns:TestMessageType" /> 
-    </s:schema>
-  </types>
-  <message name="Response">
-    <part name="parameters" element="tns:Response" />
-  </message>
-  <message name="Cancel">
-    <part name="parameters" element="tns:Cancel" />
-  </message>
-  <message name="Exit">
-    <part name="parameters" element="tns:Exit" />
-  </message>
-  <message name="Fail">
-    <part name="parameters" element="tns:Fail" />
-  </message>
-  <message name="CannotComplete">
-    <part name="parameters" element="tns:CannotComplete" />
-  </message>
-  <message name="ParticipantCompleteClose">
-    <part name="parameters" element="tns:ParticipantCompleteClose" />
-  </message>
-  <message name="CoordinatorCompleteClose">
-    <part name="parameters" element="tns:CoordinatorCompleteClose" />
-  </message>
-  <message name="UnsolicitedComplete">
-    <part name="parameters" element="tns:UnsolicitedComplete" />
-  </message>
-  <message name="Compensate">
-    <part name="parameters" element="tns:Compensate" />
-  </message>
-  <message name="CompensationFail">
-    <part name="parameters" element="tns:CompensationFail" />
-  </message>
-  <message name="ParticipantCancelCompletedRace">
-    <part name="parameters" element="tns:ParticipantCancelCompletedRace" />
-  </message>
-  <message name="MessageLossAndRecovery">
-    <part name="parameters" element="tns:MessageLossAndRecovery" />
-  </message>
-  <message name="MixedOutcome">
-    <part name="parameters" element="tns:MixedOutcome" />
-  </message>
-  <portType name="InitiatorPortType">
-    <operation name="Response">
-      <input name="Response" message="tns:Response" />
-    </operation>
-  </portType>
-  <portType name="ParticipantPortType">
-    <operation name="Cancel"> <!-- Scenario 1.1 -->
-      <input name="Cancel" message="tns:Cancel" />
-    </operation>
-    <operation name="Exit"> <!-- Scenario 1.2 -->
-      <input name="Exit" message="tns:Exit" />
-    </operation>
-    <operation name="Fail"> <!-- Scenario 1.3 -->
-      <input name="Fail" message="tns:Fail" />
-    </operation>
-    <operation name="CannotComplete"> <!-- Scenario 1.4 -->
-      <input name="CannotComplete" message="tns:CannotComplete" />
-    </operation>
-    <operation name="ParticipantCompleteClose"> <!-- Scenario 1.5 -->
-      <input name="ParticipantCompleteClose"
-             message="tns:ParticipantCompleteClose" />
-    </operation>
-    <operation name="CoordinatorCompleteClose"> <!-- Scenario 1.6 -->
-      <input name="CoordinatorCompleteClose"
-             message="tns:CoordinatorCompleteClose" />
-    </operation>
-    <operation name="UnsolicitedComplete"> <!-- Scenario 1.7 -->
-      <input name="UnsolicitedComplete" message="tns:UnsolicitedComplete" />
-    </operation>
-    <operation name="Compensate"> <!-- Scenario 1.8 -->
-      <input name="Compensate" message="tns:Compensate" />
-    </operation>
-    <operation name="CompensationFail"> <!-- Scenario 1.9 -->
-      <input name="CompensationFail"
-             message="tns:CompensationFail" />
-    </operation>
-    <operation name="ParticipantCancelCompletedRace"> <!-- Scenario 1.10 -->
-      <input name="ParticipantCancelCompletedRace"
-             message="tns:ParticipantCancelCompletedRace" />
-    </operation>
-    <operation name="MessageLossAndRecovery"> <!-- Scenario 1.11 -->
-      <input name="MessageLossAndRecovery" message="tns:MessageLossAndRecovery" />
-    </operation>
-    <operation name="MixedOutcome"> <!-- Scenario 1.12 -->
-      <input name="MixedOutcome" message="tns:MixedOutcome" />
-    </operation>
-  </portType>
-</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba.wsdl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba.wsdl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba.wsdl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/dd/interop11/wsdl/interopba.wsdl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<definitions 
+    xmlns:s="http://www.w3.org/2001/XMLSchema" 
+    xmlns:tns="http://fabrikam123.com/wsba" 
+    targetNamespace="http://fabrikam123.com/wsba"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <s:schema elementFormDefault="qualified" 
+        targetNamespace="http://fabrikam123.com/wsba">
+      <s:complexType name="TestMessageType">
+        <s:sequence />
+      </s:complexType>
+      <s:element name="Response" type="tns:TestMessageType" />
+      <s:element name="Cancel" type="tns:TestMessageType" /> 
+      <s:element name="Exit" type="tns:TestMessageType" /> 
+      <s:element name="Fail" type="tns:TestMessageType" /> 
+      <s:element name="CannotComplete" type="tns:TestMessageType" /> 
+      <s:element name="ParticipantCompleteClose" type="tns:TestMessageType" /> 
+      <s:element name="CoordinatorCompleteClose" type="tns:TestMessageType" /> 
+      <s:element name="UnsolicitedComplete" type="tns:TestMessageType" /> 
+      <s:element name="Compensate" type="tns:TestMessageType" /> 
+      <s:element name="CompensationFail" type="tns:TestMessageType" /> 
+      <s:element name="ParticipantCancelCompletedRace" type="tns:TestMessageType" /> 
+      <s:element name="MessageLossAndRecovery" type="tns:TestMessageType" /> 
+      <s:element name="MixedOutcome" type="tns:TestMessageType" /> 
+    </s:schema>
+  </types>
+  <message name="Response">
+    <part name="parameters" element="tns:Response" />
+  </message>
+  <message name="Cancel">
+    <part name="parameters" element="tns:Cancel" />
+  </message>
+  <message name="Exit">
+    <part name="parameters" element="tns:Exit" />
+  </message>
+  <message name="Fail">
+    <part name="parameters" element="tns:Fail" />
+  </message>
+  <message name="CannotComplete">
+    <part name="parameters" element="tns:CannotComplete" />
+  </message>
+  <message name="ParticipantCompleteClose">
+    <part name="parameters" element="tns:ParticipantCompleteClose" />
+  </message>
+  <message name="CoordinatorCompleteClose">
+    <part name="parameters" element="tns:CoordinatorCompleteClose" />
+  </message>
+  <message name="UnsolicitedComplete">
+    <part name="parameters" element="tns:UnsolicitedComplete" />
+  </message>
+  <message name="Compensate">
+    <part name="parameters" element="tns:Compensate" />
+  </message>
+  <message name="CompensationFail">
+    <part name="parameters" element="tns:CompensationFail" />
+  </message>
+  <message name="ParticipantCancelCompletedRace">
+    <part name="parameters" element="tns:ParticipantCancelCompletedRace" />
+  </message>
+  <message name="MessageLossAndRecovery">
+    <part name="parameters" element="tns:MessageLossAndRecovery" />
+  </message>
+  <message name="MixedOutcome">
+    <part name="parameters" element="tns:MixedOutcome" />
+  </message>
+  <portType name="InitiatorPortType">
+    <operation name="Response">
+      <input name="Response" message="tns:Response" />
+    </operation>
+  </portType>
+  <portType name="ParticipantPortType">
+    <operation name="Cancel"> <!-- Scenario 1.1 -->
+      <input name="Cancel" message="tns:Cancel" />
+    </operation>
+    <operation name="Exit"> <!-- Scenario 1.2 -->
+      <input name="Exit" message="tns:Exit" />
+    </operation>
+    <operation name="Fail"> <!-- Scenario 1.3 -->
+      <input name="Fail" message="tns:Fail" />
+    </operation>
+    <operation name="CannotComplete"> <!-- Scenario 1.4 -->
+      <input name="CannotComplete" message="tns:CannotComplete" />
+    </operation>
+    <operation name="ParticipantCompleteClose"> <!-- Scenario 1.5 -->
+      <input name="ParticipantCompleteClose"
+             message="tns:ParticipantCompleteClose" />
+    </operation>
+    <operation name="CoordinatorCompleteClose"> <!-- Scenario 1.6 -->
+      <input name="CoordinatorCompleteClose"
+             message="tns:CoordinatorCompleteClose" />
+    </operation>
+    <operation name="UnsolicitedComplete"> <!-- Scenario 1.7 -->
+      <input name="UnsolicitedComplete" message="tns:UnsolicitedComplete" />
+    </operation>
+    <operation name="Compensate"> <!-- Scenario 1.8 -->
+      <input name="Compensate" message="tns:Compensate" />
+    </operation>
+    <operation name="CompensationFail"> <!-- Scenario 1.9 -->
+      <input name="CompensationFail"
+             message="tns:CompensationFail" />
+    </operation>
+    <operation name="ParticipantCancelCompletedRace"> <!-- Scenario 1.10 -->
+      <input name="ParticipantCancelCompletedRace"
+             message="tns:ParticipantCancelCompletedRace" />
+    </operation>
+    <operation name="MessageLossAndRecovery"> <!-- Scenario 1.11 -->
+      <input name="MessageLossAndRecovery" message="tns:MessageLossAndRecovery" />
+    </operation>
+    <operation name="MixedOutcome"> <!-- Scenario 1.12 -->
+      <input name="MixedOutcome" message="tns:MixedOutcome" />
+    </operation>
+  </portType>
+</definitions>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/lib)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/commons-logging.jar
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/commons-logging.jar (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/lib/commons-logging.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/jaxrpc.jar
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/jaxrpc.jar (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/lib/jaxrpc.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/junit.jar
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/junit.jar (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/lib/junit.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/saaj-api.jar
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/saaj-api.jar (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/lib/saaj-api.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/saxon.jar
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/lib/saxon.jar (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/lib/saxon.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/ATTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/ATTestCase.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/ATTestCase.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,520 +0,0 @@
-package com.jboss.transaction.txinterop.interop;
-
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wscoor.CoordinationConstants;
-import com.arjuna.webservices11.ServiceRegistry;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wst.CompletionCoordinatorParticipant;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.TransactionRolledBackException;
-import com.jboss.transaction.txinterop.interop.states.ATInteropPreparedAfterTimeoutState;
-import com.jboss.transaction.txinterop.interop.states.ATInteropRetryPreparedAbortState;
-import com.jboss.transaction.txinterop.interop.states.ATInteropRetryPreparedCommitState;
-import com.jboss.transaction.txinterop.interop.states.InteropWaitState;
-import com.jboss.transaction.txinterop.proxy.ProxyConversation;
-import com.jboss.transaction.txinterop.proxy.ProxyURIRewriting;
-import com.jboss.transaction.txinterop.webservices.InteropConstants;
-import com.jboss.transaction.txinterop.webservices.atinterop.AsyncParticipantStub;
-import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropUtil;
-import com.jboss.transaction.txinterop.webservices.atinterop.ParticipantStub;
-import com.jboss.transaction.txinterop.webservices.atinterop.SyncParticipantStub;
-
-/**
- * The AT endpoint test case
- * @author kevin
- */
-public class ATTestCase extends InteropTestCase
-{
-    /**
-     * The coordinator URI of the source.
-     */
-    private static final String SOURCE_COORDINATOR_URI ;
-    /**
-     * The service URI of the participant.
-     */
-    private static final String SOURCE_PARTICIPANT_URI ;
-    
-    /**
-     * Construct the named test case.
-     */
-    public ATTestCase()
-    {
-        // Default the service to the local service.
-        setParticipantURI(getSourceParticipantURI()) ;
-        setTestTimeout(120000) ;
-        setAsyncTest(true) ;
-    }
-
-    /**
-     * testAT1_1 - 1.1 CompletionCommit
-     * Participant creates and commits a transaction using the initiator's coordinator.
-     * @throws Exception on failure.
-     */
-    public void testAT1_1()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final String coordinatorURI = ProxyURIRewriting.rewriteURI(ProxyConversation.getAlternateConversationId(conversationId), getSourceCoordinatorURI()) ;
-            getParticipantStub().completionCommit(serviceURI, coordinatorURI) ;
-            state.waitForCompletion(getTestTimeout()) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT1_2 - 1.2 CompletionRollback
-     * Participant creates and rolls back a transaction using the initiator's coordinator.
-     * @throws Exception on failure.
-     */
-    public void testAT1_2()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final String coordinatorURI = ProxyURIRewriting.rewriteURI(ProxyConversation.getAlternateConversationId(conversationId), getSourceCoordinatorURI()) ;
-            getParticipantStub().completionRollback(serviceURI, coordinatorURI) ;
-            state.waitForCompletion(getTestTimeout()) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT2_1 - 2.1 Commit
-     * Participant registers for Durable2PC, initiator commits, transaction commits successfully.
-     * @throws Exception on failure.
-     */
-    public void testAT2_1()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().commit(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT2_2 - 2.2 Rollback
-     * Participant registers for Durable2PC, initiator rolls back.
-     * @throws Exception on failure.
-     */
-    public void testAT2_2()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().rollback(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.rollback() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT3_1 - 3.1 Phase2Rollback
-     * Coordinator aborts the transaction due to an Aborted vote during the prepare phase. 
-     * @throws Exception on failure.
-     */
-    public void testAT3_1()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED, 2) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().phase2Rollback(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            fail("Transaction rollback expected") ;
-        }
-        catch (final TransactionRolledBackException trbe)
-        {
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT3_2 - 3.2 Readonly
-     * Tests coordinator committing a transaction with a read only participant. 
-     * @throws Exception on failure.
-     */
-    public void testAT3_2()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().readonly(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT3_3 - 3.3 VolatileAndDurable
-     * Tests registration during the volatile prepare phase. 
-     * @throws Exception on failure.
-     */
-    public void testAT3_3()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().volatileAndDurable(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT4_1 - 4.1 EarlyReadonly
-     * Tests the case of a participant initiated ReadOnly message occurring prior to the prepare phase. 
-     * @throws Exception on failure.
-     */
-    public void testAT4_1()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().earlyReadonly(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT4_2 - 4.2 EarlyAborted
-     * Tests the case of a participant initiated Aborted message occurring prior to the prepare phase. 
-     * @throws Exception on failure.
-     */
-    public void testAT4_2()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED, 2) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().earlyAborted(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            fail("Transaction rollback expected") ;
-        }
-        catch (final TransactionRolledBackException trbe)
-        {
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT5_1 - 5.1 ReplayCommit
-     * Participant registers for Durable2PC, initator initiates commit, participant fails after prepared, recovers and resends prepared. Transaction commits normally.
-     * @throws Exception on failure.
-     */
-    public void testAT5_1()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().replayCommit(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT5_2 - 5.2 RetryPreparedCommit
-     * Tests recovery from a communication failure during the prepare phase. Transaction commits normally.
-     * @throws Exception on failure.
-     */
-    public void testAT5_2()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final ATInteropRetryPreparedCommitState state = new ATInteropRetryPreparedCommitState() ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().retryPreparedCommit(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT5_3 - 5.3 RetryPreparedAbort
-     * Tests recovery from a communication failure during the prepare phase. Transaction times out.
-     * @throws Exception on failure.
-     */
-    public void testAT5_3()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final ATInteropRetryPreparedAbortState state = new ATInteropRetryPreparedAbortState() ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().retryPreparedAbort(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            fail("Transaction rollback expected") ;
-        }
-        catch (final TransactionRolledBackException trbe)
-        {
-            state.waitForCompletion(getTestTimeout()) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT5_4 - 5.4 RetryCommit
-     * Tests recovery from a communication failure during the commit phase. Transaction commits normally.
-     * @throws Exception on failure.
-     */
-    public void testAT5_4()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().retryCommit(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT5_5 - 5.5 PreparedAfterTimeout
-     * Tests recovery from a communication failure during the prepare phase. Transaction times out. Two participants, volatile and durable.
-     * @throws Exception on failure.
-     */
-    public void testAT5_5()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final ATInteropPreparedAfterTimeoutState state = new ATInteropPreparedAfterTimeoutState() ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().preparedAfterTimeout(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            fail("Transaction rollback expected") ;
-        }
-        catch (final TransactionRolledBackException tre)
-        {
-            state.waitForCompletion(getTestTimeout()) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testAT5_6 - 5.6 LostCommitted
-     * Tests the effect of a lost Committed message.
-     * @throws Exception on failure.
-     */
-    public void testAT5_6()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().lostCommitted(serviceURI, context) ;
-            
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-    
-    /**
-     * Get the source coordinator URI.
-     * @return The source coordinator uri.
-     */
-    protected static String getSourceCoordinatorURI()
-    {
-        return SOURCE_COORDINATOR_URI ;
-    }
-    
-    /**
-     * Get the source participant URI.
-     * @return The source participant uri.
-     */
-    protected static String getSourceParticipantURI()
-    {
-        return SOURCE_PARTICIPANT_URI ;
-    }
-    
-    /**
-     * Get the participant stub for the test.
-     * @return The participant stub.
-     */
-    private ParticipantStub getParticipantStub()
-    {
-        return (getAsyncTest() ? AsyncParticipantStub.getParticipantStub() : SyncParticipantStub.getParticipantStub()) ;
-    }
-    
-    static
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        SOURCE_PARTICIPANT_URI = serviceRegistry.getServiceURI(InteropConstants.SERVICE_PARTICIPANT) ;
-        SOURCE_COORDINATOR_URI = serviceRegistry.getServiceURI(CoordinationConstants.ACTIVATION_SERVICE_NAME) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/ATTestCase.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/ATTestCase.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/ATTestCase.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/ATTestCase.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,540 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop;
+
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices11.wscoor.CoordinationConstants;
+import com.arjuna.webservices11.ServiceRegistry;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wst.CompletionCoordinatorParticipant;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.TransactionRolledBackException;
+import com.jboss.transaction.txinterop.interop.states.ATInteropPreparedAfterTimeoutState;
+import com.jboss.transaction.txinterop.interop.states.ATInteropRetryPreparedAbortState;
+import com.jboss.transaction.txinterop.interop.states.ATInteropRetryPreparedCommitState;
+import com.jboss.transaction.txinterop.interop.states.InteropWaitState;
+import com.jboss.transaction.txinterop.proxy.ProxyConversation;
+import com.jboss.transaction.txinterop.proxy.ProxyURIRewriting;
+import com.jboss.transaction.txinterop.webservices.InteropConstants;
+import com.jboss.transaction.txinterop.webservices.atinterop.AsyncParticipantStub;
+import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropUtil;
+import com.jboss.transaction.txinterop.webservices.atinterop.ParticipantStub;
+import com.jboss.transaction.txinterop.webservices.atinterop.SyncParticipantStub;
+
+/**
+ * The AT endpoint test case
+ * @author kevin
+ */
+public class ATTestCase extends InteropTestCase
+{
+    /**
+     * The coordinator URI of the source.
+     */
+    private static final String SOURCE_COORDINATOR_URI ;
+    /**
+     * The service URI of the participant.
+     */
+    private static final String SOURCE_PARTICIPANT_URI ;
+    
+    /**
+     * Construct the named test case.
+     */
+    public ATTestCase()
+    {
+        // Default the service to the local service.
+        setParticipantURI(getSourceParticipantURI()) ;
+        setTestTimeout(120000) ;
+        setAsyncTest(true) ;
+    }
+
+    /**
+     * testAT1_1 - 1.1 CompletionCommit
+     * Participant creates and commits a transaction using the initiator's coordinator.
+     * @throws Exception on failure.
+     */
+    public void testAT1_1()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final String coordinatorURI = ProxyURIRewriting.rewriteURI(ProxyConversation.getAlternateConversationId(conversationId), getSourceCoordinatorURI()) ;
+            getParticipantStub().completionCommit(serviceURI, coordinatorURI) ;
+            state.waitForCompletion(getTestTimeout()) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT1_2 - 1.2 CompletionRollback
+     * Participant creates and rolls back a transaction using the initiator's coordinator.
+     * @throws Exception on failure.
+     */
+    public void testAT1_2()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final String coordinatorURI = ProxyURIRewriting.rewriteURI(ProxyConversation.getAlternateConversationId(conversationId), getSourceCoordinatorURI()) ;
+            getParticipantStub().completionRollback(serviceURI, coordinatorURI) ;
+            state.waitForCompletion(getTestTimeout()) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT2_1 - 2.1 Commit
+     * Participant registers for Durable2PC, initiator commits, transaction commits successfully.
+     * @throws Exception on failure.
+     */
+    public void testAT2_1()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().commit(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT2_2 - 2.2 Rollback
+     * Participant registers for Durable2PC, initiator rolls back.
+     * @throws Exception on failure.
+     */
+    public void testAT2_2()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().rollback(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.rollback() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT3_1 - 3.1 Phase2Rollback
+     * Coordinator aborts the transaction due to an Aborted vote during the prepare phase. 
+     * @throws Exception on failure.
+     */
+    public void testAT3_1()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED, 2) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().phase2Rollback(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            fail("Transaction rollback expected") ;
+        }
+        catch (final TransactionRolledBackException trbe)
+        {
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT3_2 - 3.2 Readonly
+     * Tests coordinator committing a transaction with a read only participant. 
+     * @throws Exception on failure.
+     */
+    public void testAT3_2()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().readonly(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT3_3 - 3.3 VolatileAndDurable
+     * Tests registration during the volatile prepare phase. 
+     * @throws Exception on failure.
+     */
+    public void testAT3_3()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().volatileAndDurable(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT4_1 - 4.1 EarlyReadonly
+     * Tests the case of a participant initiated ReadOnly message occurring prior to the prepare phase. 
+     * @throws Exception on failure.
+     */
+    public void testAT4_1()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().earlyReadonly(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT4_2 - 4.2 EarlyAborted
+     * Tests the case of a participant initiated Aborted message occurring prior to the prepare phase. 
+     * @throws Exception on failure.
+     */
+    public void testAT4_2()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_ABORTED, 2) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().earlyAborted(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            fail("Transaction rollback expected") ;
+        }
+        catch (final TransactionRolledBackException trbe)
+        {
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT5_1 - 5.1 ReplayCommit
+     * Participant registers for Durable2PC, initator initiates commit, participant fails after prepared, recovers and resends prepared. Transaction commits normally.
+     * @throws Exception on failure.
+     */
+    public void testAT5_1()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().replayCommit(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT5_2 - 5.2 RetryPreparedCommit
+     * Tests recovery from a communication failure during the prepare phase. Transaction commits normally.
+     * @throws Exception on failure.
+     */
+    public void testAT5_2()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final ATInteropRetryPreparedCommitState state = new ATInteropRetryPreparedCommitState() ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().retryPreparedCommit(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT5_3 - 5.3 RetryPreparedAbort
+     * Tests recovery from a communication failure during the prepare phase. Transaction times out.
+     * @throws Exception on failure.
+     */
+    public void testAT5_3()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final ATInteropRetryPreparedAbortState state = new ATInteropRetryPreparedAbortState() ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().retryPreparedAbort(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            fail("Transaction rollback expected") ;
+        }
+        catch (final TransactionRolledBackException trbe)
+        {
+            state.waitForCompletion(getTestTimeout()) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT5_4 - 5.4 RetryCommit
+     * Tests recovery from a communication failure during the commit phase. Transaction commits normally.
+     * @throws Exception on failure.
+     */
+    public void testAT5_4()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().retryCommit(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT5_5 - 5.5 PreparedAfterTimeout
+     * Tests recovery from a communication failure during the prepare phase. Transaction times out. Two participants, volatile and durable.
+     * @throws Exception on failure.
+     */
+    public void testAT5_5()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final ATInteropPreparedAfterTimeoutState state = new ATInteropPreparedAfterTimeoutState() ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().preparedAfterTimeout(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            fail("Transaction rollback expected") ;
+        }
+        catch (final TransactionRolledBackException tre)
+        {
+            state.waitForCompletion(getTestTimeout()) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testAT5_6 - 5.6 LostCommitted
+     * Tests the effect of a lost Committed message.
+     * @throws Exception on failure.
+     */
+    public void testAT5_6()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(AtomicTransactionConstants.WSAT_ACTION_COMMITTED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().lostCommitted(serviceURI, context) ;
+            
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+    
+    /**
+     * Get the source coordinator URI.
+     * @return The source coordinator uri.
+     */
+    protected static String getSourceCoordinatorURI()
+    {
+        return SOURCE_COORDINATOR_URI ;
+    }
+    
+    /**
+     * Get the source participant URI.
+     * @return The source participant uri.
+     */
+    protected static String getSourceParticipantURI()
+    {
+        return SOURCE_PARTICIPANT_URI ;
+    }
+    
+    /**
+     * Get the participant stub for the test.
+     * @return The participant stub.
+     */
+    private ParticipantStub getParticipantStub()
+    {
+        return (getAsyncTest() ? AsyncParticipantStub.getParticipantStub() : SyncParticipantStub.getParticipantStub()) ;
+    }
+    
+    static
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        SOURCE_PARTICIPANT_URI = serviceRegistry.getServiceURI(InteropConstants.SERVICE_PARTICIPANT) ;
+        SOURCE_COORDINATOR_URI = serviceRegistry.getServiceURI(CoordinationConstants.ACTIVATION_SERVICE_NAME) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/BATestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/BATestCase.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/BATestCase.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,437 +0,0 @@
-package com.jboss.transaction.txinterop.interop;
-
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
-import com.arjuna.webservices11.wscoor.CoordinationConstants;
-import com.arjuna.webservices11.ServiceRegistry;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wst.BusinessActivityTerminator;
-import com.jboss.transaction.txinterop.interop.states.BAInteropDroppedParticipantCompletedState;
-import com.jboss.transaction.txinterop.interop.states.BAInteropParticipantCompletedState;
-import com.jboss.transaction.txinterop.interop.states.BAInteropUnsolicitedCompleteState;
-import com.jboss.transaction.txinterop.interop.states.InteropWaitState;
-import com.jboss.transaction.txinterop.proxy.ProxyConversation;
-import com.jboss.transaction.txinterop.proxy.ProxyURIRewriting;
-import com.jboss.transaction.txinterop.webservices.InteropConstants;
-import com.jboss.transaction.txinterop.webservices.bainterop.AsyncParticipantStub;
-import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropUtil;
-import com.jboss.transaction.txinterop.webservices.bainterop.ParticipantStub;
-import com.jboss.transaction.txinterop.webservices.bainterop.SyncParticipantStub;
-
-/**
- * The BA endpoint test case
- * @author kevin
- */
-public class BATestCase extends InteropTestCase
-{
-    /**
-     * The coordinator URI of the source.
-     */
-    private static final String SOURCE_COORDINATOR_URI ;
-    /**
-     * The service URI of the participant.
-     */
-    private static final String SOURCE_PARTICIPANT_URI ;
-    
-    /**
-     * Construct the named test case.
-     */
-    public BATestCase()
-    {
-        // Default the service to the local service.
-        setParticipantURI(getSourceParticipantURI()) ;
-        setTestTimeout(120000) ;
-        setAsyncTest(true) ;
-    }
-
-    /**
-     * testBA1_1 - 1.1 Cancel
-     * The IA cancels the activity before the PA completes its work on behalf of the activity.
-     * @throws Exception on failure.
-     */
-    public void testBA1_1()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_CANCELLED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().cancel(serviceURI, context) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.cancel() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testBA1_2 - 1.2 Exit
-     * The PA exits without completing any work on behalf of the activity.
-     * @throws Exception on failure.
-     */
-    public void testBA1_2()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_EXITED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().exit(serviceURI, context) ;
-            
-            state.waitForCompletion(getTestTimeout()) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.cancel() ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testBA1_3 - 1.3 Fail
-     * The PA fails before completing its work on behalf of the activity.
-     * @throws Exception on failure.
-     */
-    public void testBA1_3()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_FAILED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().fail(serviceURI, context) ;
-            
-            state.waitForCompletion(getTestTimeout()) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.cancel() ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testBA1_4 - 1.4 CannotComplete
-     * The PA sends CannotComplete before completing its work on behalf of the activity.
-     * @throws Exception on failure.
-     */
-    public void testBA1_4()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_NOT_COMPLETED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().cannotComplete(serviceURI, context) ;
-            
-            state.waitForCompletion(getTestTimeout()) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.cancel() ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testBA1_5 - 1.5 ParticipantCompleteClose
-     * The PA successfully completes its work on behalf of the activity and the activity is closed.
-     * @throws Exception on failure.
-     */
-    public void testBA1_5()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final BAInteropParticipantCompletedState state = new BAInteropParticipantCompletedState(BusinessActivityConstants.WSBA_ACTION_CLOSED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().participantCompleteClose(serviceURI, context) ;
-
-            assertTrue("Participant did not issue Completed", state.waitForParticipantCompleted(getTestTimeout())) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.close() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testBA1_6 - 1.6 CoordinatorCompleteClose
-     * The PA successfully completes its work on behalf of the activity and the activity is closed.
-     * @throws Exception on failure.
-     */
-    public void testBA1_6()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_CLOSED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().coordinatorCompleteClose(serviceURI, context) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.complete() ;
-            terminator.close() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testBA1_7 - 1.7 UnsolicitedComplete
-     * Tests a protocol error, participant send Completed for coordinator completion.  Throws an invalid state fault.
-     * @throws Exception on failure.
-     */
-    public void testBA1_7()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final BAInteropUnsolicitedCompleteState state = new BAInteropUnsolicitedCompleteState() ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().unsolicitedComplete(serviceURI, context) ;
-            
-            state.waitForCompletion(getTestTimeout()) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.cancel() ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-//
-    /**
-     * testBA1_8 - 1.8 Compensate
-     * The PA successfully completes its work on behalf of the activity and the activity is compensated.
-     * @throws Exception on failure.
-     */
-    public void testBA1_8()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final BAInteropParticipantCompletedState state = new BAInteropParticipantCompletedState(BusinessActivityConstants.WSBA_ACTION_COMPENSATED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().participantCompleteClose(serviceURI, context) ;
-
-            assertTrue("Participant did not issue Completed", state.waitForParticipantCompleted(getTestTimeout())) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.cancel() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testBA1_9 - 1.9 CompensationFail
-     * The PA successfully completes its work on behalf of the activity but compensation fails..
-     * @throws Exception on failure.
-     */
-    public void testBA1_9()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final BAInteropParticipantCompletedState state = new BAInteropParticipantCompletedState(BusinessActivityConstants.WSBA_ACTION_FAILED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().compensationFail(serviceURI, context) ;
-
-            assertTrue("Participant did not issue Completed", state.waitForParticipantCompleted(getTestTimeout())) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.cancel() ;
-            
-            state.waitForCompletion(getTestTimeout()) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testBA1_10 - 1.10 ParticipantCancelCompletedRace
-     * Simulate a race between cancel and completed.
-     * @throws Exception on failure.
-     */
-    public void testBA1_10()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final BAInteropDroppedParticipantCompletedState state = new BAInteropDroppedParticipantCompletedState(BusinessActivityConstants.WSBA_ACTION_COMPENSATED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().participantCancelCompletedRace(serviceURI, context) ;
-            
-            assertTrue("Participant did not issue Completed", state.waitForParticipantCompleted(getTestTimeout())) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.cancel() ;
-            
-            state.waitForCompletion(getTestTimeout()) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-    /**
-     * testBA1_11 - 1.11 MessageLossAndRecovery
-     * The IA cancels the activity before the PA completes its work on behalf of the activity.
-     * @throws Exception on failure.
-     */
-    public void testBA1_11()
-        throws Exception
-    {
-        final String conversationId = getConversationId() ;
-        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_COMPENSATED) ;
-        ProxyConversation.setConversationState(conversationId, state) ;
-        try
-        {
-            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-            getParticipantStub().messageLossAndRecovery(serviceURI, context) ;
-            
-            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
-            terminator.complete() ;
-            terminator.cancel() ;
-            
-            state.waitForCompletion(0) ;
-        }
-        finally
-        {
-            ProxyConversation.clearConversationState(conversationId) ;
-        }
-        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-    }
-
-//    /**
-//     * testBA1_12 - 1.12 MixedOutcome
-//     * The IA cancels the activity before the PA completes its work on behalf of the activity.
-//     * @throws Exception on failure.
-//     */
-//    public void testBA1_12()
-//        throws Exception
-//    {
-//        final String conversationId = getConversationId() ;
-//        final ATInteropWaitState state = new ATInteropWaitState(BusinessActivityConstants.WSAT_ACTION_COMMITTED) ;
-//        ProxyConversation.setConversationState(conversationId, state) ;
-//        try
-//        {
-//            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
-//            final CoordinationContextType context = BAInteropUtil.createMixedOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
-//            getParticipantStub().commit(serviceURI, context) ;
-//            
-//            final CompletionCoordinatorParticipant participant = BAInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-//            participant.commit() ;
-//            
-//            state.waitForCompletion(getTestTimeout()) ;
-//        }
-//        finally
-//        {
-//            ProxyConversation.clearConversationState(conversationId) ;
-//        }
-//        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
-//    }
-
-    /**
-     * Get the source coordinator URI.
-     * @return The source coordinator uri.
-     */
-    protected static String getSourceCoordinatorURI()
-    {
-        return SOURCE_COORDINATOR_URI ;
-    }
-    
-    /**
-     * Get the source participant URI.
-     * @return The source participant uri.
-     */
-    protected static String getSourceParticipantURI()
-    {
-        return SOURCE_PARTICIPANT_URI ;
-    }
-    
-    /**
-     * Get the participant stub for the test.
-     * @return The participant stub.
-     */
-    private ParticipantStub getParticipantStub()
-    {
-        return (getAsyncTest() ? AsyncParticipantStub.getParticipantStub() : SyncParticipantStub.getParticipantStub()) ;
-    }
-    
-    static
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        SOURCE_PARTICIPANT_URI = serviceRegistry.getServiceURI(InteropConstants.SERVICE_PARTICIPANT) ;
-        SOURCE_COORDINATOR_URI = serviceRegistry.getServiceURI(CoordinationConstants.ACTIVATION_SERVICE_NAME) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/BATestCase.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/BATestCase.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/BATestCase.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/BATestCase.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,457 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop;
+
+import com.arjuna.webservices11.wsba.BusinessActivityConstants;
+import com.arjuna.webservices11.wscoor.CoordinationConstants;
+import com.arjuna.webservices11.ServiceRegistry;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wst.BusinessActivityTerminator;
+import com.jboss.transaction.txinterop.interop.states.BAInteropDroppedParticipantCompletedState;
+import com.jboss.transaction.txinterop.interop.states.BAInteropParticipantCompletedState;
+import com.jboss.transaction.txinterop.interop.states.BAInteropUnsolicitedCompleteState;
+import com.jboss.transaction.txinterop.interop.states.InteropWaitState;
+import com.jboss.transaction.txinterop.proxy.ProxyConversation;
+import com.jboss.transaction.txinterop.proxy.ProxyURIRewriting;
+import com.jboss.transaction.txinterop.webservices.InteropConstants;
+import com.jboss.transaction.txinterop.webservices.bainterop.AsyncParticipantStub;
+import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropUtil;
+import com.jboss.transaction.txinterop.webservices.bainterop.ParticipantStub;
+import com.jboss.transaction.txinterop.webservices.bainterop.SyncParticipantStub;
+
+/**
+ * The BA endpoint test case
+ * @author kevin
+ */
+public class BATestCase extends InteropTestCase
+{
+    /**
+     * The coordinator URI of the source.
+     */
+    private static final String SOURCE_COORDINATOR_URI ;
+    /**
+     * The service URI of the participant.
+     */
+    private static final String SOURCE_PARTICIPANT_URI ;
+    
+    /**
+     * Construct the named test case.
+     */
+    public BATestCase()
+    {
+        // Default the service to the local service.
+        setParticipantURI(getSourceParticipantURI()) ;
+        setTestTimeout(120000) ;
+        setAsyncTest(true) ;
+    }
+
+    /**
+     * testBA1_1 - 1.1 Cancel
+     * The IA cancels the activity before the PA completes its work on behalf of the activity.
+     * @throws Exception on failure.
+     */
+    public void testBA1_1()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_CANCELLED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().cancel(serviceURI, context) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.cancel() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testBA1_2 - 1.2 Exit
+     * The PA exits without completing any work on behalf of the activity.
+     * @throws Exception on failure.
+     */
+    public void testBA1_2()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_EXITED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().exit(serviceURI, context) ;
+            
+            state.waitForCompletion(getTestTimeout()) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.cancel() ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testBA1_3 - 1.3 Fail
+     * The PA fails before completing its work on behalf of the activity.
+     * @throws Exception on failure.
+     */
+    public void testBA1_3()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_FAILED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().fail(serviceURI, context) ;
+            
+            state.waitForCompletion(getTestTimeout()) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.cancel() ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testBA1_4 - 1.4 CannotComplete
+     * The PA sends CannotComplete before completing its work on behalf of the activity.
+     * @throws Exception on failure.
+     */
+    public void testBA1_4()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_NOT_COMPLETED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().cannotComplete(serviceURI, context) ;
+            
+            state.waitForCompletion(getTestTimeout()) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.cancel() ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testBA1_5 - 1.5 ParticipantCompleteClose
+     * The PA successfully completes its work on behalf of the activity and the activity is closed.
+     * @throws Exception on failure.
+     */
+    public void testBA1_5()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final BAInteropParticipantCompletedState state = new BAInteropParticipantCompletedState(BusinessActivityConstants.WSBA_ACTION_CLOSED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().participantCompleteClose(serviceURI, context) ;
+
+            assertTrue("Participant did not issue Completed", state.waitForParticipantCompleted(getTestTimeout())) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.close() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testBA1_6 - 1.6 CoordinatorCompleteClose
+     * The PA successfully completes its work on behalf of the activity and the activity is closed.
+     * @throws Exception on failure.
+     */
+    public void testBA1_6()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_CLOSED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().coordinatorCompleteClose(serviceURI, context) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.complete() ;
+            terminator.close() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testBA1_7 - 1.7 UnsolicitedComplete
+     * Tests a protocol error, participant send Completed for coordinator completion.  Throws an invalid state fault.
+     * @throws Exception on failure.
+     */
+    public void testBA1_7()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final BAInteropUnsolicitedCompleteState state = new BAInteropUnsolicitedCompleteState() ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().unsolicitedComplete(serviceURI, context) ;
+            
+            state.waitForCompletion(getTestTimeout()) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.cancel() ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+//
+    /**
+     * testBA1_8 - 1.8 Compensate
+     * The PA successfully completes its work on behalf of the activity and the activity is compensated.
+     * @throws Exception on failure.
+     */
+    public void testBA1_8()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final BAInteropParticipantCompletedState state = new BAInteropParticipantCompletedState(BusinessActivityConstants.WSBA_ACTION_COMPENSATED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().participantCompleteClose(serviceURI, context) ;
+
+            assertTrue("Participant did not issue Completed", state.waitForParticipantCompleted(getTestTimeout())) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.cancel() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testBA1_9 - 1.9 CompensationFail
+     * The PA successfully completes its work on behalf of the activity but compensation fails..
+     * @throws Exception on failure.
+     */
+    public void testBA1_9()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final BAInteropParticipantCompletedState state = new BAInteropParticipantCompletedState(BusinessActivityConstants.WSBA_ACTION_FAILED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().compensationFail(serviceURI, context) ;
+
+            assertTrue("Participant did not issue Completed", state.waitForParticipantCompleted(getTestTimeout())) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.cancel() ;
+            
+            state.waitForCompletion(getTestTimeout()) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testBA1_10 - 1.10 ParticipantCancelCompletedRace
+     * Simulate a race between cancel and completed.
+     * @throws Exception on failure.
+     */
+    public void testBA1_10()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final BAInteropDroppedParticipantCompletedState state = new BAInteropDroppedParticipantCompletedState(BusinessActivityConstants.WSBA_ACTION_COMPENSATED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().participantCancelCompletedRace(serviceURI, context) ;
+            
+            assertTrue("Participant did not issue Completed", state.waitForParticipantCompleted(getTestTimeout())) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.cancel() ;
+            
+            state.waitForCompletion(getTestTimeout()) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+    /**
+     * testBA1_11 - 1.11 MessageLossAndRecovery
+     * The IA cancels the activity before the PA completes its work on behalf of the activity.
+     * @throws Exception on failure.
+     */
+    public void testBA1_11()
+        throws Exception
+    {
+        final String conversationId = getConversationId() ;
+        final InteropWaitState state = new InteropWaitState(BusinessActivityConstants.WSBA_ACTION_COMPENSATED) ;
+        ProxyConversation.setConversationState(conversationId, state) ;
+        try
+        {
+            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+            final CoordinationContextType context = BAInteropUtil.createAtomicOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+            getParticipantStub().messageLossAndRecovery(serviceURI, context) ;
+            
+            final BusinessActivityTerminator terminator = BAInteropUtil.registerTerminator(context, context.getIdentifier().getValue()) ;
+            terminator.complete() ;
+            terminator.cancel() ;
+            
+            state.waitForCompletion(0) ;
+        }
+        finally
+        {
+            ProxyConversation.clearConversationState(conversationId) ;
+        }
+        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+    }
+
+//    /**
+//     * testBA1_12 - 1.12 MixedOutcome
+//     * The IA cancels the activity before the PA completes its work on behalf of the activity.
+//     * @throws Exception on failure.
+//     */
+//    public void testBA1_12()
+//        throws Exception
+//    {
+//        final String conversationId = getConversationId() ;
+//        final ATInteropWaitState state = new ATInteropWaitState(BusinessActivityConstants.WSAT_ACTION_COMMITTED) ;
+//        ProxyConversation.setConversationState(conversationId, state) ;
+//        try
+//        {
+//            final String serviceURI = ProxyURIRewriting.rewriteURI(conversationId, getParticipantURI()) ;
+//            final CoordinationContextType context = BAInteropUtil.createMixedOutcomeCoordinationContext(getSourceCoordinatorURI()) ;
+//            getParticipantStub().commit(serviceURI, context) ;
+//            
+//            final CompletionCoordinatorParticipant participant = BAInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+//            participant.commit() ;
+//            
+//            state.waitForCompletion(getTestTimeout()) ;
+//        }
+//        finally
+//        {
+//            ProxyConversation.clearConversationState(conversationId) ;
+//        }
+//        assertTrue("Conversation did not complete successfully", state.isSuccessful()) ;
+//    }
+
+    /**
+     * Get the source coordinator URI.
+     * @return The source coordinator uri.
+     */
+    protected static String getSourceCoordinatorURI()
+    {
+        return SOURCE_COORDINATOR_URI ;
+    }
+    
+    /**
+     * Get the source participant URI.
+     * @return The source participant uri.
+     */
+    protected static String getSourceParticipantURI()
+    {
+        return SOURCE_PARTICIPANT_URI ;
+    }
+    
+    /**
+     * Get the participant stub for the test.
+     * @return The participant stub.
+     */
+    private ParticipantStub getParticipantStub()
+    {
+        return (getAsyncTest() ? AsyncParticipantStub.getParticipantStub() : SyncParticipantStub.getParticipantStub()) ;
+    }
+    
+    static
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        SOURCE_PARTICIPANT_URI = serviceRegistry.getServiceURI(InteropConstants.SERVICE_PARTICIPANT) ;
+        SOURCE_COORDINATOR_URI = serviceRegistry.getServiceURI(CoordinationConstants.ACTIVATION_SERVICE_NAME) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestCase.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestCase.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,162 +0,0 @@
-package com.jboss.transaction.txinterop.interop;
-
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-
-import com.jboss.transaction.txinterop.proxy.ProxyConversation;
-
-/**
- * Base class for interop tests.
- * @author kevin
- */
-public class InteropTestCase extends TestCase
-{
-    /**
-     * The log message prefix start.
-     */
-    private static final String LOG_MESSAGE_PREFIX_START = "<log:message testcase=\"" ;
-    /**
-     * The log message prefix centre.
-     */
-    private static final String LOG_MESSAGE_PREFIX_CENTRE = "\" message=\"" ;
-    /**
-     * The log message prefix end.
-     */
-    private static final String LOG_MESSAGE_PREFIX_END = "\"><log:content>" ;
-    /**
-     * The log message suffix.
-     */
-    private static final String LOG_MESSAGE_SUFFIX = "</log:content></log:message>" ;
-    
-    /**
-     * The URI of the participant.
-     */
-    private String participantURI ;
-    
-    /**
-     * The conversation id for the test.
-     */
-    private String conversationId ;
-    
-    /**
-     * The test timeout value.
-     */
-    private long testTimeout ;
-    /**
-     * The asynchronous test flag.
-     */
-    private boolean asyncTest ;
-    
-    /**
-     * Set the participant URI.
-     * @param participantURI The participant URI.
-     */
-    public void setParticipantURI(final String participantURI)
-    {
-        this.participantURI = participantURI ;
-    }
-    
-    /**
-     * Get the participant URI.
-     * @return The participant URI.
-     */
-    protected String getParticipantURI()
-    {
-        return participantURI ;
-    }
-    
-    /**
-     * Set the test timeout value.
-     * testTimeout The test timeout value.
-     */
-    public void setTestTimeout(final long testTimeout)
-    {
-        this.testTimeout = testTimeout ;
-    }
-    
-    /**
-     * Get the asynchronous test flag.
-     * @return The asynchronous test flag.
-     */
-    protected boolean getAsyncTest()
-    {
-        return asyncTest ;
-    }
-    
-    /**
-     * Set the asynchronous test flag.
-     * asyncTest The asynchronous test flag.
-     */
-    public void setAsyncTest(final boolean asyncTest)
-    {
-        this.asyncTest = asyncTest ;
-    }
-    
-    /**
-     * Get the test timeout value.
-     * @return The test timeout value.
-     */
-    protected long getTestTimeout()
-    {
-        return testTimeout ;
-    }
-    
-    /**
-     * Get the conversation id.
-     * @return The conversation id.
-     */
-    protected String getConversationId()
-    {
-        return conversationId ;
-    }
-    
-    /**
-     * Wraps the run method to include logging of message interactions.
-     * @param result The test result. 
-     */
-    public void run(final TestResult result)
-    {
-        // get a conversation id, start the log, clear it on finish.
-        conversationId = ProxyConversation.createConversation() ;
-        try
-        {
-            super.run(result) ;
-        }
-        finally
-        {
-            final String[] messages = ProxyConversation.removeConversation(conversationId) ;
-            conversationId = null ;
-            if (messages != null)
-            {
-                final int numMessages = messages.length ;
-                final StringBuffer buffer = new StringBuffer() ;
-                int count = 0 ;
-                while(count < numMessages)
-                {
-                    final String message = messages[count] ;
-                    count++ ;
-                    if (message != null)
-                    {
-                        buffer.append(LOG_MESSAGE_PREFIX_START) ;
-                        buffer.append(getName()) ;
-                        buffer.append(LOG_MESSAGE_PREFIX_CENTRE) ;
-                        buffer.append(count) ;
-                        buffer.append(LOG_MESSAGE_PREFIX_END) ;
-                        buffer.append(message) ;
-                        buffer.append(LOG_MESSAGE_SUFFIX) ;
-                    }
-                }
-                MessageLogging.appendThreadLog(buffer.toString()) ;
-            }
-        }
-    }
-    
-    /**
-     * Return the string represenation of this test.
-     * @return the string representation.
-     */
-    public String toString()
-    {
-        return getName() ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestCase.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestCase.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestCase.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestCase.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,182 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop;
+
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+
+import com.jboss.transaction.txinterop.proxy.ProxyConversation;
+
+/**
+ * Base class for interop tests.
+ * @author kevin
+ */
+public class InteropTestCase extends TestCase
+{
+    /**
+     * The log message prefix start.
+     */
+    private static final String LOG_MESSAGE_PREFIX_START = "<log:message testcase=\"" ;
+    /**
+     * The log message prefix centre.
+     */
+    private static final String LOG_MESSAGE_PREFIX_CENTRE = "\" message=\"" ;
+    /**
+     * The log message prefix end.
+     */
+    private static final String LOG_MESSAGE_PREFIX_END = "\"><log:content>" ;
+    /**
+     * The log message suffix.
+     */
+    private static final String LOG_MESSAGE_SUFFIX = "</log:content></log:message>" ;
+    
+    /**
+     * The URI of the participant.
+     */
+    private String participantURI ;
+    
+    /**
+     * The conversation id for the test.
+     */
+    private String conversationId ;
+    
+    /**
+     * The test timeout value.
+     */
+    private long testTimeout ;
+    /**
+     * The asynchronous test flag.
+     */
+    private boolean asyncTest ;
+    
+    /**
+     * Set the participant URI.
+     * @param participantURI The participant URI.
+     */
+    public void setParticipantURI(final String participantURI)
+    {
+        this.participantURI = participantURI ;
+    }
+    
+    /**
+     * Get the participant URI.
+     * @return The participant URI.
+     */
+    protected String getParticipantURI()
+    {
+        return participantURI ;
+    }
+    
+    /**
+     * Set the test timeout value.
+     * testTimeout The test timeout value.
+     */
+    public void setTestTimeout(final long testTimeout)
+    {
+        this.testTimeout = testTimeout ;
+    }
+    
+    /**
+     * Get the asynchronous test flag.
+     * @return The asynchronous test flag.
+     */
+    protected boolean getAsyncTest()
+    {
+        return asyncTest ;
+    }
+    
+    /**
+     * Set the asynchronous test flag.
+     * asyncTest The asynchronous test flag.
+     */
+    public void setAsyncTest(final boolean asyncTest)
+    {
+        this.asyncTest = asyncTest ;
+    }
+    
+    /**
+     * Get the test timeout value.
+     * @return The test timeout value.
+     */
+    protected long getTestTimeout()
+    {
+        return testTimeout ;
+    }
+    
+    /**
+     * Get the conversation id.
+     * @return The conversation id.
+     */
+    protected String getConversationId()
+    {
+        return conversationId ;
+    }
+    
+    /**
+     * Wraps the run method to include logging of message interactions.
+     * @param result The test result. 
+     */
+    public void run(final TestResult result)
+    {
+        // get a conversation id, start the log, clear it on finish.
+        conversationId = ProxyConversation.createConversation() ;
+        try
+        {
+            super.run(result) ;
+        }
+        finally
+        {
+            final String[] messages = ProxyConversation.removeConversation(conversationId) ;
+            conversationId = null ;
+            if (messages != null)
+            {
+                final int numMessages = messages.length ;
+                final StringBuffer buffer = new StringBuffer() ;
+                int count = 0 ;
+                while(count < numMessages)
+                {
+                    final String message = messages[count] ;
+                    count++ ;
+                    if (message != null)
+                    {
+                        buffer.append(LOG_MESSAGE_PREFIX_START) ;
+                        buffer.append(getName()) ;
+                        buffer.append(LOG_MESSAGE_PREFIX_CENTRE) ;
+                        buffer.append(count) ;
+                        buffer.append(LOG_MESSAGE_PREFIX_END) ;
+                        buffer.append(message) ;
+                        buffer.append(LOG_MESSAGE_SUFFIX) ;
+                    }
+                }
+                MessageLogging.appendThreadLog(buffer.toString()) ;
+            }
+        }
+    }
+    
+    /**
+     * Return the string represenation of this test.
+     * @return the string representation.
+     */
+    public String toString()
+    {
+        return getName() ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestSuite.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestSuite.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestSuite.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,111 +0,0 @@
-package com.jboss.transaction.txinterop.interop;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Interop testsuite to initialise the participant uri on addition.
- * @author kevin
- */
-public class InteropTestSuite extends TestSuite
-{
-    /**
-     * The participant URI for this test.
-     */
-    private final String participantURI ;
-    /**
-     * The test timeout.
-     */
-    private final long testTimeout ;
-    /**
-     * The asynchronous test flag.
-     */
-    private final boolean asyncTest ;
-    
-    /**
-     * Construct an empty test suite with the specified participant URI.
-     * @param testTimeout The test timeout.
-     * @param participantURI The participant URI.
-     */
-    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest)
-    {
-        super() ;
-        this.participantURI = participantURI ;
-        this.testTimeout = testTimeout ;
-        this.asyncTest = asyncTest ;
-    }
-    
-    /**
-     * Construct an empty test suite with the specified participant URI and name.
-     * @param participantURI The participant URI.
-     * @param testTimeout The test timeout.
-     * @param name The name of the test suite.
-     */
-    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final String name)
-    {
-        super(name) ;
-        this.participantURI = participantURI ;
-        this.testTimeout = testTimeout ;
-        this.asyncTest = asyncTest ;
-    }
-
-    /**
-     * Constructs a TestSuite from the given class using the specified participant URI.
-     * @param participantURI The participant URI.
-     * @param testTimeout The test timeout.
-     * @param clazz The class containing the tests.
-     */
-    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final Class clazz)
-    {
-        super(clazz) ;
-        this.participantURI = participantURI ;
-        this.testTimeout = testTimeout ;
-        this.asyncTest = asyncTest ;
-        final int numTests = countTestCases() ;
-        for(int count = 0 ; count < numTests ; count++)
-        {
-            initialiseTest(testAt(count)) ;
-        }
-    }
-    
-    /**
-     * Constructs a TestSuite from the given class using the specified participant URI and name.
-     * @param participantURI The participant URI.
-     * @param testTimeout The test timeout.
-     * @param clazz The class containing the tests.
-     * @param name The name of the test suite.
-     */
-    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final Class clazz, final String name)
-    {
-        super(clazz, name) ;
-        this.participantURI = participantURI ;
-        this.testTimeout = testTimeout ;
-        this.asyncTest = asyncTest ;
-    }
-
-    /**
-     * Add a test to the test suite.
-     * @param test The test to add.
-     */
-    public void addTest(final Test test)
-    {
-        initialiseTest(test) ;
-        super.addTest(test) ;
-    }
-    
-    /**
-     * Perform initialisation on the test.
-     * @param test The test to initialise.
-     */
-    private void initialiseTest(final Test test)
-    {
-        if (test instanceof InteropTestCase)
-        {
-            final InteropTestCase interopTestCase = (InteropTestCase)test ;
-            interopTestCase.setParticipantURI(participantURI) ;
-            interopTestCase.setTestTimeout(testTimeout) ;
-            interopTestCase.setAsyncTest(asyncTest) ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestSuite.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestSuite.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestSuite.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/InteropTestSuite.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,131 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop;
+
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Interop testsuite to initialise the participant uri on addition.
+ * @author kevin
+ */
+public class InteropTestSuite extends TestSuite
+{
+    /**
+     * The participant URI for this test.
+     */
+    private final String participantURI ;
+    /**
+     * The test timeout.
+     */
+    private final long testTimeout ;
+    /**
+     * The asynchronous test flag.
+     */
+    private final boolean asyncTest ;
+    
+    /**
+     * Construct an empty test suite with the specified participant URI.
+     * @param testTimeout The test timeout.
+     * @param participantURI The participant URI.
+     */
+    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest)
+    {
+        super() ;
+        this.participantURI = participantURI ;
+        this.testTimeout = testTimeout ;
+        this.asyncTest = asyncTest ;
+    }
+    
+    /**
+     * Construct an empty test suite with the specified participant URI and name.
+     * @param participantURI The participant URI.
+     * @param testTimeout The test timeout.
+     * @param name The name of the test suite.
+     */
+    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final String name)
+    {
+        super(name) ;
+        this.participantURI = participantURI ;
+        this.testTimeout = testTimeout ;
+        this.asyncTest = asyncTest ;
+    }
+
+    /**
+     * Constructs a TestSuite from the given class using the specified participant URI.
+     * @param participantURI The participant URI.
+     * @param testTimeout The test timeout.
+     * @param clazz The class containing the tests.
+     */
+    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final Class clazz)
+    {
+        super(clazz) ;
+        this.participantURI = participantURI ;
+        this.testTimeout = testTimeout ;
+        this.asyncTest = asyncTest ;
+        final int numTests = countTestCases() ;
+        for(int count = 0 ; count < numTests ; count++)
+        {
+            initialiseTest(testAt(count)) ;
+        }
+    }
+    
+    /**
+     * Constructs a TestSuite from the given class using the specified participant URI and name.
+     * @param participantURI The participant URI.
+     * @param testTimeout The test timeout.
+     * @param clazz The class containing the tests.
+     * @param name The name of the test suite.
+     */
+    public InteropTestSuite(final String participantURI, final long testTimeout, final boolean asyncTest, final Class clazz, final String name)
+    {
+        super(clazz, name) ;
+        this.participantURI = participantURI ;
+        this.testTimeout = testTimeout ;
+        this.asyncTest = asyncTest ;
+    }
+
+    /**
+     * Add a test to the test suite.
+     * @param test The test to add.
+     */
+    public void addTest(final Test test)
+    {
+        initialiseTest(test) ;
+        super.addTest(test) ;
+    }
+    
+    /**
+     * Perform initialisation on the test.
+     * @param test The test to initialise.
+     */
+    private void initialiseTest(final Test test)
+    {
+        if (test instanceof InteropTestCase)
+        {
+            final InteropTestCase interopTestCase = (InteropTestCase)test ;
+            interopTestCase.setParticipantURI(participantURI) ;
+            interopTestCase.setTestTimeout(testTimeout) ;
+            interopTestCase.setAsyncTest(asyncTest) ;
+        }
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/MessageLogging.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/MessageLogging.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/MessageLogging.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,51 +0,0 @@
-package com.jboss.transaction.txinterop.interop;
-
-/**
- * Class providing test message logging.
- * @author kevin
- */
-public class MessageLogging
-{
-    /**
-     * The thread local message log.
-     */
-    private static final ThreadLocal MESSAGE_LOG = new ThreadLocal() ;
-    
-    /**
-     * Clear the log for the current thread.
-     */
-    public static void clearThreadLog()
-    {
-        MESSAGE_LOG.set(null) ;
-    }
-    
-    /**
-     * Get the thread log.
-     * @return The thread log.
-     */
-    public static String getThreadLog()
-    {
-        final Object value = MESSAGE_LOG.get() ;
-        return (value == null ? "" : value.toString()) ;
-    }
-    
-    /**
-     * Append a message to the thread log.
-     * @param message The thread message to append.
-     */
-    public static void appendThreadLog(final String message)
-    {
-        final Object value = MESSAGE_LOG.get() ;
-        final StringBuffer buffer ;
-        if (value == null)
-        {
-            buffer = new StringBuffer(message) ;
-            MESSAGE_LOG.set(buffer) ;
-        }
-        else
-        {
-            buffer = (StringBuffer)value ;
-            buffer.append(message) ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/MessageLogging.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/MessageLogging.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/MessageLogging.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/MessageLogging.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop;
+
+/**
+ * Class providing test message logging.
+ * @author kevin
+ */
+public class MessageLogging
+{
+    /**
+     * The thread local message log.
+     */
+    private static final ThreadLocal MESSAGE_LOG = new ThreadLocal() ;
+    
+    /**
+     * Clear the log for the current thread.
+     */
+    public static void clearThreadLog()
+    {
+        MESSAGE_LOG.set(null) ;
+    }
+    
+    /**
+     * Get the thread log.
+     * @return The thread log.
+     */
+    public static String getThreadLog()
+    {
+        final Object value = MESSAGE_LOG.get() ;
+        return (value == null ? "" : value.toString()) ;
+    }
+    
+    /**
+     * Append a message to the thread log.
+     * @param message The thread message to append.
+     */
+    public static void appendThreadLog(final String message)
+    {
+        final Object value = MESSAGE_LOG.get() ;
+        final StringBuffer buffer ;
+        if (value == null)
+        {
+            buffer = new StringBuffer(message) ;
+            MESSAGE_LOG.set(buffer) ;
+        }
+        else
+        {
+            buffer = (StringBuffer)value ;
+            buffer.append(message) ;
+        }
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropPreparedAfterTimeoutState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropPreparedAfterTimeoutState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropPreparedAfterTimeoutState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,70 +0,0 @@
-package com.jboss.transaction.txinterop.interop.states;
-
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-
-/**
- * A conversation state for prepare after timeout test.
- */
-public class ATInteropPreparedAfterTimeoutState extends BaseState
-{
-    /**
-     * The prepared count.
-     */
-    private int preparedCount ;
-    /**
-     * The rollback count.
-     */
-    private int rollbackCount ;
-    /**
-     * Are we dropping other messages?
-     */
-    private boolean drop ;
-    /**
-     * Aborted flag.
-     */
-    private boolean aborted ;
-    /**
-     * Soap Fault flag.
-     */
-    private boolean soapFault ;
-    
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public boolean handleAction(final String action, final String identifier)
-    {
-        if (AtomicTransactionConstants.WSAT_ACTION_PREPARED.equals(action))
-        {
-            if (++preparedCount == 2)
-            {
-                drop = true ;
-            }
-        }
-        else if (AtomicTransactionConstants.WSAT_ACTION_ROLLBACK.equals(action))
-        {
-            if (++rollbackCount == 2)
-            {
-                drop = false ;
-                return true ;
-            }
-        }
-        else if (AtomicTransactionConstants.WSAT_ACTION_ABORTED.equals(action))
-        {
-            aborted = true ;
-        }
-        else if (AtomicTransactionConstants.WSAT_ACTION_FAULT.equals(action))
-        {
-            soapFault = true ;
-        }
-        
-        if (aborted && soapFault)
-        {
-            success() ;
-        }
-        
-        return drop ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropPreparedAfterTimeoutState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropPreparedAfterTimeoutState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropPreparedAfterTimeoutState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropPreparedAfterTimeoutState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop.states;
+
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+
+/**
+ * A conversation state for prepare after timeout test.
+ */
+public class ATInteropPreparedAfterTimeoutState extends BaseState
+{
+    /**
+     * The prepared count.
+     */
+    private int preparedCount ;
+    /**
+     * The rollback count.
+     */
+    private int rollbackCount ;
+    /**
+     * Are we dropping other messages?
+     */
+    private boolean drop ;
+    /**
+     * Aborted flag.
+     */
+    private boolean aborted ;
+    /**
+     * Soap Fault flag.
+     */
+    private boolean soapFault ;
+    
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public boolean handleAction(final String action, final String identifier)
+    {
+        if (AtomicTransactionConstants.WSAT_ACTION_PREPARED.equals(action))
+        {
+            if (++preparedCount == 2)
+            {
+                drop = true ;
+            }
+        }
+        else if (AtomicTransactionConstants.WSAT_ACTION_ROLLBACK.equals(action))
+        {
+            if (++rollbackCount == 2)
+            {
+                drop = false ;
+                return true ;
+            }
+        }
+        else if (AtomicTransactionConstants.WSAT_ACTION_ABORTED.equals(action))
+        {
+            aborted = true ;
+        }
+        else if (AtomicTransactionConstants.WSAT_ACTION_FAULT.equals(action))
+        {
+            soapFault = true ;
+        }
+        
+        if (aborted && soapFault)
+        {
+            success() ;
+        }
+        
+        return drop ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedAbortState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedAbortState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedAbortState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,51 +0,0 @@
-package com.jboss.transaction.txinterop.interop.states;
-
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-
-/**
- * A conversation state for retry prepared abort test.
- */
-public class ATInteropRetryPreparedAbortState extends BaseState
-{
-    /**
-     * Have we had the first prepare?
-     */
-    private boolean firstPrepare ;
-    /**
-     * Are we dropping other messages?
-     */
-    private boolean drop ;
-    
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public boolean handleAction(final String action, final String identifier)
-    {
-        if (AtomicTransactionConstants.WSAT_ACTION_PREPARE.equals(action))
-        {
-            if (!firstPrepare)
-            {
-                firstPrepare = true ;
-                drop = true ;
-                return false ;
-            }
-            return true ;
-        }
-        if (AtomicTransactionConstants.WSAT_ACTION_ROLLBACK.equals(action))
-        {
-            if (drop)
-            {
-                drop = false ;
-                return true ;
-            }
-        }
-        else if (AtomicTransactionConstants.WSAT_ACTION_ABORTED.equals(action))
-        {
-            success() ;
-        }
-        return drop ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedAbortState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedAbortState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedAbortState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedAbortState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop.states;
+
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+
+/**
+ * A conversation state for retry prepared abort test.
+ */
+public class ATInteropRetryPreparedAbortState extends BaseState
+{
+    /**
+     * Have we had the first prepare?
+     */
+    private boolean firstPrepare ;
+    /**
+     * Are we dropping other messages?
+     */
+    private boolean drop ;
+    
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public boolean handleAction(final String action, final String identifier)
+    {
+        if (AtomicTransactionConstants.WSAT_ACTION_PREPARE.equals(action))
+        {
+            if (!firstPrepare)
+            {
+                firstPrepare = true ;
+                drop = true ;
+                return false ;
+            }
+            return true ;
+        }
+        if (AtomicTransactionConstants.WSAT_ACTION_ROLLBACK.equals(action))
+        {
+            if (drop)
+            {
+                drop = false ;
+                return true ;
+            }
+        }
+        else if (AtomicTransactionConstants.WSAT_ACTION_ABORTED.equals(action))
+        {
+            success() ;
+        }
+        return drop ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedCommitState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedCommitState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedCommitState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,60 +0,0 @@
-package com.jboss.transaction.txinterop.interop.states;
-
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-
-/**
- * A conversation state for retry prepared commit state.
- */
-public class ATInteropRetryPreparedCommitState extends BaseState
-{
-    /**
-     * The prepared count.
-     */
-    private int preparedCount ;
-    /**
-     * The committed count.
-     */
-    private int committedCount ;
-    /**
-     * The first identifier.
-     */
-    private String firstIdentifier ;
-    /**
-     * Are we dropping other messages?
-     */
-    private boolean drop ;
-    
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public boolean handleAction(final String action, final String identifier)
-    {
-        if (AtomicTransactionConstants.WSAT_ACTION_PREPARED.equals(action))
-        {
-            preparedCount++ ;
-            if (preparedCount == 1)
-            {
-                firstIdentifier = identifier ;
-            }
-            else if (preparedCount == 2)
-            {
-                drop = true ;
-            }
-            else if (firstIdentifier.equals(identifier))
-            {
-                drop = false ;
-            }
-        }
-        else if (AtomicTransactionConstants.WSAT_ACTION_COMMITTED.equals(action))
-        {
-            if (++committedCount == 2)
-            {
-                success() ;
-            }
-        }
-        return drop ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedCommitState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedCommitState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedCommitState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/ATInteropRetryPreparedCommitState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop.states;
+
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+
+/**
+ * A conversation state for retry prepared commit state.
+ */
+public class ATInteropRetryPreparedCommitState extends BaseState
+{
+    /**
+     * The prepared count.
+     */
+    private int preparedCount ;
+    /**
+     * The committed count.
+     */
+    private int committedCount ;
+    /**
+     * The first identifier.
+     */
+    private String firstIdentifier ;
+    /**
+     * Are we dropping other messages?
+     */
+    private boolean drop ;
+    
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public boolean handleAction(final String action, final String identifier)
+    {
+        if (AtomicTransactionConstants.WSAT_ACTION_PREPARED.equals(action))
+        {
+            preparedCount++ ;
+            if (preparedCount == 1)
+            {
+                firstIdentifier = identifier ;
+            }
+            else if (preparedCount == 2)
+            {
+                drop = true ;
+            }
+            else if (firstIdentifier.equals(identifier))
+            {
+                drop = false ;
+            }
+        }
+        else if (AtomicTransactionConstants.WSAT_ACTION_COMMITTED.equals(action))
+        {
+            if (++committedCount == 2)
+            {
+                success() ;
+            }
+        }
+        return drop ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropDroppedParticipantCompletedState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropDroppedParticipantCompletedState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropDroppedParticipantCompletedState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,89 +0,0 @@
-package com.jboss.transaction.txinterop.interop.states;
-
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
-
-
-/**
- * A conversation state for waiting on participant completed.
- */
-public class BAInteropDroppedParticipantCompletedState extends BaseState
-{
-    /**
-     * The last action.
-     */
-    private final String lastAction ;
-    /**
-     * The participant completed flag.
-     */
-    private boolean participantCompleted ;
-    
-    /**
-     * Construct the participant completed test.
-     * @param lastAction The last action.
-     */
-    public BAInteropDroppedParticipantCompletedState(final String lastAction)
-    {
-	this.lastAction = lastAction ;
-    }
-    
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public synchronized boolean handleAction(final String action, final String identifier)
-    {
-        if (!participantCompleted && BusinessActivityConstants.WSBA_ACTION_COMPLETED.equals(action))
-        {
-            participantCompleted = true ;
-            notifyAll() ;
-            return true ;
-        }
-        else if (participantCompleted && lastAction.equals(action))
-        {
-            success() ;
-        }
-        return false ;
-    }
-    
-    /**
-     * Wait for the participant to complete.
-     * @param timeout The timeout.
-     * @return true if the participant has completed, false otherwise.
-     */
-    public boolean waitForParticipantCompleted(final long timeout)
-    {
-	final long endTime = System.currentTimeMillis() + timeout ;
-	final boolean result ;
-	synchronized(this)
-	{
-	    while(!participantCompleted)
-	    {
-		final long currentTimeout = endTime - System.currentTimeMillis() ;
-		if (currentTimeout <= 0)
-		{
-		    break ;
-		}
-                try
-                {
-                    wait(currentTimeout) ;
-                }
-                catch (final InterruptedException ie) {}
-	    }
-	    
-	    result = participantCompleted ;
-	}
-	
-	if (result)
-	{
-	    // If it is completd then wait to allow processing of message.
-	    try
-	    {
-		Thread.sleep(2000) ;
-	    }
-	    catch (final InterruptedException ie) {}
-	}
-	return result ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropDroppedParticipantCompletedState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropDroppedParticipantCompletedState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropDroppedParticipantCompletedState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropDroppedParticipantCompletedState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop.states;
+
+import com.arjuna.webservices11.wsba.BusinessActivityConstants;
+
+
+/**
+ * A conversation state for waiting on participant completed.
+ */
+public class BAInteropDroppedParticipantCompletedState extends BaseState
+{
+    /**
+     * The last action.
+     */
+    private final String lastAction ;
+    /**
+     * The participant completed flag.
+     */
+    private boolean participantCompleted ;
+    
+    /**
+     * Construct the participant completed test.
+     * @param lastAction The last action.
+     */
+    public BAInteropDroppedParticipantCompletedState(final String lastAction)
+    {
+	this.lastAction = lastAction ;
+    }
+    
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public synchronized boolean handleAction(final String action, final String identifier)
+    {
+        if (!participantCompleted && BusinessActivityConstants.WSBA_ACTION_COMPLETED.equals(action))
+        {
+            participantCompleted = true ;
+            notifyAll() ;
+            return true ;
+        }
+        else if (participantCompleted && lastAction.equals(action))
+        {
+            success() ;
+        }
+        return false ;
+    }
+    
+    /**
+     * Wait for the participant to complete.
+     * @param timeout The timeout.
+     * @return true if the participant has completed, false otherwise.
+     */
+    public boolean waitForParticipantCompleted(final long timeout)
+    {
+	final long endTime = System.currentTimeMillis() + timeout ;
+	final boolean result ;
+	synchronized(this)
+	{
+	    while(!participantCompleted)
+	    {
+		final long currentTimeout = endTime - System.currentTimeMillis() ;
+		if (currentTimeout <= 0)
+		{
+		    break ;
+		}
+                try
+                {
+                    wait(currentTimeout) ;
+                }
+                catch (final InterruptedException ie) {}
+	    }
+	    
+	    result = participantCompleted ;
+	}
+	
+	if (result)
+	{
+	    // If it is completd then wait to allow processing of message.
+	    try
+	    {
+		Thread.sleep(2000) ;
+	    }
+	    catch (final InterruptedException ie) {}
+	}
+	return result ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropParticipantCompletedState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropParticipantCompletedState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropParticipantCompletedState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,88 +0,0 @@
-package com.jboss.transaction.txinterop.interop.states;
-
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
-
-
-/**
- * A conversation state for waiting on participant completed.
- */
-public class BAInteropParticipantCompletedState extends BaseState
-{
-    /**
-     * The last action.
-     */
-    private final String lastAction ;
-    /**
-     * The participant completed flag.
-     */
-    private boolean participantCompleted ;
-    
-    /**
-     * Construct the participant completed test.
-     * @param lastAction The last action.
-     */
-    public BAInteropParticipantCompletedState(final String lastAction)
-    {
-	this.lastAction = lastAction ;
-    }
-    
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public synchronized boolean handleAction(final String action, final String identifier)
-    {
-        if (BusinessActivityConstants.WSBA_ACTION_COMPLETED.equals(action))
-        {
-            participantCompleted = true ;
-            notifyAll() ;
-        }
-        else if (participantCompleted && lastAction.equals(action))
-        {
-            success() ;
-        }
-        return false ;
-    }
-    
-    /**
-     * Wait for the participant to complete.
-     * @param timeout The timeout.
-     * @return true if the participant has completed, false otherwise.
-     */
-    public boolean waitForParticipantCompleted(final long timeout)
-    {
-	final long endTime = System.currentTimeMillis() + timeout ;
-	final boolean result ;
-	synchronized(this)
-	{
-	    while(!participantCompleted)
-	    {
-		final long currentTimeout = endTime - System.currentTimeMillis() ;
-		if (currentTimeout <= 0)
-		{
-		    break ;
-		}
-                try
-                {
-                    wait(currentTimeout) ;
-                }
-                catch (final InterruptedException ie) {}
-	    }
-	    
-	    result = participantCompleted ;
-	}
-	
-	if (result)
-	{
-	    // If it is completd then wait to allow processing of message.
-	    try
-	    {
-		Thread.sleep(2000) ;
-	    }
-	    catch (final InterruptedException ie) {}
-	}
-	return result ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropParticipantCompletedState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropParticipantCompletedState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropParticipantCompletedState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropParticipantCompletedState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,108 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop.states;
+
+import com.arjuna.webservices11.wsba.BusinessActivityConstants;
+
+
+/**
+ * A conversation state for waiting on participant completed.
+ */
+public class BAInteropParticipantCompletedState extends BaseState
+{
+    /**
+     * The last action.
+     */
+    private final String lastAction ;
+    /**
+     * The participant completed flag.
+     */
+    private boolean participantCompleted ;
+    
+    /**
+     * Construct the participant completed test.
+     * @param lastAction The last action.
+     */
+    public BAInteropParticipantCompletedState(final String lastAction)
+    {
+	this.lastAction = lastAction ;
+    }
+    
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public synchronized boolean handleAction(final String action, final String identifier)
+    {
+        if (BusinessActivityConstants.WSBA_ACTION_COMPLETED.equals(action))
+        {
+            participantCompleted = true ;
+            notifyAll() ;
+        }
+        else if (participantCompleted && lastAction.equals(action))
+        {
+            success() ;
+        }
+        return false ;
+    }
+    
+    /**
+     * Wait for the participant to complete.
+     * @param timeout The timeout.
+     * @return true if the participant has completed, false otherwise.
+     */
+    public boolean waitForParticipantCompleted(final long timeout)
+    {
+	final long endTime = System.currentTimeMillis() + timeout ;
+	final boolean result ;
+	synchronized(this)
+	{
+	    while(!participantCompleted)
+	    {
+		final long currentTimeout = endTime - System.currentTimeMillis() ;
+		if (currentTimeout <= 0)
+		{
+		    break ;
+		}
+                try
+                {
+                    wait(currentTimeout) ;
+                }
+                catch (final InterruptedException ie) {}
+	    }
+	    
+	    result = participantCompleted ;
+	}
+	
+	if (result)
+	{
+	    // If it is completd then wait to allow processing of message.
+	    try
+	    {
+		Thread.sleep(2000) ;
+	    }
+	    catch (final InterruptedException ie) {}
+	}
+	return result ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropUnsolicitedCompleteState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropUnsolicitedCompleteState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropUnsolicitedCompleteState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,103 +0,0 @@
-package com.jboss.transaction.txinterop.interop.states;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
-import com.arjuna.webservices11.wscoor.CoordinationConstants;
-import com.jboss.transaction.txinterop.proxy.BaseHandler;
-
-
-/**
- * A conversation state for unsolicited complete.
- */
-public class BAInteropUnsolicitedCompleteState extends InteropWaitState
-{
-    /**
-     * The replaced flag.
-     */
-    private boolean replaced ;
-    
-    /**
-     * Construct the unsolicited complete state.
-     */
-    public BAInteropUnsolicitedCompleteState()
-    {
-	super(CoordinationConstants.WSCOOR_ACTION_FAULT) ;
-    }
-    
-    /**
-     * Get the Handler for rewriting the XML.
-     * @param nextHandler The next handler in the sequence.
-     * @return The handler or null if no rewriting required.
-     */
-    public ContentHandler getHandler(final ContentHandler nextHandler)
-    {
-	return (replaced ? null : new RegistrationHandler(nextHandler)) ;
-    }
-    
-    /**
-     * The registration handler.
-     */
-    private final class RegistrationHandler extends BaseHandler
-    {
-        /**
-         * The 'in register' flag.
-         */
-        private boolean inRegister ;
-        /**
-         * The 'in protocol identifier' flag.
-         */
-        private boolean inProtocolIdentifier ;
-        
-        /**
-         * Construct the registration handler.
-         * @param nextHandler The next handler.
-         */
-	RegistrationHandler(final ContentHandler nextHandler)
-	{
-	    super(nextHandler) ;
-	}
-	
-	public void startElement(final String uri, final String localName, final String qName, final Attributes attributes)
-	    throws SAXException
-	{
-	    if (CoordinationConstants.WSCOOR_NAMESPACE.equals(uri) && CoordinationConstants.WSCOOR_ELEMENT_REGISTER.equals(localName))
-	    {
-		inRegister = true ;
-	    }
-	    else if (inRegister && CoordinationConstants.WSCOOR_NAMESPACE.equals(uri) && CoordinationConstants.WSCOOR_ELEMENT_PROTOCOL_IDENTIFIER.equals(localName))
-	    {
-		inProtocolIdentifier = true ;
-	    }
-	    super.startElement(uri, localName, qName, attributes);
-	}
-	
-	public void endElement(final String uri, final String localName, final String qName)
-	    throws SAXException
-	{
-	    if (inProtocolIdentifier && CoordinationConstants.WSCOOR_NAMESPACE.equals(uri) && CoordinationConstants.WSCOOR_ELEMENT_PROTOCOL_IDENTIFIER.equals(localName))
-	    {
-		inProtocolIdentifier = false ;
-		final char[] chars = BusinessActivityConstants.WSBA_SUB_PROTOCOL_COORDINATOR_COMPLETION.toCharArray() ;
-		getNextHandler().characters(chars, 0, chars.length) ;
-	    }
-	    else if (inRegister && CoordinationConstants.WSCOOR_NAMESPACE.equals(uri) && CoordinationConstants.WSCOOR_ELEMENT_REGISTER.equals(localName))
-	    {
-		inRegister = false ;
-	    }
-	    super.endElement(uri, localName, qName);
-	}
-	
-	public void characters(final char[] chars, final int start, final int length)
-	    throws SAXException
-	{
-	    if (!inProtocolIdentifier)
-	    {
-		super.characters(chars, start, length);
-	    }
-	}
-	
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropUnsolicitedCompleteState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropUnsolicitedCompleteState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropUnsolicitedCompleteState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BAInteropUnsolicitedCompleteState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop.states;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+import com.arjuna.webservices11.wsba.BusinessActivityConstants;
+import com.arjuna.webservices11.wscoor.CoordinationConstants;
+import com.jboss.transaction.txinterop.proxy.BaseHandler;
+
+
+/**
+ * A conversation state for unsolicited complete.
+ */
+public class BAInteropUnsolicitedCompleteState extends InteropWaitState
+{
+    /**
+     * The replaced flag.
+     */
+    private boolean replaced ;
+    
+    /**
+     * Construct the unsolicited complete state.
+     */
+    public BAInteropUnsolicitedCompleteState()
+    {
+	super(CoordinationConstants.WSCOOR_ACTION_FAULT) ;
+    }
+    
+    /**
+     * Get the Handler for rewriting the XML.
+     * @param nextHandler The next handler in the sequence.
+     * @return The handler or null if no rewriting required.
+     */
+    public ContentHandler getHandler(final ContentHandler nextHandler)
+    {
+	return (replaced ? null : new RegistrationHandler(nextHandler)) ;
+    }
+    
+    /**
+     * The registration handler.
+     */
+    private final class RegistrationHandler extends BaseHandler
+    {
+        /**
+         * The 'in register' flag.
+         */
+        private boolean inRegister ;
+        /**
+         * The 'in protocol identifier' flag.
+         */
+        private boolean inProtocolIdentifier ;
+        
+        /**
+         * Construct the registration handler.
+         * @param nextHandler The next handler.
+         */
+	RegistrationHandler(final ContentHandler nextHandler)
+	{
+	    super(nextHandler) ;
+	}
+	
+	public void startElement(final String uri, final String localName, final String qName, final Attributes attributes)
+	    throws SAXException
+	{
+	    if (CoordinationConstants.WSCOOR_NAMESPACE.equals(uri) && CoordinationConstants.WSCOOR_ELEMENT_REGISTER.equals(localName))
+	    {
+		inRegister = true ;
+	    }
+	    else if (inRegister && CoordinationConstants.WSCOOR_NAMESPACE.equals(uri) && CoordinationConstants.WSCOOR_ELEMENT_PROTOCOL_IDENTIFIER.equals(localName))
+	    {
+		inProtocolIdentifier = true ;
+	    }
+	    super.startElement(uri, localName, qName, attributes);
+	}
+	
+	public void endElement(final String uri, final String localName, final String qName)
+	    throws SAXException
+	{
+	    if (inProtocolIdentifier && CoordinationConstants.WSCOOR_NAMESPACE.equals(uri) && CoordinationConstants.WSCOOR_ELEMENT_PROTOCOL_IDENTIFIER.equals(localName))
+	    {
+		inProtocolIdentifier = false ;
+		final char[] chars = BusinessActivityConstants.WSBA_SUB_PROTOCOL_COORDINATOR_COMPLETION.toCharArray() ;
+		getNextHandler().characters(chars, 0, chars.length) ;
+	    }
+	    else if (inRegister && CoordinationConstants.WSCOOR_NAMESPACE.equals(uri) && CoordinationConstants.WSCOOR_ELEMENT_REGISTER.equals(localName))
+	    {
+		inRegister = false ;
+	    }
+	    super.endElement(uri, localName, qName);
+	}
+	
+	public void characters(final char[] chars, final int start, final int length)
+	    throws SAXException
+	{
+	    if (!inProtocolIdentifier)
+	    {
+		super.characters(chars, start, length);
+	    }
+	}
+	
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BaseState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BaseState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BaseState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,97 +0,0 @@
-package com.jboss.transaction.txinterop.interop.states;
-
-import org.xml.sax.ContentHandler;
-
-import com.jboss.transaction.txinterop.proxy.ProxyConversationState;
-
-/**
- * The base state class for proxy conversations.
- */
-abstract class BaseState implements ProxyConversationState
-{
-    /**
-     * The complete flag.
-     */
-    private boolean complete ;
-    /**
-     * The success flag.
-     */
-    private boolean success ;
-    
-    /**
-     * Mark the conversation as successfully completed.
-     */
-    protected synchronized void success()
-    {
-        if (!complete)
-        {
-            System.out.println("KEV: success!") ;
-            complete = true ;
-            success = true ;
-            notifyAll() ;
-        }
-        else
-        {
-            System.out.println("KEV: AAAAAARRRRRRRGGGGGGGHHHHHHHHH, multiple successes called for conversation!") ;
-        }
-    }
-    
-    /**
-     * Wait a specified period for the conversation to complete.
-     * @param timeout The timeout period of the conversation.
-     */
-    public synchronized void waitForCompletion(final long timeout)
-    {
-        if (!complete && (timeout > 0))
-        {
-            final long end = System.currentTimeMillis() + timeout ;
-            do
-            {
-                final long delay = end - System.currentTimeMillis() ;
-                if (delay > 0)
-                {
-                    try
-                    {
-                        wait(delay) ;
-                    }
-                    catch (final InterruptedException ie) {} // ignore
-                }
-                else
-                {
-                    break ;
-                }
-            }
-            while(!complete) ;
-        }
-        
-        complete = true ;
-    }
-    
-    /**
-     * Has the conversation complete?
-     * @return true if the conversation has complete, false otherwise.
-     */
-    public synchronized boolean isComplete()
-    {
-        return complete ;
-    }
-    
-    /**
-     * Was the conversation successful?
-     * @return true if the conversation was successful, false otherwise.
-     */
-    public synchronized boolean isSuccessful()
-    {
-        return success ;
-    }
-
-    /**
-     * Get the Handler for rewriting the XML.
-     * @param nextHandler The next handler in the sequence.
-     * @return The handler or null if no rewriting required.
-     */
-    public ContentHandler getHandler(final ContentHandler nextHandler)
-    {
-	return null ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BaseState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BaseState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BaseState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/BaseState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop.states;
+
+import org.xml.sax.ContentHandler;
+
+import com.jboss.transaction.txinterop.proxy.ProxyConversationState;
+
+/**
+ * The base state class for proxy conversations.
+ */
+abstract class BaseState implements ProxyConversationState
+{
+    /**
+     * The complete flag.
+     */
+    private boolean complete ;
+    /**
+     * The success flag.
+     */
+    private boolean success ;
+    
+    /**
+     * Mark the conversation as successfully completed.
+     */
+    protected synchronized void success()
+    {
+        if (!complete)
+        {
+            System.out.println("KEV: success!") ;
+            complete = true ;
+            success = true ;
+            notifyAll() ;
+        }
+        else
+        {
+            System.out.println("KEV: AAAAAARRRRRRRGGGGGGGHHHHHHHHH, multiple successes called for conversation!") ;
+        }
+    }
+    
+    /**
+     * Wait a specified period for the conversation to complete.
+     * @param timeout The timeout period of the conversation.
+     */
+    public synchronized void waitForCompletion(final long timeout)
+    {
+        if (!complete && (timeout > 0))
+        {
+            final long end = System.currentTimeMillis() + timeout ;
+            do
+            {
+                final long delay = end - System.currentTimeMillis() ;
+                if (delay > 0)
+                {
+                    try
+                    {
+                        wait(delay) ;
+                    }
+                    catch (final InterruptedException ie) {} // ignore
+                }
+                else
+                {
+                    break ;
+                }
+            }
+            while(!complete) ;
+        }
+        
+        complete = true ;
+    }
+    
+    /**
+     * Has the conversation complete?
+     * @return true if the conversation has complete, false otherwise.
+     */
+    public synchronized boolean isComplete()
+    {
+        return complete ;
+    }
+    
+    /**
+     * Was the conversation successful?
+     * @return true if the conversation was successful, false otherwise.
+     */
+    public synchronized boolean isSuccessful()
+    {
+        return success ;
+    }
+
+    /**
+     * Get the Handler for rewriting the XML.
+     * @param nextHandler The next handler in the sequence.
+     * @return The handler or null if no rewriting required.
+     */
+    public ContentHandler getHandler(final ContentHandler nextHandler)
+    {
+	return null ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/InteropWaitState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/InteropWaitState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/InteropWaitState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,54 +0,0 @@
-package com.jboss.transaction.txinterop.interop.states;
-
-/**
- * A conversation state that waits for a specified action before completing.
- */
-public class InteropWaitState extends BaseState
-{
-    /**
-     * The last action.
-     */
-    private final String lastAction ;
-    /**
-     * The action count.
-     */
-    private int count ;
-    
-    /**
-     * Construct the conversation state.
-     * @param lastAction The last action of the conversation.
-     */
-    public InteropWaitState(final String lastAction)
-    {
-        this(lastAction, 1) ;
-    }
-    
-    /**
-     * Construct the conversation state.
-     * @param lastAction The last action of the conversation.
-     * @param count The occurrance to trigger on.
-     */
-    public InteropWaitState(final String lastAction, final int count)
-    {
-        this.lastAction = lastAction ;
-        this.count = count ;
-    }
-    
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public boolean handleAction(final String action, final String identifier)
-    {
-        if (lastAction.equals(action))
-        {
-            if (--count == 0)
-            {
-                success() ;
-            }
-        }
-        return false ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/InteropWaitState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/InteropWaitState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/InteropWaitState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/interop/states/InteropWaitState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.interop.states;
+
+/**
+ * A conversation state that waits for a specified action before completing.
+ */
+public class InteropWaitState extends BaseState
+{
+    /**
+     * The last action.
+     */
+    private final String lastAction ;
+    /**
+     * The action count.
+     */
+    private int count ;
+    
+    /**
+     * Construct the conversation state.
+     * @param lastAction The last action of the conversation.
+     */
+    public InteropWaitState(final String lastAction)
+    {
+        this(lastAction, 1) ;
+    }
+    
+    /**
+     * Construct the conversation state.
+     * @param lastAction The last action of the conversation.
+     * @param count The occurrance to trigger on.
+     */
+    public InteropWaitState(final String lastAction, final int count)
+    {
+        this.lastAction = lastAction ;
+        this.count = count ;
+    }
+    
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public boolean handleAction(final String action, final String identifier)
+    {
+        if (lastAction.equals(action))
+        {
+            if (--count == 0)
+            {
+                success() ;
+            }
+        }
+        return false ;
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingConstants.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,308 +0,0 @@
-package com.jboss.transaction.txinterop.proxy;
-
-import javax.xml.namespace.QName;
-
-/**
- * constants used in WS Addressing 2005/08
- */
-public class AddressingConstants {
-    /**
-     * The Namespace.
-     */
-    public static String WSA_NAMESPACE = "http://www.w3.org/2005/08/addressing" ;
-    /**
-     * The Attribute Namespace.
-     */
-    public static String WSA_ATTRIBUTE_NAMESPACE = "" ;
-    /**
-     * The namespace prefix.
-     */
-    public static String WSA_PREFIX = "wsa" ;
-    /**
-     * The attribute namespace prefix.
-     */
-    public static String WSA_ATTRIBUTE_PREFIX = "" ;
-
-    /**
-     * The Action element.
-     */
-    public static String WSA_ELEMENT_ACTION = "Action" ;
-    /**
-     * The Action QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_ACTION, WSA_PREFIX) ;
-    /**
-     * The Endpoint Reference element.
-     */
-    public static String WSA_ELEMENT_ENDPOINT_REFERENCE = "EndpointReference" ;
-    /**
-     * The Endpoint Reference QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_ENDPOINT_REFERENCE = new QName(WSA_NAMESPACE, WSA_ELEMENT_ENDPOINT_REFERENCE, WSA_PREFIX) ;
-    /**
-     * The Fault To element.
-     */
-    public static String WSA_ELEMENT_FAULT_TO = "FaultTo" ;
-    /**
-     * The Fault To QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_FAULT_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_FAULT_TO, WSA_PREFIX) ;
-    /**
-     * The From element.
-     */
-    public static String WSA_ELEMENT_FROM = "From" ;
-    /**
-     * The From QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_FROM = new QName(WSA_NAMESPACE, WSA_ELEMENT_FROM, WSA_PREFIX) ;
-    /**
-     * The Message ID element.
-     */
-    public static String WSA_ELEMENT_MESSAGE_ID = "MessageID" ;
-    /**
-     * The Message ID QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_MESSAGE_ID = new QName(WSA_NAMESPACE, WSA_ELEMENT_MESSAGE_ID, WSA_PREFIX) ;
-    /**
-     * The Relates To element.
-     */
-    public static String WSA_ELEMENT_RELATES_TO = "RelatesTo" ;
-    /**
-     * The Relates To QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_RELATES_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_RELATES_TO, WSA_PREFIX) ;
-    /**
-     * The Reply To element.
-     */
-    public static String WSA_ELEMENT_REPLY_TO = "ReplyTo" ;
-    /**
-     * The Reply To QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_REPLY_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_REPLY_TO, WSA_PREFIX) ;
-    /**
-     * The To element.
-     */
-    public static String WSA_ELEMENT_TO = "To" ;
-    /**
-     * The To QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_TO, WSA_PREFIX) ;
-    /**
-     * The Address element.
-     */
-    public static String WSA_ELEMENT_ADDRESS = "Address" ;
-    /**
-     * The Address QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_ADDRESS = new QName(WSA_NAMESPACE, WSA_ELEMENT_ADDRESS, WSA_PREFIX) ;
-    /**
-     * The Reference Parameters element.
-     */
-    public static String WSA_ELEMENT_REFERENCE_PARAMETERS = "ReferenceParameters" ;
-    /**
-     * The Reference Parameters QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_REFERENCE_PARAMETERS = new QName(WSA_NAMESPACE, WSA_ELEMENT_REFERENCE_PARAMETERS, WSA_PREFIX) ;
-    /**
-     * The Metadata element.
-     */
-    public static String WSA_ELEMENT_METADATA = "Metadata" ;
-    /**
-     * The Metadata QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_METADATA = new QName(WSA_NAMESPACE, WSA_ELEMENT_METADATA, WSA_PREFIX) ;
-
-    /**
-     * The Relationship Type attribute.
-     */
-    public static String WSA_ATTRIBUTE_RELATIONSHIP_TYPE = "RelationshipType" ;
-    /**
-     * The Relationship Type QName.
-     */
-    public static QName WSA_ATTRIBUTE_QNAME_RELATIONSHIP_TYPE = new QName(WSA_ATTRIBUTE_NAMESPACE, WSA_ATTRIBUTE_RELATIONSHIP_TYPE, WSA_ATTRIBUTE_PREFIX) ;
-
-    /**
-     * The value of the Action element for faults.
-     */
-    public static String WSA_ACTION_FAULT = WSA_NAMESPACE + "/fault" ;
-    /**
-     * The value of the Action element for SOAP faults.
-     */
-    public static String WSA_ACTION_SOAP_FAULT = WSA_NAMESPACE + "/soap/fault" ;
-
-    /**
-     * The unspecified Message ID for use in relationships.
-     * KEV check
-     */
-    public static String WSA_MESSAGE_ID_UNSPECIFIED = WSA_NAMESPACE + "/unspecified" ;
-
-    /**
-     * The address URI representing an anonymous endpoint.
-     */
-    public static String WSA_ADDRESS_ANONYMOUS = WSA_NAMESPACE + "/anonymous" ;
-    /**
-     * The address URI representing the none endpoint.
-     */
-    public static String WSA_ADDRESS_NONE = WSA_NAMESPACE + "/none" ;
-
-    /**
-     * The relates to reply URI.
-     */
-    public static String WSA_RELATES_TO_REPLY = WSA_NAMESPACE + "/reply" ;
-
-    /**
-     * The Is Reference Parameter attribute.
-     */
-    public static String WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER = "IsReferenceParameter" ;
-    /**
-     * The Is Reference Parameter QName.
-     */
-    public static QName WSA_ATTRIBUTE_QNAME_IS_REFERENCE_PARAMETER = new QName(WSA_NAMESPACE, WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER, WSA_PREFIX) ;
-
-    /**
-     * The Fault Detail element.
-     */
-    public static String WSA_ELEMENT_FAULT_DETAIL = "FaultDetail" ;
-    /**
-     * The Fault Detail QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_FAULT_DETAIL = new QName(WSA_NAMESPACE, WSA_ELEMENT_FAULT_DETAIL, WSA_PREFIX) ;
-
-    /**
-     * The Invalid Addressing Header fault code.
-     */
-    public static String WSA_FAULT_CODE_INVALID_ADDRESSING_HEADER = "InvalidAddressingHeader" ;
-    /**
-     * The Invalid Addressing Header fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_INVALID_ADDRESSING_HEADER = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_ADDRESSING_HEADER, WSA_PREFIX) ;
-    /**
-     * The Invalid Address fault code.
-     */
-    public static String WSA_FAULT_CODE_INVALID_ADDRESS = "InvalidAddress" ;
-    /**
-     * The Invalid Address fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_INVALID_ADDRESS = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_ADDRESS, WSA_PREFIX) ;
-    /**
-     * The Invalid EPR fault code.
-     */
-    public static String WSA_FAULT_CODE_INVALID_EPR = "InvalidEPR" ;
-    /**
-     * The Invalid EPR fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_INVALID_EPR = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_EPR, WSA_PREFIX) ;
-    /**
-     * The Invalid Cardinality fault code.
-     */
-    public static String WSA_FAULT_CODE_INVALID_CARDINALITY = "InvalidCardinality" ;
-    /**
-     * The Invalid Cardinality fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_INVALID_CARDINALITY = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_CARDINALITY, WSA_PREFIX) ;
-    /**
-     * The Missing Address In EPR fault code.
-     */
-    public static String WSA_FAULT_CODE_MISSING_ADDRESS_IN_EPR = "MissingAddressInEPR" ;
-    /**
-     * The Missing Address In EPR fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_MISSING_ADDRESS_IN_EPR = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_MISSING_ADDRESS_IN_EPR, WSA_PREFIX) ;
-    /**
-     * The Duplicate Message ID fault code.
-     */
-    public static String WSA_FAULT_CODE_DUPLICATE_MESSAGE_ID = "DuplicateMessageID" ;
-    /**
-     * The Duplicate Message ID fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_DUPLICATE_MESSAGE_ID = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_DUPLICATE_MESSAGE_ID, WSA_PREFIX) ;
-    /**
-     * The Action Mismatch fault code.
-     */
-    public static String WSA_FAULT_CODE_ACTION_MISMATCH = "ActionMismatch" ;
-    /**
-     * The Action Mismatch fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_ACTION_MISMATCH = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ACTION_MISMATCH, WSA_PREFIX) ;
-    /**
-     * The Message Addressing Header Required fault code.
-     */
-    public static String WSA_FAULT_CODE_MESSAGING_ADDRESSING_HEADER_REQUIRED = "MessageAddressingHeaderRequired" ;
-    /**
-     * The Message Addressing Header Required fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_MESSAGING_ADDRESSING_HEADER_REQUIRED = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_MESSAGING_ADDRESSING_HEADER_REQUIRED, WSA_PREFIX) ;
-    /**
-     * The Destination Unreachable fault code.
-     */
-    public static String WSA_FAULT_CODE_DESTINATION_UNREACHABLE = "DestinationUnreachable" ;
-    /**
-     * The Destination Unreachable fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_DESTINATION_UNREACHABLE = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_DESTINATION_UNREACHABLE, WSA_PREFIX) ;
-    /**
-     * The Action Not Supported fault code.
-     */
-    public static String WSA_FAULT_CODE_ACTION_NOT_SUPPORTED = "ActionNotSupported" ;
-    /**
-     * The Action Not Supported fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_ACTION_NOT_SUPPORTED = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ACTION_NOT_SUPPORTED, WSA_PREFIX) ;
-    /**
-     * The Endpoint Unavailable fault code.
-     */
-    public static String WSA_FAULT_CODE_ENDPOINT_UNAVAILABLE = "EndpointUnavailable" ;
-    /**
-     * The Endpoint Unavailable fault code QName.
-     */
-    public static QName WSA_FAULT_CODE_QNAME_ENDPOINT_UNAVAILABLE = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ENDPOINT_UNAVAILABLE, WSA_PREFIX) ;
-
-    /**
-     * The Problem Header element.
-     */
-    public static String WSA_ELEMENT_PROBLEM_HEADER = "ProblemHeader" ;
-    /**
-     * The Problem Header QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_PROBLEM_HEADER = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_HEADER, WSA_PREFIX) ;
-    /**
-     * The Problem Header QName element.
-     */
-    public static String WSA_ELEMENT_PROBLEM_HEADER_QNAME = "ProblemHeaderQName" ;
-    /**
-     * The Problem Header QName QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_PROBLEM_HEADER_QNAME = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_HEADER_QNAME, WSA_PREFIX) ;
-    /**
-     * The Problem IRI element.
-     */
-    public static String WSA_ELEMENT_PROBLEM_IRI = "ProblemIRI" ;
-    /**
-     * The Problem IRI QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_PROBLEM_IRI = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_IRI, WSA_PREFIX) ;
-    /**
-     * The Problem Action element.
-     */
-    public static String WSA_ELEMENT_PROBLEM_ACTION = "ProblemAction" ;
-    /**
-     * The Problem Action QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_PROBLEM_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_ACTION, WSA_PREFIX) ;
-    /**
-     * The Soap Action element.
-     */
-    public static String WSA_ELEMENT_SOAP_ACTION = "SoapAction" ;
-    /**
-     * The Soap Action QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_SOAP_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_SOAP_ACTION, WSA_PREFIX) ;
-    /**
-     * The Retry After element.
-     */
-    public static String WSA_ELEMENT_RETRY_AFTER = "RetryAfter" ;
-    /**
-     * The Retry After QName.
-     */
-    public static QName WSA_ELEMENT_QNAME_RETRY_AFTER = new QName(WSA_NAMESPACE, WSA_ELEMENT_METADATA, WSA_PREFIX) ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingConstants.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingConstants.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingConstants.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,328 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.proxy;
+
+import javax.xml.namespace.QName;
+
+/**
+ * constants used in WS Addressing 2005/08
+ */
+public class AddressingConstants {
+    /**
+     * The Namespace.
+     */
+    public static String WSA_NAMESPACE = "http://www.w3.org/2005/08/addressing" ;
+    /**
+     * The Attribute Namespace.
+     */
+    public static String WSA_ATTRIBUTE_NAMESPACE = "" ;
+    /**
+     * The namespace prefix.
+     */
+    public static String WSA_PREFIX = "wsa" ;
+    /**
+     * The attribute namespace prefix.
+     */
+    public static String WSA_ATTRIBUTE_PREFIX = "" ;
+
+    /**
+     * The Action element.
+     */
+    public static String WSA_ELEMENT_ACTION = "Action" ;
+    /**
+     * The Action QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_ACTION, WSA_PREFIX) ;
+    /**
+     * The Endpoint Reference element.
+     */
+    public static String WSA_ELEMENT_ENDPOINT_REFERENCE = "EndpointReference" ;
+    /**
+     * The Endpoint Reference QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_ENDPOINT_REFERENCE = new QName(WSA_NAMESPACE, WSA_ELEMENT_ENDPOINT_REFERENCE, WSA_PREFIX) ;
+    /**
+     * The Fault To element.
+     */
+    public static String WSA_ELEMENT_FAULT_TO = "FaultTo" ;
+    /**
+     * The Fault To QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_FAULT_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_FAULT_TO, WSA_PREFIX) ;
+    /**
+     * The From element.
+     */
+    public static String WSA_ELEMENT_FROM = "From" ;
+    /**
+     * The From QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_FROM = new QName(WSA_NAMESPACE, WSA_ELEMENT_FROM, WSA_PREFIX) ;
+    /**
+     * The Message ID element.
+     */
+    public static String WSA_ELEMENT_MESSAGE_ID = "MessageID" ;
+    /**
+     * The Message ID QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_MESSAGE_ID = new QName(WSA_NAMESPACE, WSA_ELEMENT_MESSAGE_ID, WSA_PREFIX) ;
+    /**
+     * The Relates To element.
+     */
+    public static String WSA_ELEMENT_RELATES_TO = "RelatesTo" ;
+    /**
+     * The Relates To QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_RELATES_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_RELATES_TO, WSA_PREFIX) ;
+    /**
+     * The Reply To element.
+     */
+    public static String WSA_ELEMENT_REPLY_TO = "ReplyTo" ;
+    /**
+     * The Reply To QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_REPLY_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_REPLY_TO, WSA_PREFIX) ;
+    /**
+     * The To element.
+     */
+    public static String WSA_ELEMENT_TO = "To" ;
+    /**
+     * The To QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_TO = new QName(WSA_NAMESPACE, WSA_ELEMENT_TO, WSA_PREFIX) ;
+    /**
+     * The Address element.
+     */
+    public static String WSA_ELEMENT_ADDRESS = "Address" ;
+    /**
+     * The Address QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_ADDRESS = new QName(WSA_NAMESPACE, WSA_ELEMENT_ADDRESS, WSA_PREFIX) ;
+    /**
+     * The Reference Parameters element.
+     */
+    public static String WSA_ELEMENT_REFERENCE_PARAMETERS = "ReferenceParameters" ;
+    /**
+     * The Reference Parameters QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_REFERENCE_PARAMETERS = new QName(WSA_NAMESPACE, WSA_ELEMENT_REFERENCE_PARAMETERS, WSA_PREFIX) ;
+    /**
+     * The Metadata element.
+     */
+    public static String WSA_ELEMENT_METADATA = "Metadata" ;
+    /**
+     * The Metadata QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_METADATA = new QName(WSA_NAMESPACE, WSA_ELEMENT_METADATA, WSA_PREFIX) ;
+
+    /**
+     * The Relationship Type attribute.
+     */
+    public static String WSA_ATTRIBUTE_RELATIONSHIP_TYPE = "RelationshipType" ;
+    /**
+     * The Relationship Type QName.
+     */
+    public static QName WSA_ATTRIBUTE_QNAME_RELATIONSHIP_TYPE = new QName(WSA_ATTRIBUTE_NAMESPACE, WSA_ATTRIBUTE_RELATIONSHIP_TYPE, WSA_ATTRIBUTE_PREFIX) ;
+
+    /**
+     * The value of the Action element for faults.
+     */
+    public static String WSA_ACTION_FAULT = WSA_NAMESPACE + "/fault" ;
+    /**
+     * The value of the Action element for SOAP faults.
+     */
+    public static String WSA_ACTION_SOAP_FAULT = WSA_NAMESPACE + "/soap/fault" ;
+
+    /**
+     * The unspecified Message ID for use in relationships.
+     * KEV check
+     */
+    public static String WSA_MESSAGE_ID_UNSPECIFIED = WSA_NAMESPACE + "/unspecified" ;
+
+    /**
+     * The address URI representing an anonymous endpoint.
+     */
+    public static String WSA_ADDRESS_ANONYMOUS = WSA_NAMESPACE + "/anonymous" ;
+    /**
+     * The address URI representing the none endpoint.
+     */
+    public static String WSA_ADDRESS_NONE = WSA_NAMESPACE + "/none" ;
+
+    /**
+     * The relates to reply URI.
+     */
+    public static String WSA_RELATES_TO_REPLY = WSA_NAMESPACE + "/reply" ;
+
+    /**
+     * The Is Reference Parameter attribute.
+     */
+    public static String WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER = "IsReferenceParameter" ;
+    /**
+     * The Is Reference Parameter QName.
+     */
+    public static QName WSA_ATTRIBUTE_QNAME_IS_REFERENCE_PARAMETER = new QName(WSA_NAMESPACE, WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER, WSA_PREFIX) ;
+
+    /**
+     * The Fault Detail element.
+     */
+    public static String WSA_ELEMENT_FAULT_DETAIL = "FaultDetail" ;
+    /**
+     * The Fault Detail QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_FAULT_DETAIL = new QName(WSA_NAMESPACE, WSA_ELEMENT_FAULT_DETAIL, WSA_PREFIX) ;
+
+    /**
+     * The Invalid Addressing Header fault code.
+     */
+    public static String WSA_FAULT_CODE_INVALID_ADDRESSING_HEADER = "InvalidAddressingHeader" ;
+    /**
+     * The Invalid Addressing Header fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_INVALID_ADDRESSING_HEADER = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_ADDRESSING_HEADER, WSA_PREFIX) ;
+    /**
+     * The Invalid Address fault code.
+     */
+    public static String WSA_FAULT_CODE_INVALID_ADDRESS = "InvalidAddress" ;
+    /**
+     * The Invalid Address fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_INVALID_ADDRESS = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_ADDRESS, WSA_PREFIX) ;
+    /**
+     * The Invalid EPR fault code.
+     */
+    public static String WSA_FAULT_CODE_INVALID_EPR = "InvalidEPR" ;
+    /**
+     * The Invalid EPR fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_INVALID_EPR = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_EPR, WSA_PREFIX) ;
+    /**
+     * The Invalid Cardinality fault code.
+     */
+    public static String WSA_FAULT_CODE_INVALID_CARDINALITY = "InvalidCardinality" ;
+    /**
+     * The Invalid Cardinality fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_INVALID_CARDINALITY = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_INVALID_CARDINALITY, WSA_PREFIX) ;
+    /**
+     * The Missing Address In EPR fault code.
+     */
+    public static String WSA_FAULT_CODE_MISSING_ADDRESS_IN_EPR = "MissingAddressInEPR" ;
+    /**
+     * The Missing Address In EPR fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_MISSING_ADDRESS_IN_EPR = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_MISSING_ADDRESS_IN_EPR, WSA_PREFIX) ;
+    /**
+     * The Duplicate Message ID fault code.
+     */
+    public static String WSA_FAULT_CODE_DUPLICATE_MESSAGE_ID = "DuplicateMessageID" ;
+    /**
+     * The Duplicate Message ID fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_DUPLICATE_MESSAGE_ID = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_DUPLICATE_MESSAGE_ID, WSA_PREFIX) ;
+    /**
+     * The Action Mismatch fault code.
+     */
+    public static String WSA_FAULT_CODE_ACTION_MISMATCH = "ActionMismatch" ;
+    /**
+     * The Action Mismatch fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_ACTION_MISMATCH = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ACTION_MISMATCH, WSA_PREFIX) ;
+    /**
+     * The Message Addressing Header Required fault code.
+     */
+    public static String WSA_FAULT_CODE_MESSAGING_ADDRESSING_HEADER_REQUIRED = "MessageAddressingHeaderRequired" ;
+    /**
+     * The Message Addressing Header Required fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_MESSAGING_ADDRESSING_HEADER_REQUIRED = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_MESSAGING_ADDRESSING_HEADER_REQUIRED, WSA_PREFIX) ;
+    /**
+     * The Destination Unreachable fault code.
+     */
+    public static String WSA_FAULT_CODE_DESTINATION_UNREACHABLE = "DestinationUnreachable" ;
+    /**
+     * The Destination Unreachable fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_DESTINATION_UNREACHABLE = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_DESTINATION_UNREACHABLE, WSA_PREFIX) ;
+    /**
+     * The Action Not Supported fault code.
+     */
+    public static String WSA_FAULT_CODE_ACTION_NOT_SUPPORTED = "ActionNotSupported" ;
+    /**
+     * The Action Not Supported fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_ACTION_NOT_SUPPORTED = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ACTION_NOT_SUPPORTED, WSA_PREFIX) ;
+    /**
+     * The Endpoint Unavailable fault code.
+     */
+    public static String WSA_FAULT_CODE_ENDPOINT_UNAVAILABLE = "EndpointUnavailable" ;
+    /**
+     * The Endpoint Unavailable fault code QName.
+     */
+    public static QName WSA_FAULT_CODE_QNAME_ENDPOINT_UNAVAILABLE = new QName(WSA_NAMESPACE, WSA_FAULT_CODE_ENDPOINT_UNAVAILABLE, WSA_PREFIX) ;
+
+    /**
+     * The Problem Header element.
+     */
+    public static String WSA_ELEMENT_PROBLEM_HEADER = "ProblemHeader" ;
+    /**
+     * The Problem Header QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_PROBLEM_HEADER = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_HEADER, WSA_PREFIX) ;
+    /**
+     * The Problem Header QName element.
+     */
+    public static String WSA_ELEMENT_PROBLEM_HEADER_QNAME = "ProblemHeaderQName" ;
+    /**
+     * The Problem Header QName QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_PROBLEM_HEADER_QNAME = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_HEADER_QNAME, WSA_PREFIX) ;
+    /**
+     * The Problem IRI element.
+     */
+    public static String WSA_ELEMENT_PROBLEM_IRI = "ProblemIRI" ;
+    /**
+     * The Problem IRI QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_PROBLEM_IRI = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_IRI, WSA_PREFIX) ;
+    /**
+     * The Problem Action element.
+     */
+    public static String WSA_ELEMENT_PROBLEM_ACTION = "ProblemAction" ;
+    /**
+     * The Problem Action QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_PROBLEM_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_PROBLEM_ACTION, WSA_PREFIX) ;
+    /**
+     * The Soap Action element.
+     */
+    public static String WSA_ELEMENT_SOAP_ACTION = "SoapAction" ;
+    /**
+     * The Soap Action QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_SOAP_ACTION = new QName(WSA_NAMESPACE, WSA_ELEMENT_SOAP_ACTION, WSA_PREFIX) ;
+    /**
+     * The Retry After element.
+     */
+    public static String WSA_ELEMENT_RETRY_AFTER = "RetryAfter" ;
+    /**
+     * The Retry After QName.
+     */
+    public static QName WSA_ELEMENT_QNAME_RETRY_AFTER = new QName(WSA_NAMESPACE, WSA_ELEMENT_METADATA, WSA_PREFIX) ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingProxySAXHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingProxySAXHandler.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingProxySAXHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,177 +0,0 @@
-/*
- * Created on 20-Jan-2005
- */
-package com.jboss.transaction.txinterop.proxy;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-
-import com.jboss.transaction.txinterop.proxy.AddressingConstants;
-import com.arjuna.webservices.wsarj.ArjunaConstants;
-
-/**
- * Sax parser for rewriting the XML via the proxy.
- * @author kevin
- */
-public class AddressingProxySAXHandler extends BaseHandler
-{
-    /**
-     * The WS-Addressing namespace URI.
-     */
-    private static final String WSA_NAMESPACE_URI = AddressingConstants.WSA_NAMESPACE ;
-    /**
-     * The WS-Addressing To element.
-     */
-    private static final String WSA_ELEMENT_TO = AddressingConstants.WSA_ELEMENT_TO ;
-    /**
-     * The WS-Addressing Address element.
-     */
-    private static final String WSA_ELEMENT_ADDRESS = AddressingConstants.WSA_ELEMENT_ADDRESS ;
-    
-    /**
-     * Are we in a rewrite element?
-     */
-    private boolean inRewriteElement ;
-    /**
-     * Are we in a to element?
-     */
-    private boolean inToElement ;
-    /**
-     * Are we in an identifier element?
-     */
-    private boolean inIdentifierElement ;
-    /**
-     * The to address.
-     */
-    private String toAddress ;
-    /**
-     * The identifier.
-     */
-    private String identifier ;
-    /**
-     * The string buffer for text element content.
-     */
-    private StringBuffer characterContent = new StringBuffer() ;
-    
-    /**
-     * The current conversation identifier.
-     */
-    private final String conversationIdentifier ;
-    
-    /**
-     * Construct the SAX handler with the output writer.
-     * @param nextHandler The next content handler.
-     * @param conversationIdentifier The conversation identifier.
-     */
-    public AddressingProxySAXHandler(final ContentHandler nextHandler, final String conversationIdentifier)
-    {
-	super(nextHandler) ;
-        this.conversationIdentifier = conversationIdentifier ;
-    }
-    
-    /**
-     * Start an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @param attributes The element attributes.
-     * @throws SAXException for any errors.
-     */
-    public void startElement(final String uri, final String localName, final String qName,
-        final Attributes attributes)
-    	throws SAXException
-    {
-        if (WSA_NAMESPACE_URI.equals(uri))
-        {
-            if (WSA_ELEMENT_ADDRESS.equals(localName))
-            {
-                inRewriteElement = true ;
-            }
-            else if (WSA_ELEMENT_TO.equals(localName))
-            {
-                inRewriteElement = true ;
-                inToElement = true ;
-            }
-        }
-        else if (ArjunaConstants.WSARJ_NAMESPACE.equals(uri) && ArjunaConstants.WSARJ_ELEMENT_INSTANCE_IDENTIFIER.equals(localName)
-            && (attributes.getValue(WSA_NAMESPACE_URI, AddressingConstants.WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER) != null))
-        {
-            inIdentifierElement = true ;
-        }
-        
-        getNextHandler().startElement(uri, localName, qName, attributes) ;
-    }
-    
-    /**
-     * End an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @throws SAXException for any errors.
-     */
-    public void endElement(final String uri, final String localName, final String qName)
-        throws SAXException
-    {
-        if (characterContent.length() > 0)
-        {
-            if (inRewriteElement)
-            {
-                final String newValue = ProxyURIRewriting.rewriteURI(conversationIdentifier, characterContent.toString().trim()) ;
-                getNextHandler().characters(newValue.toCharArray(), 0, newValue.length()) ;
-                if (inToElement)
-                {
-                    toAddress = newValue ;
-                    inToElement = false;
-                }
-                inRewriteElement = false;
-            }
-            else if (inIdentifierElement)
-            {
-                identifier = characterContent.toString() ;
-                getNextHandler().characters(identifier.toCharArray(), 0, identifier.length()) ;
-                inIdentifierElement = false;
-            }
-            characterContent.setLength(0) ;
-        }
-        getNextHandler().endElement(uri, localName, qName) ;
-    }
-    
-    /**
-     * Process character text.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     * @throws SAXException for any errors.
-     */
-    public void characters(char[] chars, int start, int length)
-        throws SAXException
-    {
-        if (inRewriteElement || inIdentifierElement)
-        {
-            characterContent.append(chars, start, length) ;
-        }
-        else
-        {
-            getNextHandler().characters(chars, start, length) ;
-        }
-    }
-    
-    /**
-     * Return the to address from the processing.
-     * @return The to address.
-     */
-    public String getToAddress()
-    {
-        return toAddress ;
-    }
-    
-    /**
-     * Return the identifier from the processing.
-     * @return The identifier.
-     */
-    public String getIdentifier()
-    {
-        return identifier ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingProxySAXHandler.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingProxySAXHandler.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingProxySAXHandler.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/AddressingProxySAXHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,197 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Created on 20-Jan-2005
+ */
+package com.jboss.transaction.txinterop.proxy;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+import com.jboss.transaction.txinterop.proxy.AddressingConstants;
+import com.arjuna.webservices.wsarj.ArjunaConstants;
+
+/**
+ * Sax parser for rewriting the XML via the proxy.
+ * @author kevin
+ */
+public class AddressingProxySAXHandler extends BaseHandler
+{
+    /**
+     * The WS-Addressing namespace URI.
+     */
+    private static final String WSA_NAMESPACE_URI = AddressingConstants.WSA_NAMESPACE ;
+    /**
+     * The WS-Addressing To element.
+     */
+    private static final String WSA_ELEMENT_TO = AddressingConstants.WSA_ELEMENT_TO ;
+    /**
+     * The WS-Addressing Address element.
+     */
+    private static final String WSA_ELEMENT_ADDRESS = AddressingConstants.WSA_ELEMENT_ADDRESS ;
+    
+    /**
+     * Are we in a rewrite element?
+     */
+    private boolean inRewriteElement ;
+    /**
+     * Are we in a to element?
+     */
+    private boolean inToElement ;
+    /**
+     * Are we in an identifier element?
+     */
+    private boolean inIdentifierElement ;
+    /**
+     * The to address.
+     */
+    private String toAddress ;
+    /**
+     * The identifier.
+     */
+    private String identifier ;
+    /**
+     * The string buffer for text element content.
+     */
+    private StringBuffer characterContent = new StringBuffer() ;
+    
+    /**
+     * The current conversation identifier.
+     */
+    private final String conversationIdentifier ;
+    
+    /**
+     * Construct the SAX handler with the output writer.
+     * @param nextHandler The next content handler.
+     * @param conversationIdentifier The conversation identifier.
+     */
+    public AddressingProxySAXHandler(final ContentHandler nextHandler, final String conversationIdentifier)
+    {
+	super(nextHandler) ;
+        this.conversationIdentifier = conversationIdentifier ;
+    }
+    
+    /**
+     * Start an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @param attributes The element attributes.
+     * @throws SAXException for any errors.
+     */
+    public void startElement(final String uri, final String localName, final String qName,
+        final Attributes attributes)
+    	throws SAXException
+    {
+        if (WSA_NAMESPACE_URI.equals(uri))
+        {
+            if (WSA_ELEMENT_ADDRESS.equals(localName))
+            {
+                inRewriteElement = true ;
+            }
+            else if (WSA_ELEMENT_TO.equals(localName))
+            {
+                inRewriteElement = true ;
+                inToElement = true ;
+            }
+        }
+        else if (ArjunaConstants.WSARJ_NAMESPACE.equals(uri) && ArjunaConstants.WSARJ_ELEMENT_INSTANCE_IDENTIFIER.equals(localName)
+            && (attributes.getValue(WSA_NAMESPACE_URI, AddressingConstants.WSA_ATTRIBUTE_IS_REFERENCE_PARAMETER) != null))
+        {
+            inIdentifierElement = true ;
+        }
+        
+        getNextHandler().startElement(uri, localName, qName, attributes) ;
+    }
+    
+    /**
+     * End an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @throws SAXException for any errors.
+     */
+    public void endElement(final String uri, final String localName, final String qName)
+        throws SAXException
+    {
+        if (characterContent.length() > 0)
+        {
+            if (inRewriteElement)
+            {
+                final String newValue = ProxyURIRewriting.rewriteURI(conversationIdentifier, characterContent.toString().trim()) ;
+                getNextHandler().characters(newValue.toCharArray(), 0, newValue.length()) ;
+                if (inToElement)
+                {
+                    toAddress = newValue ;
+                    inToElement = false;
+                }
+                inRewriteElement = false;
+            }
+            else if (inIdentifierElement)
+            {
+                identifier = characterContent.toString() ;
+                getNextHandler().characters(identifier.toCharArray(), 0, identifier.length()) ;
+                inIdentifierElement = false;
+            }
+            characterContent.setLength(0) ;
+        }
+        getNextHandler().endElement(uri, localName, qName) ;
+    }
+    
+    /**
+     * Process character text.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     * @throws SAXException for any errors.
+     */
+    public void characters(char[] chars, int start, int length)
+        throws SAXException
+    {
+        if (inRewriteElement || inIdentifierElement)
+        {
+            characterContent.append(chars, start, length) ;
+        }
+        else
+        {
+            getNextHandler().characters(chars, start, length) ;
+        }
+    }
+    
+    /**
+     * Return the to address from the processing.
+     * @return The to address.
+     */
+    public String getToAddress()
+    {
+        return toAddress ;
+    }
+    
+    /**
+     * Return the identifier from the processing.
+     * @return The identifier.
+     */
+    public String getIdentifier()
+    {
+        return identifier ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/BaseHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/BaseHandler.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/BaseHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,167 +0,0 @@
-/*
- * Created on 20-Jan-2005
- */
-package com.jboss.transaction.txinterop.proxy;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-
-/**
- * Sax parser for rewriting the XML via the proxy.
- * @author kevin
- */
-public class BaseHandler implements ContentHandler
-{
-    /**
-     * The next handler in the sequence.
-     */
-    private final ContentHandler nextHandler ;
-    
-    /**
-     * Construct the base handler.
-     * @param nextHandler The next content handler.
-     */
-    protected BaseHandler(final ContentHandler nextHandler)
-    {
-	this.nextHandler = nextHandler ;
-    }
-    
-    /**
-     * Set the document locator.
-     * @param locator The document locator.
-     */
-    public void setDocumentLocator(final Locator locator)
-    {
-	nextHandler.setDocumentLocator(locator) ;
-    }
-    
-    /**
-     * Handle the procesing instruction.
-     * @param target The pi target.
-     * @param data The pi data.
-     * @throws SAXException for any errors.
-     */
-    public void processingInstruction(final String target, final String data)
-        throws SAXException
-    {
-	nextHandler.processingInstruction(target, data) ;
-    }
-    
-    /**
-     * Start the document.
-     * @throws SAXException for any errors.
-     */
-    public void startDocument()
-    	throws SAXException
-    {
-	nextHandler.startDocument() ;
-    }
-    
-    /**
-     * End the document.
-     * @throws SAXException for any errors.
-     */
-    public void endDocument()
-    	throws SAXException
-    {
-	nextHandler.endDocument() ;
-    }
-    
-    /**
-     * Start a prefix mapping.
-     * @param prefix The namespace prefix.
-     * @param uri The namespace uri.
-     * @throws SAXException for any errors.
-     */
-    public void startPrefixMapping(final String prefix, final String uri)
-        throws SAXException
-    {
-	nextHandler.startPrefixMapping(prefix, uri) ;
-    }
-    
-    /**
-     * End the prefix mapping.
-     * @param prefix The namespace prefix.
-     * @throws SAXException for any errors.
-     */
-    public void endPrefixMapping(final String prefix)
-    	throws SAXException
-    {
-	nextHandler.endPrefixMapping(prefix) ;
-    }
-    
-    /**
-     * Start an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @param attributes The element attributes.
-     * @throws SAXException for any errors.
-     */
-    public void startElement(final String uri, final String localName, final String qName,
-        final Attributes attributes)
-    	throws SAXException
-    {
-	nextHandler.startElement(uri, localName, qName, attributes) ;
-    }
-    
-    /**
-     * End an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @throws SAXException for any errors.
-     */
-    public void endElement(final String uri, final String localName, final String qName)
-        throws SAXException
-    {
-	nextHandler.endElement(uri, localName, qName) ;
-    }
-    
-    /**
-     * Process character text.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     * @throws SAXException for any errors.
-     */
-    public void characters(char[] chars, int start, int length)
-        throws SAXException
-    {
-	nextHandler.characters(chars, start, length) ;
-    }
-    
-    /**
-     * Process ignorable white space.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     * @throws SAXException for any errors.
-     */
-    public void ignorableWhitespace(char[] chars, int start, int length)
-        throws SAXException
-    {
-	nextHandler.ignorableWhitespace(chars, start, length) ;
-    }
-    
-    /**
-     * Skip an entity.
-     * @throws SAXException for any errors.
-     */
-    public void skippedEntity(final String name)
-    	throws SAXException
-    {
-	nextHandler.skippedEntity(name) ;
-    }
-    
-    /**
-     * Get the next handler.
-     * @return The next handler.
-     */
-    protected final ContentHandler getNextHandler()
-    {
-	return nextHandler ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/BaseHandler.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/BaseHandler.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/BaseHandler.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/BaseHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,187 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Created on 20-Jan-2005
+ */
+package com.jboss.transaction.txinterop.proxy;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+/**
+ * Sax parser for rewriting the XML via the proxy.
+ * @author kevin
+ */
+public class BaseHandler implements ContentHandler
+{
+    /**
+     * The next handler in the sequence.
+     */
+    private final ContentHandler nextHandler ;
+    
+    /**
+     * Construct the base handler.
+     * @param nextHandler The next content handler.
+     */
+    protected BaseHandler(final ContentHandler nextHandler)
+    {
+	this.nextHandler = nextHandler ;
+    }
+    
+    /**
+     * Set the document locator.
+     * @param locator The document locator.
+     */
+    public void setDocumentLocator(final Locator locator)
+    {
+	nextHandler.setDocumentLocator(locator) ;
+    }
+    
+    /**
+     * Handle the procesing instruction.
+     * @param target The pi target.
+     * @param data The pi data.
+     * @throws SAXException for any errors.
+     */
+    public void processingInstruction(final String target, final String data)
+        throws SAXException
+    {
+	nextHandler.processingInstruction(target, data) ;
+    }
+    
+    /**
+     * Start the document.
+     * @throws SAXException for any errors.
+     */
+    public void startDocument()
+    	throws SAXException
+    {
+	nextHandler.startDocument() ;
+    }
+    
+    /**
+     * End the document.
+     * @throws SAXException for any errors.
+     */
+    public void endDocument()
+    	throws SAXException
+    {
+	nextHandler.endDocument() ;
+    }
+    
+    /**
+     * Start a prefix mapping.
+     * @param prefix The namespace prefix.
+     * @param uri The namespace uri.
+     * @throws SAXException for any errors.
+     */
+    public void startPrefixMapping(final String prefix, final String uri)
+        throws SAXException
+    {
+	nextHandler.startPrefixMapping(prefix, uri) ;
+    }
+    
+    /**
+     * End the prefix mapping.
+     * @param prefix The namespace prefix.
+     * @throws SAXException for any errors.
+     */
+    public void endPrefixMapping(final String prefix)
+    	throws SAXException
+    {
+	nextHandler.endPrefixMapping(prefix) ;
+    }
+    
+    /**
+     * Start an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @param attributes The element attributes.
+     * @throws SAXException for any errors.
+     */
+    public void startElement(final String uri, final String localName, final String qName,
+        final Attributes attributes)
+    	throws SAXException
+    {
+	nextHandler.startElement(uri, localName, qName, attributes) ;
+    }
+    
+    /**
+     * End an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @throws SAXException for any errors.
+     */
+    public void endElement(final String uri, final String localName, final String qName)
+        throws SAXException
+    {
+	nextHandler.endElement(uri, localName, qName) ;
+    }
+    
+    /**
+     * Process character text.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     * @throws SAXException for any errors.
+     */
+    public void characters(char[] chars, int start, int length)
+        throws SAXException
+    {
+	nextHandler.characters(chars, start, length) ;
+    }
+    
+    /**
+     * Process ignorable white space.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     * @throws SAXException for any errors.
+     */
+    public void ignorableWhitespace(char[] chars, int start, int length)
+        throws SAXException
+    {
+	nextHandler.ignorableWhitespace(chars, start, length) ;
+    }
+    
+    /**
+     * Skip an entity.
+     * @throws SAXException for any errors.
+     */
+    public void skippedEntity(final String name)
+    	throws SAXException
+    {
+	nextHandler.skippedEntity(name) ;
+    }
+    
+    /**
+     * Get the next handler.
+     * @return The next handler.
+     */
+    protected final ContentHandler getNextHandler()
+    {
+	return nextHandler ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversation.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversation.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,145 +0,0 @@
-package com.jboss.transaction.txinterop.proxy;
-
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * Message logging via the proxy.
- */
-public class ProxyConversation
-{
-    /**
-     * The conversation id.
-     */
-    private static int currentConversationId ;
-    /**
-     * The conversation map.
-     */
-    private static Map conversationMap = new TreeMap() ;
-    /**
-     * The conversation state map.
-     */
-    private static Map conversationStateMap = new TreeMap() ;
-    
-    /**
-     * The marker for an internal id.
-     */
-    private static final char INTERNAL_ID = 'c' ;
-    /**
-     * The marker for an external id.
-     */
-    private static final char EXTERNAL_ID = 'C' ;
-    
-    /**
-     * Create a conversation.
-     * @return The id of the conversation. 
-     */
-    public static synchronized String createConversation()
-    {
-        final String conversationId = INTERNAL_ID + Integer.toString(++currentConversationId) ;
-        conversationMap.put(mapConversationId(conversationId), new ArrayList()) ;
-System.out.println("KEV: created conversation " + conversationId) ;        
-        return conversationId ;
-    }
-
-    /**
-     * Remove the conversation.
-     * @param conversationId The conversation id.
-     * @return The conversation messages in sequence.
-     */
-    public static synchronized String[] removeConversation(final String conversationId)
-    {
-        final ArrayList list = (ArrayList)conversationMap.remove(mapConversationId(conversationId)) ;
-System.out.println("KEV: removed conversation " + conversationId) ;        
-        return (list == null ? new String[0] : (String[])list.toArray(new String[list.size()])) ;
-    }
-    
-    /**
-     * Append a message to the conversation.
-     * @param conversationId The conversation id.
-     * @param message The message to append to the conversation.
-     */
-    public static synchronized void appendConversation(final String conversationId, final String message)
-    {
-        final ArrayList list = (ArrayList)conversationMap.get(mapConversationId(conversationId)) ;
-        if (list != null)
-        {
-            list.add(message) ;
-        }
-    }
-    
-    /**
-     * Set the conversation state for the specified conversation.
-     * @param conversationId The conversation id.
-     * @param conversationState The conversation state.
-     */
-    public static synchronized void setConversationState(final String conversationId, final ProxyConversationState conversationState)
-    {
-        conversationStateMap.put(mapConversationId(conversationId), conversationState) ;
-    }
-    
-    /**
-     * Get the conversation state for the specified conversation.
-     * @param conversationId The conversation id.
-     * @return The conversation state or null.
-     */
-    public static synchronized ProxyConversationState getConversationState(final String conversationId)
-    {
-        return (ProxyConversationState)conversationStateMap.get(mapConversationId(conversationId)) ;
-    }
-    
-    /**
-     * Clear the conversation state for the specified conversation.
-     * @param conversationId The conversation id.
-     */
-    public static synchronized void clearConversationState(final String conversationId)
-    {
-        conversationStateMap.remove(mapConversationId(conversationId)) ;
-    }
-    
-    /**
-     * Is the conversation id an internal id?
-     * @param conversationId The conversation id.
-     * @return True if the conversation id is internal, false if it is external.
-     */
-    public static boolean isInternalConversationId(final String conversationId)
-    {
-        return ((conversationId != null) && (conversationId.length() != 0) && (conversationId.charAt(0) == INTERNAL_ID)) ;
-    }
-    
-    /**
-     * Get the alternate conversation id.
-     * @param conversationId The current conversation id.
-     * @return The alternate conversation id.
-     */
-    public static String getAlternateConversationId(final String conversationId)
-    {
-        if ((conversationId == null) || (conversationId.length() == 0))
-        {
-            return conversationId ;
-        }
-        if (conversationId.charAt(0) == INTERNAL_ID)
-        {
-            return EXTERNAL_ID + mapConversationId(conversationId) ;
-        }
-        else
-        {
-            return INTERNAL_ID + mapConversationId(conversationId) ;
-        }
-    }
-    
-    /**
-     * Get the map conversation id.
-     * @param conversationId The full conversation id.
-     * @return The conversation id for the map.
-     */
-    private static String mapConversationId(final String conversationId)
-    {
-        if ((conversationId == null) || (conversationId.length() == 0))
-        {
-            return conversationId ;
-        }
-        return conversationId.substring(1) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversation.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversation.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversation.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,165 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.proxy;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * Message logging via the proxy.
+ */
+public class ProxyConversation
+{
+    /**
+     * The conversation id.
+     */
+    private static int currentConversationId ;
+    /**
+     * The conversation map.
+     */
+    private static Map conversationMap = new TreeMap() ;
+    /**
+     * The conversation state map.
+     */
+    private static Map conversationStateMap = new TreeMap() ;
+    
+    /**
+     * The marker for an internal id.
+     */
+    private static final char INTERNAL_ID = 'c' ;
+    /**
+     * The marker for an external id.
+     */
+    private static final char EXTERNAL_ID = 'C' ;
+    
+    /**
+     * Create a conversation.
+     * @return The id of the conversation. 
+     */
+    public static synchronized String createConversation()
+    {
+        final String conversationId = INTERNAL_ID + Integer.toString(++currentConversationId) ;
+        conversationMap.put(mapConversationId(conversationId), new ArrayList()) ;
+System.out.println("KEV: created conversation " + conversationId) ;        
+        return conversationId ;
+    }
+
+    /**
+     * Remove the conversation.
+     * @param conversationId The conversation id.
+     * @return The conversation messages in sequence.
+     */
+    public static synchronized String[] removeConversation(final String conversationId)
+    {
+        final ArrayList list = (ArrayList)conversationMap.remove(mapConversationId(conversationId)) ;
+System.out.println("KEV: removed conversation " + conversationId) ;        
+        return (list == null ? new String[0] : (String[])list.toArray(new String[list.size()])) ;
+    }
+    
+    /**
+     * Append a message to the conversation.
+     * @param conversationId The conversation id.
+     * @param message The message to append to the conversation.
+     */
+    public static synchronized void appendConversation(final String conversationId, final String message)
+    {
+        final ArrayList list = (ArrayList)conversationMap.get(mapConversationId(conversationId)) ;
+        if (list != null)
+        {
+            list.add(message) ;
+        }
+    }
+    
+    /**
+     * Set the conversation state for the specified conversation.
+     * @param conversationId The conversation id.
+     * @param conversationState The conversation state.
+     */
+    public static synchronized void setConversationState(final String conversationId, final ProxyConversationState conversationState)
+    {
+        conversationStateMap.put(mapConversationId(conversationId), conversationState) ;
+    }
+    
+    /**
+     * Get the conversation state for the specified conversation.
+     * @param conversationId The conversation id.
+     * @return The conversation state or null.
+     */
+    public static synchronized ProxyConversationState getConversationState(final String conversationId)
+    {
+        return (ProxyConversationState)conversationStateMap.get(mapConversationId(conversationId)) ;
+    }
+    
+    /**
+     * Clear the conversation state for the specified conversation.
+     * @param conversationId The conversation id.
+     */
+    public static synchronized void clearConversationState(final String conversationId)
+    {
+        conversationStateMap.remove(mapConversationId(conversationId)) ;
+    }
+    
+    /**
+     * Is the conversation id an internal id?
+     * @param conversationId The conversation id.
+     * @return True if the conversation id is internal, false if it is external.
+     */
+    public static boolean isInternalConversationId(final String conversationId)
+    {
+        return ((conversationId != null) && (conversationId.length() != 0) && (conversationId.charAt(0) == INTERNAL_ID)) ;
+    }
+    
+    /**
+     * Get the alternate conversation id.
+     * @param conversationId The current conversation id.
+     * @return The alternate conversation id.
+     */
+    public static String getAlternateConversationId(final String conversationId)
+    {
+        if ((conversationId == null) || (conversationId.length() == 0))
+        {
+            return conversationId ;
+        }
+        if (conversationId.charAt(0) == INTERNAL_ID)
+        {
+            return EXTERNAL_ID + mapConversationId(conversationId) ;
+        }
+        else
+        {
+            return INTERNAL_ID + mapConversationId(conversationId) ;
+        }
+    }
+    
+    /**
+     * Get the map conversation id.
+     * @param conversationId The full conversation id.
+     * @return The conversation id for the map.
+     */
+    private static String mapConversationId(final String conversationId)
+    {
+        if ((conversationId == null) || (conversationId.length() == 0))
+        {
+            return conversationId ;
+        }
+        return conversationId.substring(1) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversationState.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversationState.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversationState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,24 +0,0 @@
-package com.jboss.transaction.txinterop.proxy;
-
-import org.xml.sax.ContentHandler;
-
-/**
- * Interface representing a conversation state.
- */
-public interface ProxyConversationState
-{
-    /**
-     * Handle the next action in the sequence.
-     * @param action The SOAP action.
-     * @param identifier The identifier associated with the endpoint.
-     * @return true if the message should be dropped, false otherwise.
-     */
-    public boolean handleAction(final String action, final String identifier) ;
-
-    /**
-     * Get the Handler for rewriting the XML.
-     * @param nextHandler The next handler in the sequence.
-     * @return The handler or null if no rewriting required.
-     */
-    public ContentHandler getHandler(final ContentHandler nextHandler) ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversationState.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversationState.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversationState.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyConversationState.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.proxy;
+
+import org.xml.sax.ContentHandler;
+
+/**
+ * Interface representing a conversation state.
+ */
+public interface ProxyConversationState
+{
+    /**
+     * Handle the next action in the sequence.
+     * @param action The SOAP action.
+     * @param identifier The identifier associated with the endpoint.
+     * @return true if the message should be dropped, false otherwise.
+     */
+    public boolean handleAction(final String action, final String identifier) ;
+
+    /**
+     * Get the Handler for rewriting the XML.
+     * @param nextHandler The next handler in the sequence.
+     * @return The handler or null if no rewriting required.
+     */
+    public ContentHandler getHandler(final ContentHandler nextHandler) ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyListenerService.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyListenerService.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyListenerService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,413 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, Arjuna Technologies Limited.
- *
- * $Id: DummyListenerService.java,v 1.2 2004/06/24 13:52:53 nmcl Exp $
- */
-
-package com.jboss.transaction.txinterop.proxy;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Enumeration;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-public class ProxyListenerService extends HttpServlet
-{
-    /**
-     * The SOAP 1.1 content type.
-     */
-    private static final String SOAP_11_CONTENT_TYPE = "text/xml" ;
-    /**
-     * The SOAP 1.2 content type.
-     */
-    private static final String SOAP_12_CONTENT_TYPE = "application/soap+xml" ;
-    /**
-     * The name of the SOAP Action header.
-     */
-    public static final String SOAP_ACTION_HEADER = "SOAPAction" ;
-    /**
-     * The name of the Transfer encoding header.
-     */
-    public static final String TRANSFER_ENCODING_HEADER = "transfer-encoding" ;
-    /**
-     * The name of the SOAP Action header.
-     */
-    public static final String TRANSFER_ENCODING_VALUE_CHUNKED = "chunked" ;
-    /**
-     * The default data size.
-     */
-    private static final int DEFAULT_DATA_SIZE = 256 ;
-    
-    /**
-     * Initialise the servlet.
-     * @param config The servlet configuration.
-     */
-    public void init(final ServletConfig config)
-        throws ServletException
-    {
-        super.init(config);
-        
-        // Initialise the local host:port/urlstub for the proxy.
-        final String proxyServiceURI = config.getInitParameter("proxyServiceURI") ;
-        if (proxyServiceURI == null)
-        {
-            throw new ServletException("Proxy service URI missing") ;
-        }
-        ProxyURIRewriting.setProxyURI(proxyServiceURI) ;
-    }
-    
-    /**
-     * Handle the post request.
-     * @param httpServletRequest The current HTTP servlet request.
-     * @param httpServletResponse The current HTTP servlet response.
-     */
-    public void doPost(final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse)
-        throws ServletException, IOException
-    {
-        final String conversationIdentifier = getConversationIdentifier(httpServletRequest) ;
-        
-        final byte[] requestContents = getContents(httpServletRequest.getInputStream()) ;
-        final String soapAction = httpServletRequest.getHeader(SOAP_ACTION_HEADER) ;
-        final boolean jbossClient = ProxyConversation.isInternalConversationId(conversationIdentifier) ;
-        final String alternateConversationIdentifier = ProxyConversation.getAlternateConversationId(conversationIdentifier) ;
-        
-        final ProxyConversationState state = ProxyConversation.getConversationState(conversationIdentifier) ;
-
-System.out.println("KEV: processing SOAP action " + trimAction(soapAction)) ;
-        // Search header for wsa:To and wsa:Address elements, changing their URL parts as we go.
-        // Get the target URL from the to.
-        try
-        {
-            final StringWriter newMessageWriter = new StringWriter() ;
-            final WriterSAXHandler writerHandler = new WriterSAXHandler(newMessageWriter) ;
-            final AddressingProxySAXHandler addressingHandler = new AddressingProxySAXHandler(writerHandler, alternateConversationIdentifier) ;
-            
-            ContentHandler stateHandler = (state == null ? null : state.getHandler(addressingHandler)) ;
-            ContentHandler parserHandler = (stateHandler == null ? addressingHandler : stateHandler) ;
-            
-            final XMLReader xmlReader = XMLReaderFactory.createXMLReader() ;
-            xmlReader.setContentHandler(parserHandler) ;
-            xmlReader.parse(new InputSource(new ByteArrayInputStream(requestContents))) ;
-            
-            final StringBuffer newMessageBuffer = newMessageWriter.getBuffer() ;
-            final StringBuffer messageBuffer = (jbossClient ? newMessageBuffer : new StringBuffer(new String(requestContents))) ;
-            
-            ProxyConversation.appendConversation(conversationIdentifier, checkForXMLDecl(messageBuffer)) ;
-
-            final String identifier = addressingHandler.getIdentifier() ;
-            if ((state != null) && state.handleAction(trimAction(soapAction), identifier))  
-            {
-                httpServletResponse.setStatus(HttpServletResponse.SC_ACCEPTED) ;
-                httpServletResponse.flushBuffer() ;
-                return ;
-            }
-            
-            // parse input stream
-            
-            final URL destURL = new URL(addressingHandler.getToAddress()) ;
-            final HttpURLConnection destConnection = (HttpURLConnection)destURL.openConnection() ;
-            try
-            {
-                destConnection.setDoOutput(true) ;
-                destConnection.setUseCaches(false) ;
-                
-                // copy the headers
-                final Enumeration headerNameEnum = httpServletRequest.getHeaderNames() ;
-                while(headerNameEnum.hasMoreElements())
-                {
-                    final String name = (String)headerNameEnum.nextElement() ;
-                    if (name.equalsIgnoreCase(TRANSFER_ENCODING_HEADER))
-                    {
-                        // any messages we send are not chunked!
-                        final String value = httpServletRequest.getHeader(name) ;
-                        if (!value.equalsIgnoreCase(TRANSFER_ENCODING_VALUE_CHUNKED))
-                        {
-                            // this may actually cause a problem depending upon the encoding but try it anyway
-                            destConnection.setRequestProperty(name, value) ;
-                        }
-                    }
-                    else
-                    {
-                        final String value = httpServletRequest.getHeader(name) ;
-                        destConnection.setRequestProperty(name, value) ;
-                    }
-                }
-                
-                // Set content length
-                destConnection.setRequestProperty("Content-Length", Integer.toString(newMessageBuffer.length())) ;
-        		final int port = destURL.getPort() ;
-        		final String host = (port > 0 ? destURL.getHost() + ":" + port : destURL.getHost()) ;
-                destConnection.setRequestProperty("Host", host) ;
-                destConnection.setRequestMethod("POST") ;
-                // Connect
-                destConnection.connect() ;
-                // Write the new request
-                final OutputStream os = destConnection.getOutputStream() ;
-                os.write(newMessageBuffer.toString().getBytes()) ;
-                os.flush() ;
-                os.close() ;
-                
-                final int responseCode = destConnection.getResponseCode() ;
-                final String fullContentType = destConnection.getContentType() ;
-                final String contentType = getContentType(fullContentType) ;
-                switch (responseCode)
-                {
-                    case HttpServletResponse.SC_OK:
-                    case HttpServletResponse.SC_ACCEPTED:
-                        if ((contentType != null) && !(SOAP_11_CONTENT_TYPE.equals(contentType) ||
-                            SOAP_12_CONTENT_TYPE.equals(contentType)))
-                        {
-                            httpServletResponse.setStatus(HttpServletResponse.SC_ACCEPTED) ;
-                            httpServletResponse.flushBuffer() ;
-                            break ;
-                        }
-                        // FALL THRU
-                    default:
-                        // Pass the response back.
-                        httpServletResponse.setStatus(destConnection.getResponseCode()) ;
-                        if (fullContentType != null)
-                        {
-                            httpServletResponse.setContentType(fullContentType) ;
-                        }
-                        
-                        // Copy data
-                        final int datasize = DEFAULT_DATA_SIZE ;
-                        final char[] data = new char[datasize] ;
-                        int readCount ;
-                        
-                        final InputStream is ;
-                        if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR)
-                        {
-                            is = destConnection.getErrorStream() ;
-                        }
-                        else
-                        {
-                            is = destConnection.getInputStream() ;
-                        }
-                        if (is != null) {
-                            final byte[] responseBytes = getContents(is) ;
-                            if (responseBytes.length > 0) {
-                                try
-                                {
-                                    final StringWriter newResponseWriter = new StringWriter() ;
-                                    final WriterSAXHandler responseWriterHandler = new WriterSAXHandler(newResponseWriter) ;
-                                    final AddressingProxySAXHandler responseAddressingHandler = new AddressingProxySAXHandler(responseWriterHandler, alternateConversationIdentifier) ;
-
-                                    // refetch the state handler so it gets a chance to go away
-                                    stateHandler = (state == null ? null : state.getHandler(responseAddressingHandler)) ;
-                                    parserHandler = (stateHandler == null ? responseAddressingHandler : stateHandler) ;
-
-                                    // always use the standard handler for replies?
-                                    final XMLReader responseXmlReader = XMLReaderFactory.createXMLReader() ;
-                                    responseXmlReader.setContentHandler(parserHandler) ;
-                                    responseXmlReader.parse(new InputSource(new ByteArrayInputStream(responseBytes))) ;
-
-                                    final StringBuffer newResponseBuffer = newResponseWriter.getBuffer() ;
-                                    final String newResponseString = newResponseBuffer.toString();
-
-                                    final String responseString = (jbossClient ? newResponseString : new String(responseBytes));
-                                    if ((contentType != null) && !(SOAP_11_CONTENT_TYPE.equals(contentType) ||
-                                            SOAP_12_CONTENT_TYPE.equals(contentType)))
-                                    {
-                                        ProxyConversation.appendConversation(conversationIdentifier, escapeContents(responseString)) ;
-                                    }
-                                    else
-                                    {
-                                        ProxyConversation.appendConversation(conversationIdentifier, responseString) ;
-                                    }
-                                    final ServletOutputStream sos = httpServletResponse.getOutputStream() ;
-                                    sos.print(newResponseString) ;
-                                    sos.flush() ;
-                                    httpServletResponse.setContentLength(newResponseString.length()) ;
-                                }
-                                finally
-                                {
-                                    is.close() ;
-                                }
-                            } else {
-                                httpServletResponse.setContentLength(0) ;
-                            }
-                        } else {
-                            httpServletResponse.setContentLength(0) ;
-                        }
-                        break ;
-                }
-            }
-            finally
-            {
-                destConnection.disconnect() ;
-            }
-        }
-        catch (Exception exception)
-        {
-            System.err.println("Proxy Listener Service: " + exception);
-            exception.printStackTrace() ;
-        }
-        catch (Error error)
-        {
-            System.err.println("Proxy Listener Service: " + error);
-            error.printStackTrace() ;
-        }
-    }
-    
-    /**
-     * Trim quotes from the action.
-     * @param action The action.
-     * @return The trimmed action.
-     */
-    private static String trimAction(final String action)
-    {
-        final int length = (action == null ? 0 : action.length()) ;
-        if ((length < 2) || (action.charAt(0) != '"') || (action.charAt(length-1) != '"'))
-        {
-            return action ;
-        }
-        return action.substring(1, length-1) ;
-    }
-
-    /**
-     * Get the content type part.
-     * @param fullContentType The full content type.
-     * @return The content type.
-     */
-    private static String getContentType(final String fullContentType)
-    {
-        if (fullContentType == null)
-        {
-            return null ;
-        }
-        final int separatorIndex = fullContentType.indexOf(';') ;
-        return (separatorIndex == -1 ? fullContentType : fullContentType.substring(0, separatorIndex)) ;
-    }
-
-    /**
-     * Get the conversation identifier from the request.
-     * @return The conversation identifier.
-     */
-    private static String getConversationIdentifier(final HttpServletRequest httpServletRequest)
-    {
-        final String pathInfo = httpServletRequest.getPathInfo() ;
-        final int separator = pathInfo.indexOf('/', 1) ;
-        return pathInfo.substring(1, separator) ;
-    }
-    
-    /**
-     * Get the contents of the input stream
-     * @param is The input stream.
-     * @return The contents.
-     * @throws IOException for errors.
-     */
-    private byte[] getContents(final InputStream is)
-    	throws IOException
-    {
-        final ByteArrayOutputStream baos = new ByteArrayOutputStream() ;
-        final byte[] buffer = new byte[1024] ;
-        int readCount ;
-        do
-        {
-            readCount = is.read(buffer, 0, buffer.length) ;
-            if (readCount > 0)
-            {
-                baos.write(buffer, 0, readCount) ;
-            }
-        }
-        while(readCount > 0) ;
-        return baos.toByteArray() ;
-    }
-    
-    /**
-     * Check for the XML declaration and remove.
-     * This method is only used if we are intending to log the SOAP message so that it is easy to combine the XML without creating invalid documents.
-     * @param contents The current stream contents.
-     * @return The stream contents as a string.
-     */
-    private static String checkForXMLDecl(final StringBuffer contents)
-    {
-        int count = 0 ;
-        try
-        {
-            while(Character.isWhitespace(contents.charAt(count))) count++ ;
-            if (contents.charAt(count) == '<')
-            {
-                if (contents.charAt(count+1) == '?')
-                {
-                    count+=2 ;
-                    while(contents.charAt(count++) != '>') ;
-                }
-            }
-            if (count > 0)
-            {
-                contents.delete(0, count) ;
-            }
-        }
-        catch (final StringIndexOutOfBoundsException sioobe) {}
-        
-        return contents.toString() ;
-    }
-    
-    /**
-     * Escape the contents of the string.
-     * @param contents The original contents.
-     * @return The escaped contents.
-     */
-    private static String escapeContents(final String contents)
-    {
-        final int length = contents.length() ;
-        StringWriter escapedContents = null ;
-        
-        for(int count = 0 ; count < length ; count++)
-        {
-            final char ch = contents.charAt(count) ;
-            if ((ch == '<') || (ch == '>') || (ch == '&') || (ch == '"'))
-            {
-                if (escapedContents == null)
-                {
-                    escapedContents = new StringWriter(length) ;
-                    if (count > 0)
-                    {
-                        escapedContents.write(contents, 0, count-1) ;
-                    }
-                }
-                if (ch == '<')
-                {
-                    escapedContents.write("&lt;") ;
-                }
-                else if (ch == '>')
-                {
-                    escapedContents.write("&gt;") ;
-                }
-                else if (ch == '&')
-                {
-                    escapedContents.write("&amp;") ;
-                }
-                else if (ch == '"')
-                {
-                    escapedContents.write("&quot;") ;
-                }
-            }
-            else if (escapedContents != null)
-            {
-                escapedContents.write(ch) ;
-            }
-        }
-        return (escapedContents == null ? contents : escapedContents.toString()) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyListenerService.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyListenerService.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyListenerService.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyListenerService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,433 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (c) 2002, 2003, Arjuna Technologies Limited.
+ *
+ * $Id: DummyListenerService.java,v 1.2 2004/06/24 13:52:53 nmcl Exp $
+ */
+
+package com.jboss.transaction.txinterop.proxy;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Enumeration;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+public class ProxyListenerService extends HttpServlet
+{
+    /**
+     * The SOAP 1.1 content type.
+     */
+    private static final String SOAP_11_CONTENT_TYPE = "text/xml" ;
+    /**
+     * The SOAP 1.2 content type.
+     */
+    private static final String SOAP_12_CONTENT_TYPE = "application/soap+xml" ;
+    /**
+     * The name of the SOAP Action header.
+     */
+    public static final String SOAP_ACTION_HEADER = "SOAPAction" ;
+    /**
+     * The name of the Transfer encoding header.
+     */
+    public static final String TRANSFER_ENCODING_HEADER = "transfer-encoding" ;
+    /**
+     * The name of the SOAP Action header.
+     */
+    public static final String TRANSFER_ENCODING_VALUE_CHUNKED = "chunked" ;
+    /**
+     * The default data size.
+     */
+    private static final int DEFAULT_DATA_SIZE = 256 ;
+    
+    /**
+     * Initialise the servlet.
+     * @param config The servlet configuration.
+     */
+    public void init(final ServletConfig config)
+        throws ServletException
+    {
+        super.init(config);
+        
+        // Initialise the local host:port/urlstub for the proxy.
+        final String proxyServiceURI = config.getInitParameter("proxyServiceURI") ;
+        if (proxyServiceURI == null)
+        {
+            throw new ServletException("Proxy service URI missing") ;
+        }
+        ProxyURIRewriting.setProxyURI(proxyServiceURI) ;
+    }
+    
+    /**
+     * Handle the post request.
+     * @param httpServletRequest The current HTTP servlet request.
+     * @param httpServletResponse The current HTTP servlet response.
+     */
+    public void doPost(final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse)
+        throws ServletException, IOException
+    {
+        final String conversationIdentifier = getConversationIdentifier(httpServletRequest) ;
+        
+        final byte[] requestContents = getContents(httpServletRequest.getInputStream()) ;
+        final String soapAction = httpServletRequest.getHeader(SOAP_ACTION_HEADER) ;
+        final boolean jbossClient = ProxyConversation.isInternalConversationId(conversationIdentifier) ;
+        final String alternateConversationIdentifier = ProxyConversation.getAlternateConversationId(conversationIdentifier) ;
+        
+        final ProxyConversationState state = ProxyConversation.getConversationState(conversationIdentifier) ;
+
+System.out.println("KEV: processing SOAP action " + trimAction(soapAction)) ;
+        // Search header for wsa:To and wsa:Address elements, changing their URL parts as we go.
+        // Get the target URL from the to.
+        try
+        {
+            final StringWriter newMessageWriter = new StringWriter() ;
+            final WriterSAXHandler writerHandler = new WriterSAXHandler(newMessageWriter) ;
+            final AddressingProxySAXHandler addressingHandler = new AddressingProxySAXHandler(writerHandler, alternateConversationIdentifier) ;
+            
+            ContentHandler stateHandler = (state == null ? null : state.getHandler(addressingHandler)) ;
+            ContentHandler parserHandler = (stateHandler == null ? addressingHandler : stateHandler) ;
+            
+            final XMLReader xmlReader = XMLReaderFactory.createXMLReader() ;
+            xmlReader.setContentHandler(parserHandler) ;
+            xmlReader.parse(new InputSource(new ByteArrayInputStream(requestContents))) ;
+            
+            final StringBuffer newMessageBuffer = newMessageWriter.getBuffer() ;
+            final StringBuffer messageBuffer = (jbossClient ? newMessageBuffer : new StringBuffer(new String(requestContents))) ;
+            
+            ProxyConversation.appendConversation(conversationIdentifier, checkForXMLDecl(messageBuffer)) ;
+
+            final String identifier = addressingHandler.getIdentifier() ;
+            if ((state != null) && state.handleAction(trimAction(soapAction), identifier))  
+            {
+                httpServletResponse.setStatus(HttpServletResponse.SC_ACCEPTED) ;
+                httpServletResponse.flushBuffer() ;
+                return ;
+            }
+            
+            // parse input stream
+            
+            final URL destURL = new URL(addressingHandler.getToAddress()) ;
+            final HttpURLConnection destConnection = (HttpURLConnection)destURL.openConnection() ;
+            try
+            {
+                destConnection.setDoOutput(true) ;
+                destConnection.setUseCaches(false) ;
+                
+                // copy the headers
+                final Enumeration headerNameEnum = httpServletRequest.getHeaderNames() ;
+                while(headerNameEnum.hasMoreElements())
+                {
+                    final String name = (String)headerNameEnum.nextElement() ;
+                    if (name.equalsIgnoreCase(TRANSFER_ENCODING_HEADER))
+                    {
+                        // any messages we send are not chunked!
+                        final String value = httpServletRequest.getHeader(name) ;
+                        if (!value.equalsIgnoreCase(TRANSFER_ENCODING_VALUE_CHUNKED))
+                        {
+                            // this may actually cause a problem depending upon the encoding but try it anyway
+                            destConnection.setRequestProperty(name, value) ;
+                        }
+                    }
+                    else
+                    {
+                        final String value = httpServletRequest.getHeader(name) ;
+                        destConnection.setRequestProperty(name, value) ;
+                    }
+                }
+                
+                // Set content length
+                destConnection.setRequestProperty("Content-Length", Integer.toString(newMessageBuffer.length())) ;
+        		final int port = destURL.getPort() ;
+        		final String host = (port > 0 ? destURL.getHost() + ":" + port : destURL.getHost()) ;
+                destConnection.setRequestProperty("Host", host) ;
+                destConnection.setRequestMethod("POST") ;
+                // Connect
+                destConnection.connect() ;
+                // Write the new request
+                final OutputStream os = destConnection.getOutputStream() ;
+                os.write(newMessageBuffer.toString().getBytes()) ;
+                os.flush() ;
+                os.close() ;
+                
+                final int responseCode = destConnection.getResponseCode() ;
+                final String fullContentType = destConnection.getContentType() ;
+                final String contentType = getContentType(fullContentType) ;
+                switch (responseCode)
+                {
+                    case HttpServletResponse.SC_OK:
+                    case HttpServletResponse.SC_ACCEPTED:
+                        if ((contentType != null) && !(SOAP_11_CONTENT_TYPE.equals(contentType) ||
+                            SOAP_12_CONTENT_TYPE.equals(contentType)))
+                        {
+                            httpServletResponse.setStatus(HttpServletResponse.SC_ACCEPTED) ;
+                            httpServletResponse.flushBuffer() ;
+                            break ;
+                        }
+                        // FALL THRU
+                    default:
+                        // Pass the response back.
+                        httpServletResponse.setStatus(destConnection.getResponseCode()) ;
+                        if (fullContentType != null)
+                        {
+                            httpServletResponse.setContentType(fullContentType) ;
+                        }
+                        
+                        // Copy data
+                        final int datasize = DEFAULT_DATA_SIZE ;
+                        final char[] data = new char[datasize] ;
+                        int readCount ;
+                        
+                        final InputStream is ;
+                        if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR)
+                        {
+                            is = destConnection.getErrorStream() ;
+                        }
+                        else
+                        {
+                            is = destConnection.getInputStream() ;
+                        }
+                        if (is != null) {
+                            final byte[] responseBytes = getContents(is) ;
+                            if (responseBytes.length > 0) {
+                                try
+                                {
+                                    final StringWriter newResponseWriter = new StringWriter() ;
+                                    final WriterSAXHandler responseWriterHandler = new WriterSAXHandler(newResponseWriter) ;
+                                    final AddressingProxySAXHandler responseAddressingHandler = new AddressingProxySAXHandler(responseWriterHandler, alternateConversationIdentifier) ;
+
+                                    // refetch the state handler so it gets a chance to go away
+                                    stateHandler = (state == null ? null : state.getHandler(responseAddressingHandler)) ;
+                                    parserHandler = (stateHandler == null ? responseAddressingHandler : stateHandler) ;
+
+                                    // always use the standard handler for replies?
+                                    final XMLReader responseXmlReader = XMLReaderFactory.createXMLReader() ;
+                                    responseXmlReader.setContentHandler(parserHandler) ;
+                                    responseXmlReader.parse(new InputSource(new ByteArrayInputStream(responseBytes))) ;
+
+                                    final StringBuffer newResponseBuffer = newResponseWriter.getBuffer() ;
+                                    final String newResponseString = newResponseBuffer.toString();
+
+                                    final String responseString = (jbossClient ? newResponseString : new String(responseBytes));
+                                    if ((contentType != null) && !(SOAP_11_CONTENT_TYPE.equals(contentType) ||
+                                            SOAP_12_CONTENT_TYPE.equals(contentType)))
+                                    {
+                                        ProxyConversation.appendConversation(conversationIdentifier, escapeContents(responseString)) ;
+                                    }
+                                    else
+                                    {
+                                        ProxyConversation.appendConversation(conversationIdentifier, responseString) ;
+                                    }
+                                    final ServletOutputStream sos = httpServletResponse.getOutputStream() ;
+                                    sos.print(newResponseString) ;
+                                    sos.flush() ;
+                                    httpServletResponse.setContentLength(newResponseString.length()) ;
+                                }
+                                finally
+                                {
+                                    is.close() ;
+                                }
+                            } else {
+                                httpServletResponse.setContentLength(0) ;
+                            }
+                        } else {
+                            httpServletResponse.setContentLength(0) ;
+                        }
+                        break ;
+                }
+            }
+            finally
+            {
+                destConnection.disconnect() ;
+            }
+        }
+        catch (Exception exception)
+        {
+            System.err.println("Proxy Listener Service: " + exception);
+            exception.printStackTrace() ;
+        }
+        catch (Error error)
+        {
+            System.err.println("Proxy Listener Service: " + error);
+            error.printStackTrace() ;
+        }
+    }
+    
+    /**
+     * Trim quotes from the action.
+     * @param action The action.
+     * @return The trimmed action.
+     */
+    private static String trimAction(final String action)
+    {
+        final int length = (action == null ? 0 : action.length()) ;
+        if ((length < 2) || (action.charAt(0) != '"') || (action.charAt(length-1) != '"'))
+        {
+            return action ;
+        }
+        return action.substring(1, length-1) ;
+    }
+
+    /**
+     * Get the content type part.
+     * @param fullContentType The full content type.
+     * @return The content type.
+     */
+    private static String getContentType(final String fullContentType)
+    {
+        if (fullContentType == null)
+        {
+            return null ;
+        }
+        final int separatorIndex = fullContentType.indexOf(';') ;
+        return (separatorIndex == -1 ? fullContentType : fullContentType.substring(0, separatorIndex)) ;
+    }
+
+    /**
+     * Get the conversation identifier from the request.
+     * @return The conversation identifier.
+     */
+    private static String getConversationIdentifier(final HttpServletRequest httpServletRequest)
+    {
+        final String pathInfo = httpServletRequest.getPathInfo() ;
+        final int separator = pathInfo.indexOf('/', 1) ;
+        return pathInfo.substring(1, separator) ;
+    }
+    
+    /**
+     * Get the contents of the input stream
+     * @param is The input stream.
+     * @return The contents.
+     * @throws IOException for errors.
+     */
+    private byte[] getContents(final InputStream is)
+    	throws IOException
+    {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream() ;
+        final byte[] buffer = new byte[1024] ;
+        int readCount ;
+        do
+        {
+            readCount = is.read(buffer, 0, buffer.length) ;
+            if (readCount > 0)
+            {
+                baos.write(buffer, 0, readCount) ;
+            }
+        }
+        while(readCount > 0) ;
+        return baos.toByteArray() ;
+    }
+    
+    /**
+     * Check for the XML declaration and remove.
+     * This method is only used if we are intending to log the SOAP message so that it is easy to combine the XML without creating invalid documents.
+     * @param contents The current stream contents.
+     * @return The stream contents as a string.
+     */
+    private static String checkForXMLDecl(final StringBuffer contents)
+    {
+        int count = 0 ;
+        try
+        {
+            while(Character.isWhitespace(contents.charAt(count))) count++ ;
+            if (contents.charAt(count) == '<')
+            {
+                if (contents.charAt(count+1) == '?')
+                {
+                    count+=2 ;
+                    while(contents.charAt(count++) != '>') ;
+                }
+            }
+            if (count > 0)
+            {
+                contents.delete(0, count) ;
+            }
+        }
+        catch (final StringIndexOutOfBoundsException sioobe) {}
+        
+        return contents.toString() ;
+    }
+    
+    /**
+     * Escape the contents of the string.
+     * @param contents The original contents.
+     * @return The escaped contents.
+     */
+    private static String escapeContents(final String contents)
+    {
+        final int length = contents.length() ;
+        StringWriter escapedContents = null ;
+        
+        for(int count = 0 ; count < length ; count++)
+        {
+            final char ch = contents.charAt(count) ;
+            if ((ch == '<') || (ch == '>') || (ch == '&') || (ch == '"'))
+            {
+                if (escapedContents == null)
+                {
+                    escapedContents = new StringWriter(length) ;
+                    if (count > 0)
+                    {
+                        escapedContents.write(contents, 0, count-1) ;
+                    }
+                }
+                if (ch == '<')
+                {
+                    escapedContents.write("&lt;") ;
+                }
+                else if (ch == '>')
+                {
+                    escapedContents.write("&gt;") ;
+                }
+                else if (ch == '&')
+                {
+                    escapedContents.write("&amp;") ;
+                }
+                else if (ch == '"')
+                {
+                    escapedContents.write("&quot;") ;
+                }
+            }
+            else if (escapedContents != null)
+            {
+                escapedContents.write(ch) ;
+            }
+        }
+        return (escapedContents == null ? contents : escapedContents.toString()) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyURIRewriting.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyURIRewriting.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyURIRewriting.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,139 +0,0 @@
-package com.jboss.transaction.txinterop.proxy;
-
-
-/**
- * @author kevin
- */
-public class ProxyURIRewriting
-{
-    /**
-     * The base URI of the proxy.
-     */
-    private static String PROXY_URI ;
-    
-    /**
-     * Set the proxy URI.
-     * @param proxyURI The proxy URI.
-     */
-    public static synchronized void setProxyURI(final String proxyURI)
-    {
-        PROXY_URI = proxyURI ;
-    }
-    
-    /**
-     * Get the proxy URI.
-     * @return The proxy URI.
-     */
-    public static synchronized String getProxyURI()
-    {
-        return PROXY_URI ;
-    }
-    
-    /**
-     * Rewrite the URI.
-     * @param conversationIdentifier The conversation identifier.
-     * @param uri The uri to be rewritten.
-     * @return The replacement URI.
-     */
-    public static String rewriteURI(final String conversationIdentifier, final String uri)
-    {
-        final String proxyURI = getProxyURI() ;
-        
-        if (uri != null)
-        {
-            if (uri.startsWith(proxyURI))
-            {
-                final int separatorIndex = uri.indexOf('/', proxyURI.length()+1) ;
-                final String remainder = uri.substring(separatorIndex+1) ;
-                return decodeURI(remainder) ;
-            }
-            else if (!uri.startsWith("http://www.w3.org/"))
-            {
-                return proxyURI + "/" + conversationIdentifier + "/" + encodeURI(uri) ;
-            }
-        }
-        return uri ;
-    }
-    
-    /**
-     * Decode a URI that has been encoded.
-     * @param uri The encoded URI.
-     * @return The decoded URI.
-     */
-    public static String decodeURI(final String uri)
-    {
-        if (uri == null)
-        {
-            return null ;
-        }
-        final StringBuffer result = new StringBuffer() ;
-        final int length = uri.length() ;
-        int separatorCount = 0 ;
-        for(int count = 0 ; count < length ; count++)
-        {
-            final char ch = uri.charAt(count) ;
-            if (separatorCount < 3)
-            {
-                if (ch == '-')
-                {
-                    result.append("/") ;
-                    separatorCount++ ;
-                    continue ;
-                }
-                else if (ch == '_')
-                {
-                    result.append(":") ;
-                    continue ;
-                }
-                result.append(ch) ;
-            }
-            else
-            {
-                result.append(ch) ;
-            }
-        }
-        return result.toString() ;
-    }
-    
-    /**
-     * Encode a URI.
-     * @param uri The URI.
-     * @return The encoded URI.
-     */
-    public static String encodeURI(final String uri)
-    {
-        if (uri == null)
-        {
-            return "" ;
-        }
-        
-        final StringBuffer result = new StringBuffer() ;
-        final int length = uri.length() ;
-        int separatorCount = 0 ;
-        for(int count = 0 ; count < length ; count++)
-        {
-            final char ch = uri.charAt(count) ;
-            if (separatorCount < 3)
-            {
-                if (ch == '/')
-                {
-                    separatorCount++ ;
-                    result.append("-") ;
-                }
-                else if (ch == ':')
-                {
-                    result.append("_") ;
-                }
-                else
-                {
-                    result.append(ch) ;
-                }
-            }
-            else
-            {
-                result.append(ch) ;
-            }
-        }
-        return result.toString() ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyURIRewriting.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyURIRewriting.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyURIRewriting.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/ProxyURIRewriting.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,159 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.proxy;
+
+
+/**
+ * @author kevin
+ */
+public class ProxyURIRewriting
+{
+    /**
+     * The base URI of the proxy.
+     */
+    private static String PROXY_URI ;
+    
+    /**
+     * Set the proxy URI.
+     * @param proxyURI The proxy URI.
+     */
+    public static synchronized void setProxyURI(final String proxyURI)
+    {
+        PROXY_URI = proxyURI ;
+    }
+    
+    /**
+     * Get the proxy URI.
+     * @return The proxy URI.
+     */
+    public static synchronized String getProxyURI()
+    {
+        return PROXY_URI ;
+    }
+    
+    /**
+     * Rewrite the URI.
+     * @param conversationIdentifier The conversation identifier.
+     * @param uri The uri to be rewritten.
+     * @return The replacement URI.
+     */
+    public static String rewriteURI(final String conversationIdentifier, final String uri)
+    {
+        final String proxyURI = getProxyURI() ;
+        
+        if (uri != null)
+        {
+            if (uri.startsWith(proxyURI))
+            {
+                final int separatorIndex = uri.indexOf('/', proxyURI.length()+1) ;
+                final String remainder = uri.substring(separatorIndex+1) ;
+                return decodeURI(remainder) ;
+            }
+            else if (!uri.startsWith("http://www.w3.org/"))
+            {
+                return proxyURI + "/" + conversationIdentifier + "/" + encodeURI(uri) ;
+            }
+        }
+        return uri ;
+    }
+    
+    /**
+     * Decode a URI that has been encoded.
+     * @param uri The encoded URI.
+     * @return The decoded URI.
+     */
+    public static String decodeURI(final String uri)
+    {
+        if (uri == null)
+        {
+            return null ;
+        }
+        final StringBuffer result = new StringBuffer() ;
+        final int length = uri.length() ;
+        int separatorCount = 0 ;
+        for(int count = 0 ; count < length ; count++)
+        {
+            final char ch = uri.charAt(count) ;
+            if (separatorCount < 3)
+            {
+                if (ch == '-')
+                {
+                    result.append("/") ;
+                    separatorCount++ ;
+                    continue ;
+                }
+                else if (ch == '_')
+                {
+                    result.append(":") ;
+                    continue ;
+                }
+                result.append(ch) ;
+            }
+            else
+            {
+                result.append(ch) ;
+            }
+        }
+        return result.toString() ;
+    }
+    
+    /**
+     * Encode a URI.
+     * @param uri The URI.
+     * @return The encoded URI.
+     */
+    public static String encodeURI(final String uri)
+    {
+        if (uri == null)
+        {
+            return "" ;
+        }
+        
+        final StringBuffer result = new StringBuffer() ;
+        final int length = uri.length() ;
+        int separatorCount = 0 ;
+        for(int count = 0 ; count < length ; count++)
+        {
+            final char ch = uri.charAt(count) ;
+            if (separatorCount < 3)
+            {
+                if (ch == '/')
+                {
+                    separatorCount++ ;
+                    result.append("-") ;
+                }
+                else if (ch == ':')
+                {
+                    result.append("_") ;
+                }
+                else
+                {
+                    result.append(ch) ;
+                }
+            }
+            else
+            {
+                result.append(ch) ;
+            }
+        }
+        return result.toString() ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/WriterSAXHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/WriterSAXHandler.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/WriterSAXHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,394 +0,0 @@
-/*
- * Created on 20-Jan-2005
- */
-package com.jboss.transaction.txinterop.proxy;
-
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-
-/**
- * Sax parser for rewriting the XML via the proxy.
- * @author kevin
- */
-public class WriterSAXHandler implements ContentHandler
-{
-    /**
-     * Do we need to end the start tag?
-     */
-    private boolean endStartTag ;
-    /**
-     * The to address.
-     */
-    private String toAddress ;
-    /**
-     * The identifier.
-     */
-    private String identifier ;
-    /**
-     * The string buffer for text element content.
-     */
-    private StringBuffer characterContent = new StringBuffer() ;
-    /**
-     * The new namespaces.
-     */
-    private List newNamespaces = new ArrayList() ;
-    /**
-     * The stack of active namespaces.
-     */
-    private Stack namespaceStack = new Stack() ;
-    /**
-     * The active namespaces.
-     */
-    private Map activeNamespaces = new HashMap() ;
-    
-    /**
-     * The writer for output.
-     */
-    private final PrintWriter printWriter ;
-    
-    /**
-     * Construct the SAX handler with the output writer.
-     * @param writer The writer for output.
-     */
-    public WriterSAXHandler(final Writer writer)
-    {
-        this.printWriter = new PrintWriter(writer) ;
-    }
-    
-    /**
-     * Set the document locator.
-     * @param locator The document locator.
-     */
-    public void setDocumentLocator(final Locator locator)
-    {
-    }
-    
-    /**
-     * Handle the procesing instruction.
-     * @param target The pi target.
-     * @param data The pi data.
-     * @throws SAXException for any errors.
-     */
-    public void processingInstruction(final String target, final String data)
-        throws SAXException
-    {
-    }
-    
-    /**
-     * Start the document.
-     * @throws SAXException for any errors.
-     */
-    public void startDocument()
-    	throws SAXException
-    {
-    }
-    
-    /**
-     * End the document.
-     * @throws SAXException for any errors.
-     */
-    public void endDocument()
-    	throws SAXException
-    {
-        printWriter.flush() ;
-    }
-    
-    /**
-     * Start a prefix mapping.
-     * @param prefix The namespace prefix.
-     * @param uri The namespace uri.
-     * @throws SAXException for any errors.
-     */
-    public void startPrefixMapping(final String prefix, final String uri)
-        throws SAXException
-    {
-        newNamespaces.add(new NamespaceInfo(prefix, uri)) ;
-    }
-    
-    /**
-     * End the prefix mapping.
-     * @param prefix The namespace prefix.
-     * @throws SAXException for any errors.
-     */
-    public void endPrefixMapping(final String prefix)
-    	throws SAXException
-    {
-    }
-    
-    /**
-     * Start an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @param attributes The element attributes.
-     * @throws SAXException for any errors.
-     */
-    public void startElement(final String uri, final String localName, final String qName,
-        final Attributes attributes)
-    	throws SAXException
-    {
-        checkEndStartTag() ;
-        
-        namespaceStack.push(activeNamespaces) ;
-        final Iterator newNamespacesIter = newNamespaces.iterator() ;
-        final String namespaces ;
-        if (newNamespacesIter.hasNext())
-        {
-            final HashMap newActiveNamespaces = new HashMap(activeNamespaces) ;
-            final StringBuffer namespacesValue = new StringBuffer() ;
-            do
-            {
-                final NamespaceInfo namespaceInfo = (NamespaceInfo)newNamespacesIter.next() ;
-                final String namespacePrefix = namespaceInfo.getPrefix() ;
-                final String namespaceURI = namespaceInfo.getURI() ;
-                newActiveNamespaces.put(namespaceURI, namespacePrefix) ;
-               
-                namespacesValue.append(" xmlns") ;
-                if ((namespacePrefix != null) && (namespacePrefix.length() > 0))
-                {
-                    namespacesValue.append(':') ;
-                    namespacesValue.append(namespacePrefix) ;
-                }
-                namespacesValue.append("=\"") ;
-                namespacesValue.append(namespaceURI) ;
-                namespacesValue.append('"') ;
-            }
-            while(newNamespacesIter.hasNext()) ;
-            newNamespaces.clear() ;
-            activeNamespaces = newActiveNamespaces ;
-            namespaces = namespacesValue.toString() ;
-        }
-        else
-        {
-            namespaces = null ;
-        }
-        
-        printWriter.write('<') ;
-        printWriter.write(getQName(uri, localName, qName)) ;
-        if (namespaces != null)
-        {
-            printWriter.write(namespaces) ;
-        }
-        
-        final int numAttributes = attributes.getLength() ;
-        if (numAttributes > 0)
-        {
-            for(int count = 0 ; count < numAttributes ; count++)
-            {
-                printWriter.write(' ') ;
-                final String attributeQName = getQName(attributes.getURI(count), attributes.getLocalName(count), attributes.getQName(count)) ;
-                printWriter.write(attributeQName) ;
-                printWriter.write("=\"") ;
-                final String value = attributes.getValue(count) ;
-                escapeTextContent(value.toCharArray(), 0, value.length()) ;
-                printWriter.write('"') ;
-            }
-        }
-        
-        endStartTag = true ;
-    }
-    
-    /**
-     * End an element.
-     * @param uri The uri.
-     * @param localName The local name.
-     * @param qName The qualified name.
-     * @throws SAXException for any errors.
-     */
-    public void endElement(final String uri, final String localName, final String qName)
-        throws SAXException
-    {
-        characterContent.setLength(0) ;
-        if (endStartTag)
-        {
-            printWriter.write("/>") ;
-        }
-        else
-        {
-            printWriter.write("</") ;
-            printWriter.write(qName) ;
-            printWriter.write('>') ;
-        }
-        activeNamespaces = (Map)namespaceStack.pop() ;
-        endStartTag = false ;
-    }
-    
-    /**
-     * Process character text.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     * @throws SAXException for any errors.
-     */
-    public void characters(char[] chars, int start, int length)
-        throws SAXException
-    {
-        checkEndStartTag() ;
-        escapeTextContent(chars, start, length) ;
-    }
-    
-    /**
-     * Process ignorable white space.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     * @throws SAXException for any errors.
-     */
-    public void ignorableWhitespace(char[] chars, int start, int length)
-        throws SAXException
-    {
-        checkEndStartTag() ;
-        printWriter.write(chars, start, length) ;
-    }
-    
-    /**
-     * Skip an entity.
-     * @throws SAXException for any errors.
-     */
-    public void skippedEntity(final String name)
-    	throws SAXException
-    {
-    }
-    
-    /**
-     * Get the qualified name of the element/attribute.
-     * @param uri The qualifed namespace uri or empty string.
-     * @param localName The qualified local name.
-     * @param qName The qualified name.
-     * @return The qualified name of the element/attribute.
-     */
-    private String getQName(final String uri, final String localName, final String qName)
-    {
-        if (uri.length() > 0)
-        {
-            final String prefix = (String)activeNamespaces.get(uri) ;
-            if (prefix.length() > 0)
-            {
-                return prefix + ":" + localName ;
-            }
-            else
-            {
-                return localName ;
-            }
-        }
-        else
-        {
-            return qName ;
-        }
-    }
-    
-    /**
-     * Check to see if the end of the start tag has been processed.
-     */
-    private void checkEndStartTag()
-    {
-        if (endStartTag)
-        {
-            printWriter.write('>') ;
-            endStartTag = false ;
-        }
-    }
-    
-    /**
-     * Escape the contents of a text element.
-     * @param chars The character array.
-     * @param start The start index.
-     * @param length The length of this section.
-     */
-    private void escapeTextContent(final char[] chars, final int start, final int length)
-    {
-        final int end = start + length ;
-        for(int count = start ; count < end ; count++)
-        {
-            final char ch = chars[count] ;
-            switch(ch)
-            {
-                case '<':
-                    printWriter.print("&lt;") ;
-                    break ;
-                case '>':
-                    printWriter.print("&gt;") ;
-                    break ;
-                case '&':
-                    printWriter.print("&amp;") ;
-                    break ;
-                case '"':
-                    printWriter.print("&quot;") ;
-                    break ;
-                default:
-                    printWriter.print(ch) ;
-                    break ;
-            }
-        }
-    }
-    
-    /**
-     * Return the to address from the processing.
-     * @return The to address.
-     */
-    public String getToAddress()
-    {
-        return toAddress ;
-    }
-    
-    /**
-     * Return the identifier from the processing.
-     * @return The identifier.
-     */
-    public String getIdentifier()
-    {
-        return identifier ;
-    }
-    
-    private static final class NamespaceInfo
-    {
-        /**
-         * The namespace prefix.
-         */
-        private final String prefix ;
-        /**
-         * The namespace uri.
-         */
-        private final String uri ;
-        
-        /**
-         * Construct the namespace information.
-         * @param prefix The namespace prefix.
-         * @param uri The namespace uri.
-         */
-        NamespaceInfo(final String prefix, final String uri)
-        {
-            this.prefix = prefix ;
-            this.uri = uri ;
-        }
-        
-        /**
-         * Get the namespace prefix.
-         * @return The namespace prefix.
-         */
-        String getPrefix()
-        {
-            return prefix ;
-        }
-        
-        /**
-         * Get the namespace URI.
-         * @return The namespace URI.
-         */
-        String getURI()
-        {
-            return uri ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/WriterSAXHandler.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/WriterSAXHandler.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/WriterSAXHandler.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/proxy/WriterSAXHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,414 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Created on 20-Jan-2005
+ */
+package com.jboss.transaction.txinterop.proxy;
+
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+/**
+ * Sax parser for rewriting the XML via the proxy.
+ * @author kevin
+ */
+public class WriterSAXHandler implements ContentHandler
+{
+    /**
+     * Do we need to end the start tag?
+     */
+    private boolean endStartTag ;
+    /**
+     * The to address.
+     */
+    private String toAddress ;
+    /**
+     * The identifier.
+     */
+    private String identifier ;
+    /**
+     * The string buffer for text element content.
+     */
+    private StringBuffer characterContent = new StringBuffer() ;
+    /**
+     * The new namespaces.
+     */
+    private List newNamespaces = new ArrayList() ;
+    /**
+     * The stack of active namespaces.
+     */
+    private Stack namespaceStack = new Stack() ;
+    /**
+     * The active namespaces.
+     */
+    private Map activeNamespaces = new HashMap() ;
+    
+    /**
+     * The writer for output.
+     */
+    private final PrintWriter printWriter ;
+    
+    /**
+     * Construct the SAX handler with the output writer.
+     * @param writer The writer for output.
+     */
+    public WriterSAXHandler(final Writer writer)
+    {
+        this.printWriter = new PrintWriter(writer) ;
+    }
+    
+    /**
+     * Set the document locator.
+     * @param locator The document locator.
+     */
+    public void setDocumentLocator(final Locator locator)
+    {
+    }
+    
+    /**
+     * Handle the procesing instruction.
+     * @param target The pi target.
+     * @param data The pi data.
+     * @throws SAXException for any errors.
+     */
+    public void processingInstruction(final String target, final String data)
+        throws SAXException
+    {
+    }
+    
+    /**
+     * Start the document.
+     * @throws SAXException for any errors.
+     */
+    public void startDocument()
+    	throws SAXException
+    {
+    }
+    
+    /**
+     * End the document.
+     * @throws SAXException for any errors.
+     */
+    public void endDocument()
+    	throws SAXException
+    {
+        printWriter.flush() ;
+    }
+    
+    /**
+     * Start a prefix mapping.
+     * @param prefix The namespace prefix.
+     * @param uri The namespace uri.
+     * @throws SAXException for any errors.
+     */
+    public void startPrefixMapping(final String prefix, final String uri)
+        throws SAXException
+    {
+        newNamespaces.add(new NamespaceInfo(prefix, uri)) ;
+    }
+    
+    /**
+     * End the prefix mapping.
+     * @param prefix The namespace prefix.
+     * @throws SAXException for any errors.
+     */
+    public void endPrefixMapping(final String prefix)
+    	throws SAXException
+    {
+    }
+    
+    /**
+     * Start an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @param attributes The element attributes.
+     * @throws SAXException for any errors.
+     */
+    public void startElement(final String uri, final String localName, final String qName,
+        final Attributes attributes)
+    	throws SAXException
+    {
+        checkEndStartTag() ;
+        
+        namespaceStack.push(activeNamespaces) ;
+        final Iterator newNamespacesIter = newNamespaces.iterator() ;
+        final String namespaces ;
+        if (newNamespacesIter.hasNext())
+        {
+            final HashMap newActiveNamespaces = new HashMap(activeNamespaces) ;
+            final StringBuffer namespacesValue = new StringBuffer() ;
+            do
+            {
+                final NamespaceInfo namespaceInfo = (NamespaceInfo)newNamespacesIter.next() ;
+                final String namespacePrefix = namespaceInfo.getPrefix() ;
+                final String namespaceURI = namespaceInfo.getURI() ;
+                newActiveNamespaces.put(namespaceURI, namespacePrefix) ;
+               
+                namespacesValue.append(" xmlns") ;
+                if ((namespacePrefix != null) && (namespacePrefix.length() > 0))
+                {
+                    namespacesValue.append(':') ;
+                    namespacesValue.append(namespacePrefix) ;
+                }
+                namespacesValue.append("=\"") ;
+                namespacesValue.append(namespaceURI) ;
+                namespacesValue.append('"') ;
+            }
+            while(newNamespacesIter.hasNext()) ;
+            newNamespaces.clear() ;
+            activeNamespaces = newActiveNamespaces ;
+            namespaces = namespacesValue.toString() ;
+        }
+        else
+        {
+            namespaces = null ;
+        }
+        
+        printWriter.write('<') ;
+        printWriter.write(getQName(uri, localName, qName)) ;
+        if (namespaces != null)
+        {
+            printWriter.write(namespaces) ;
+        }
+        
+        final int numAttributes = attributes.getLength() ;
+        if (numAttributes > 0)
+        {
+            for(int count = 0 ; count < numAttributes ; count++)
+            {
+                printWriter.write(' ') ;
+                final String attributeQName = getQName(attributes.getURI(count), attributes.getLocalName(count), attributes.getQName(count)) ;
+                printWriter.write(attributeQName) ;
+                printWriter.write("=\"") ;
+                final String value = attributes.getValue(count) ;
+                escapeTextContent(value.toCharArray(), 0, value.length()) ;
+                printWriter.write('"') ;
+            }
+        }
+        
+        endStartTag = true ;
+    }
+    
+    /**
+     * End an element.
+     * @param uri The uri.
+     * @param localName The local name.
+     * @param qName The qualified name.
+     * @throws SAXException for any errors.
+     */
+    public void endElement(final String uri, final String localName, final String qName)
+        throws SAXException
+    {
+        characterContent.setLength(0) ;
+        if (endStartTag)
+        {
+            printWriter.write("/>") ;
+        }
+        else
+        {
+            printWriter.write("</") ;
+            printWriter.write(qName) ;
+            printWriter.write('>') ;
+        }
+        activeNamespaces = (Map)namespaceStack.pop() ;
+        endStartTag = false ;
+    }
+    
+    /**
+     * Process character text.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     * @throws SAXException for any errors.
+     */
+    public void characters(char[] chars, int start, int length)
+        throws SAXException
+    {
+        checkEndStartTag() ;
+        escapeTextContent(chars, start, length) ;
+    }
+    
+    /**
+     * Process ignorable white space.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     * @throws SAXException for any errors.
+     */
+    public void ignorableWhitespace(char[] chars, int start, int length)
+        throws SAXException
+    {
+        checkEndStartTag() ;
+        printWriter.write(chars, start, length) ;
+    }
+    
+    /**
+     * Skip an entity.
+     * @throws SAXException for any errors.
+     */
+    public void skippedEntity(final String name)
+    	throws SAXException
+    {
+    }
+    
+    /**
+     * Get the qualified name of the element/attribute.
+     * @param uri The qualifed namespace uri or empty string.
+     * @param localName The qualified local name.
+     * @param qName The qualified name.
+     * @return The qualified name of the element/attribute.
+     */
+    private String getQName(final String uri, final String localName, final String qName)
+    {
+        if (uri.length() > 0)
+        {
+            final String prefix = (String)activeNamespaces.get(uri) ;
+            if (prefix.length() > 0)
+            {
+                return prefix + ":" + localName ;
+            }
+            else
+            {
+                return localName ;
+            }
+        }
+        else
+        {
+            return qName ;
+        }
+    }
+    
+    /**
+     * Check to see if the end of the start tag has been processed.
+     */
+    private void checkEndStartTag()
+    {
+        if (endStartTag)
+        {
+            printWriter.write('>') ;
+            endStartTag = false ;
+        }
+    }
+    
+    /**
+     * Escape the contents of a text element.
+     * @param chars The character array.
+     * @param start The start index.
+     * @param length The length of this section.
+     */
+    private void escapeTextContent(final char[] chars, final int start, final int length)
+    {
+        final int end = start + length ;
+        for(int count = start ; count < end ; count++)
+        {
+            final char ch = chars[count] ;
+            switch(ch)
+            {
+                case '<':
+                    printWriter.print("&lt;") ;
+                    break ;
+                case '>':
+                    printWriter.print("&gt;") ;
+                    break ;
+                case '&':
+                    printWriter.print("&amp;") ;
+                    break ;
+                case '"':
+                    printWriter.print("&quot;") ;
+                    break ;
+                default:
+                    printWriter.print(ch) ;
+                    break ;
+            }
+        }
+    }
+    
+    /**
+     * Return the to address from the processing.
+     * @return The to address.
+     */
+    public String getToAddress()
+    {
+        return toAddress ;
+    }
+    
+    /**
+     * Return the identifier from the processing.
+     * @return The identifier.
+     */
+    public String getIdentifier()
+    {
+        return identifier ;
+    }
+    
+    private static final class NamespaceInfo
+    {
+        /**
+         * The namespace prefix.
+         */
+        private final String prefix ;
+        /**
+         * The namespace uri.
+         */
+        private final String uri ;
+        
+        /**
+         * Construct the namespace information.
+         * @param prefix The namespace prefix.
+         * @param uri The namespace uri.
+         */
+        NamespaceInfo(final String prefix, final String uri)
+        {
+            this.prefix = prefix ;
+            this.uri = uri ;
+        }
+        
+        /**
+         * Get the namespace prefix.
+         * @return The namespace prefix.
+         */
+        String getPrefix()
+        {
+            return prefix ;
+        }
+        
+        /**
+         * Get the namespace URI.
+         * @return The namespace URI.
+         */
+        String getURI()
+        {
+            return uri ;
+        }
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/FullTestResult.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/FullTestResult.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/FullTestResult.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,130 +0,0 @@
-package com.jboss.transaction.txinterop.test;
-
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.AssertionFailedError;
-
-import java.util.List;
-import java.util.LinkedList;
-
-/**
- * TestResult which holds list of passed tests, not only failed
- * or error tests, and time of executions of them.
- * @author <a href="mailto:istudens at redhat.com">Ivo Studensky</a>
- * @version <tt>$Revision$</tt>
- */
-public class FullTestResult extends TestResult
-{
-   private List _passedTests;
-   private List _failedTests;
-   private List _errorTests;
-
-   private long                 _startTime            = 0;
-   private boolean              _failed               = false;
-   private boolean              _error                = false;
-   private AssertionFailedError _assertionFailedError = null;
-   private Throwable            _throwable            = null;
-
-   public FullTestResult()
-   {
-      super();
-
-      _passedTests        = new LinkedList();
-      _failedTests        = new LinkedList();
-      _errorTests         = new LinkedList();
-   }
-
-   public List getPassedTests()
-   {
-      return _passedTests;
-   }
-
-   public List getFailedTests()
-   {
-      return _failedTests;
-   }
-
-   public List getErrorTests()
-   {
-      return _errorTests;
-   }
-
-   /*-----------  OVERWRITES  ----------*/
-   public void startTest(Test test)
-   {
-      super.startTest(test);
-
-      _startTime            = System.currentTimeMillis();
-      _failed               = false;
-      _error                = false;
-      _assertionFailedError = null;
-      _throwable            = null;
-   }
-
-   public void addError(Test test, Throwable throwable)
-   {
-      super.addError(test, throwable);
-
-      _error     = true;
-      _throwable = throwable;
-   }
-
-   public void addFailure(Test test, AssertionFailedError assertionFailedError)
-   {
-      super.addFailure(test, assertionFailedError);
-
-      _failed               = true;
-      _assertionFailedError = assertionFailedError;
-   }
-
-   public void endTest(Test test)
-   {
-      super.endTest(test);
-
-      if (_failed)
-      {
-          FailedTest failedTest           = new FailedTest();
-          failedTest.test                 = test;
-          failedTest.duration             = System.currentTimeMillis() - _startTime;
-          failedTest.assertionFailedError = _assertionFailedError;
-          _failedTests.add(failedTest);
-      }
-      else if (_error)
-      {
-          ErrorTest errorTest = new ErrorTest();
-          errorTest.test      = test;
-          errorTest.duration  = System.currentTimeMillis() - _startTime;
-          errorTest.throwable = _throwable;
-          _errorTests.add(errorTest);
-      }
-      else
-      {
-          PassedTest passedTest = new PassedTest();
-          passedTest.test       = test;
-          passedTest.duration   = System.currentTimeMillis() - _startTime;
-          _passedTests.add(passedTest);
-      }
-   }
-
-   /*----------   SUBCLASSES   -----------*/
-   public class PassedTest
-   {
-      public Test test;
-      public long duration;
-   }
-
-   public class FailedTest
-   {
-      public Test                 test;
-      public long                 duration;
-      public AssertionFailedError assertionFailedError;
-   }
-
-   public class ErrorTest
-   {
-      public Test      test;
-      public long      duration;
-      public Throwable throwable;
-   }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/FullTestResult.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/FullTestResult.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/FullTestResult.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/FullTestResult.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,150 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.test;
+
+import junit.framework.Test;
+import junit.framework.TestResult;
+import junit.framework.AssertionFailedError;
+
+import java.util.List;
+import java.util.LinkedList;
+
+/**
+ * TestResult which holds list of passed tests, not only failed
+ * or error tests, and time of executions of them.
+ * @author <a href="mailto:istudens at redhat.com">Ivo Studensky</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class FullTestResult extends TestResult
+{
+   private List _passedTests;
+   private List _failedTests;
+   private List _errorTests;
+
+   private long                 _startTime            = 0;
+   private boolean              _failed               = false;
+   private boolean              _error                = false;
+   private AssertionFailedError _assertionFailedError = null;
+   private Throwable            _throwable            = null;
+
+   public FullTestResult()
+   {
+      super();
+
+      _passedTests        = new LinkedList();
+      _failedTests        = new LinkedList();
+      _errorTests         = new LinkedList();
+   }
+
+   public List getPassedTests()
+   {
+      return _passedTests;
+   }
+
+   public List getFailedTests()
+   {
+      return _failedTests;
+   }
+
+   public List getErrorTests()
+   {
+      return _errorTests;
+   }
+
+   /*-----------  OVERWRITES  ----------*/
+   public void startTest(Test test)
+   {
+      super.startTest(test);
+
+      _startTime            = System.currentTimeMillis();
+      _failed               = false;
+      _error                = false;
+      _assertionFailedError = null;
+      _throwable            = null;
+   }
+
+   public void addError(Test test, Throwable throwable)
+   {
+      super.addError(test, throwable);
+
+      _error     = true;
+      _throwable = throwable;
+   }
+
+   public void addFailure(Test test, AssertionFailedError assertionFailedError)
+   {
+      super.addFailure(test, assertionFailedError);
+
+      _failed               = true;
+      _assertionFailedError = assertionFailedError;
+   }
+
+   public void endTest(Test test)
+   {
+      super.endTest(test);
+
+      if (_failed)
+      {
+          FailedTest failedTest           = new FailedTest();
+          failedTest.test                 = test;
+          failedTest.duration             = System.currentTimeMillis() - _startTime;
+          failedTest.assertionFailedError = _assertionFailedError;
+          _failedTests.add(failedTest);
+      }
+      else if (_error)
+      {
+          ErrorTest errorTest = new ErrorTest();
+          errorTest.test      = test;
+          errorTest.duration  = System.currentTimeMillis() - _startTime;
+          errorTest.throwable = _throwable;
+          _errorTests.add(errorTest);
+      }
+      else
+      {
+          PassedTest passedTest = new PassedTest();
+          passedTest.test       = test;
+          passedTest.duration   = System.currentTimeMillis() - _startTime;
+          _passedTests.add(passedTest);
+      }
+   }
+
+   /*----------   SUBCLASSES   -----------*/
+   public class PassedTest
+   {
+      public Test test;
+      public long duration;
+   }
+
+   public class FailedTest
+   {
+      public Test                 test;
+      public long                 duration;
+      public AssertionFailedError assertionFailedError;
+   }
+
+   public class ErrorTest
+   {
+      public Test      test;
+      public long      duration;
+      public Throwable throwable;
+   }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestConstants.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,336 +0,0 @@
-package com.jboss.transaction.txinterop.test ;
-
-import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
-import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * This class contains constants used to map the front end onto
- * the WS-TX interop tests.
- * @author kevin
- */
-public class TestConstants
-{
-    /**
-     * The name of the Service URI parameter.
-     */
-    public static final String PARAM_SERVICE_URI = "serviceuri" ;
-    /**
-     * The name of the test parameter.
-     */
-    public static final String PARAM_TEST = "test" ;
-    /**
-     * The name of the test timeout parameter.
-     */
-    public static final String PARAM_TEST_TIMEOUT = "testTimeout" ;
-    /**
-     * The name of the asynchronous test flag parameter.
-     */
-    public static final String PARAM_ASYNC_TEST = "asyncTest" ;
-    /**
-     * The name of the result page parameter.
-     */
-    public static final String PARAM_RESULT_PAGE = "resultPage";
-    /**
-     * Default address of page with results.
-     */
-    public static final String DEFAULT_RESULT_PAGE_ADDRESS = "/results.jsp";
-
-    /**
-     * The name of the test results attribute.
-     */
-    public static final String ATTRIBUTE_TEST_RESULT = "testResult" ;
-    /**
-     * The name of the test validation attribute.
-     */
-    public static final String ATTRIBUTE_TEST_VALIDATION = "testValidation" ;
-    /**
-     * The name of the log count attribute.
-     */
-    public static final String ATTRIBUTE_LOG_COUNT = "logCount" ;
-    /**
-     * The name of the log name attribute.
-     */
-    public static final String ATTRIBUTE_LOG_NAME = "logName" ;
-    
-    /**
-     * test name for all tests
-     */
-    public static final String NAME_ALL_TESTS = "allTests" ;
-    /**
-     * test name for all AT tests
-     */
-    public static final String NAME_ALL_AT_TESTS = "allATTests" ;
-    /**
-     * test name for all BA tests
-     */
-    public static final String NAME_ALL_BA_TESTS = "allBATests" ;
-    /**
-     * The prefix for all AT tests.
-     */
-    public static final String PREFIX_AT_TESTS = "testAT" ;
-    /**
-     * The prefix for all BA tests.
-     */
-    public static final String PREFIX_BA_TESTS = "testBA" ;
-    
-    /**
-     * test name for AT Scenario 1.1
-     */
-    public static final String NAME_TEST_AT_1_1 = PREFIX_AT_TESTS + "1_1" ;
-    /**
-     * test description for AT Scenario 1.1
-     */
-    public static final String DESCRIPTION_TEST_AT_1_1 = "1.1 - " + ATInteropConstants.INTEROP_ELEMENT_COMPLETION_COMMIT ;
-    /**
-     * test name for AT Scenario 1.2
-     */
-    public static final String NAME_TEST_AT_1_2 = PREFIX_AT_TESTS + "1_2" ;
-    /**
-     * test description for AT Scenario 1.2
-     */
-    public static final String DESCRIPTION_TEST_AT_1_2 = "1.2 - " + ATInteropConstants.INTEROP_ELEMENT_COMPLETION_ROLLBACK ;
-    /**
-     * test name for AT Scenario 2.1
-     */
-    public static final String NAME_TEST_AT_2_1 = PREFIX_AT_TESTS + "2_1" ;
-    /**
-     * test description for AT Scenario 2.1
-     */
-    public static final String DESCRIPTION_TEST_AT_2_1 = "2.1 - " + ATInteropConstants.INTEROP_ELEMENT_COMMIT ;
-    /**
-     * test name for AT Scenario 2.2
-     */
-    public static final String NAME_TEST_AT_2_2 = PREFIX_AT_TESTS + "2_2" ;
-    /**
-     * test description for AT Scenario 2.2
-     */
-    public static final String DESCRIPTION_TEST_AT_2_2 = "2.2 - " + ATInteropConstants.INTEROP_ELEMENT_ROLLBACK ;
-    /**
-     * test name for AT Scenario 3.1
-     */
-    public static final String NAME_TEST_AT_3_1 = PREFIX_AT_TESTS + "3_1" ;
-    /**
-     * test description for AT Scenario 3.1
-     */
-    public static final String DESCRIPTION_TEST_AT_3_1 = "3.1 - " + ATInteropConstants.INTEROP_ELEMENT_PHASE_2_ROLLBACK ;
-    /**
-     * test name for AT Scenario 3.2
-     */
-    public static final String NAME_TEST_AT_3_2 = PREFIX_AT_TESTS + "3_2" ;
-    /**
-     * test description for AT Scenario 3.2
-     */
-    public static final String DESCRIPTION_TEST_AT_3_2 = "3.2 - " + ATInteropConstants.INTEROP_ELEMENT_READONLY ;
-    /**
-     * test name for AT Scenario 3.3
-     */
-    public static final String NAME_TEST_AT_3_3 = PREFIX_AT_TESTS + "3_3" ;
-    /**
-     * test description for AT Scenario 3.3
-     */
-    public static final String DESCRIPTION_TEST_AT_3_3 = "3.3 - " + ATInteropConstants.INTEROP_ELEMENT_VOLATILE_AND_DURABLE ;
-    /**
-     * test name for AT Scenario 4.1
-     */
-    public static final String NAME_TEST_AT_4_1 = PREFIX_AT_TESTS + "4_1" ;
-    /**
-     * test description for AT Scenario 4.1
-     */
-    public static final String DESCRIPTION_TEST_AT_4_1 = "4.1 - " + ATInteropConstants.INTEROP_ELEMENT_EARLY_READONLY ;
-    /**
-     * test name for AT Scenario 4.2
-     */
-    public static final String NAME_TEST_AT_4_2 = PREFIX_AT_TESTS + "4_2" ;
-    /**
-     * test description for AT Scenario 4.2
-     */
-    public static final String DESCRIPTION_TEST_AT_4_2 = "4.2 - " + ATInteropConstants.INTEROP_ELEMENT_EARLY_ABORTED ;
-    /**
-     * test name for AT Scenario 5.1
-     */
-    public static final String NAME_TEST_AT_5_1 = PREFIX_AT_TESTS + "5_1" ;
-    /**
-     * test description for AT Scenario 5.1
-     */
-    public static final String DESCRIPTION_TEST_AT_5_1 = "5.1 - " + ATInteropConstants.INTEROP_ELEMENT_REPLAY_COMMIT ;
-    /**
-     * test name for AT Scenario 5.2
-     */
-    public static final String NAME_TEST_AT_5_2 = PREFIX_AT_TESTS + "5_2" ;
-    /**
-     * test description for AT Scenario 5.2
-     */
-    public static final String DESCRIPTION_TEST_AT_5_2 = "5.2 - " + ATInteropConstants.INTEROP_ELEMENT_RETRY_PREPARED_COMMIT ;
-    /**
-     * test name for AT Scenario 5.3
-     */
-    public static final String NAME_TEST_AT_5_3 = PREFIX_AT_TESTS + "5_3" ;
-    /**
-     * test description for AT Scenario 5.3
-     */
-    public static final String DESCRIPTION_TEST_AT_5_3 = "5.3 - " + ATInteropConstants.INTEROP_ELEMENT_RETRY_PREPARED_ABORT ;
-    /**
-     * test name for AT Scenario 5.4
-     */
-    public static final String NAME_TEST_AT_5_4 = PREFIX_AT_TESTS + "5_4" ;
-    /**
-     * test description for AT Scenario 5.4
-     */
-    public static final String DESCRIPTION_TEST_AT_5_4 = "5.4 - " + ATInteropConstants.INTEROP_ELEMENT_RETRY_COMMIT ;
-    /**
-     * test name for AT Scenario 5.5
-     */
-    public static final String NAME_TEST_AT_5_5 = PREFIX_AT_TESTS + "5_5" ;
-    /**
-     * test description for AT Scenario 5.5
-     */
-    public static final String DESCRIPTION_TEST_AT_5_5 = "5.5 - " + ATInteropConstants.INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT ;
-    /**
-     * test name for AT Scenario 5.6
-     */
-    public static final String NAME_TEST_AT_5_6 = PREFIX_AT_TESTS + "5_6" ;
-    /**
-     * test description for AT Scenario 5.6
-     */
-    public static final String DESCRIPTION_TEST_AT_5_6 = "5.6 - " + ATInteropConstants.INTEROP_ELEMENT_LOST_COMMITTED ;
-
-    /**
-     * test name for BA Scenario 1.1
-     */
-    public static final String NAME_TEST_BA_1_1 = PREFIX_BA_TESTS + "1_1" ;
-    /**
-     * test description for BA Scenario 1.1
-     */
-    public static final String DESCRIPTION_TEST_BA_1_1 = "1.1 - " + BAInteropConstants.INTEROP_ELEMENT_CANCEL ;
-    /**
-     * test name for BA Scenario 1.2
-     */
-    public static final String NAME_TEST_BA_1_2 = PREFIX_BA_TESTS + "1_2" ;
-    /**
-     * test description for BA Scenario 1.2
-     */
-    public static final String DESCRIPTION_TEST_BA_1_2 = "1.2 - " + BAInteropConstants.INTEROP_ELEMENT_EXIT ;
-    /**
-     * test name for BA Scenario 1.3
-     */
-    public static final String NAME_TEST_BA_1_3 = PREFIX_BA_TESTS + "1_3" ;
-    /**
-     * test description for BA Scenario 1.3
-     */
-    public static final String DESCRIPTION_TEST_BA_1_3 = "1.3 - " + BAInteropConstants.INTEROP_ELEMENT_FAIL ;
-    /**
-     * test name for BA Scenario 1.4
-     */
-    public static final String NAME_TEST_BA_1_4 = PREFIX_BA_TESTS + "1_4" ;
-    /**
-     * test description for BA Scenario 1.4
-     */
-    public static final String DESCRIPTION_TEST_BA_1_4 = "1.4 - " + BAInteropConstants.INTEROP_ELEMENT_CANNOT_COMPLETE ;
-    /**
-     * test name for BA Scenario 1.5
-     */
-    public static final String NAME_TEST_BA_1_5 = PREFIX_BA_TESTS + "1_5" ;
-    /**
-     * test description for BA Scenario 1.5
-     */
-    public static final String DESCRIPTION_TEST_BA_1_5 = "1.5 - " + BAInteropConstants.INTEROP_ELEMENT_PARTICIPANT_COMPLETE_CLOSE ;
-    /**
-     * test name for BA Scenario 1.6
-     */
-    public static final String NAME_TEST_BA_1_6 = PREFIX_BA_TESTS + "1_6" ;
-    /**
-     * test description for BA Scenario 1.6
-     */
-    public static final String DESCRIPTION_TEST_BA_1_6 = "1.6 - " + BAInteropConstants.INTEROP_ELEMENT_COORDINATOR_COMPLETE_CLOSE ;
-    /**
-     * test name for BA Scenario 1.7
-     */
-    public static final String NAME_TEST_BA_1_7 = PREFIX_BA_TESTS + "1_7" ;
-    /**
-     * test description for BA Scenario 1.7
-     */
-    public static final String DESCRIPTION_TEST_BA_1_7 = "1.7 - " + BAInteropConstants.INTEROP_ELEMENT_UNSOLICITED_COMPLETE ;
-    /**
-     * test name for BA Scenario 1.8
-     */
-    public static final String NAME_TEST_BA_1_8 = PREFIX_BA_TESTS + "1_8" ;
-    /**
-     * test description for BA Scenario 1.8
-     */
-    public static final String DESCRIPTION_TEST_BA_1_8 = "1.8 - " + BAInteropConstants.INTEROP_ELEMENT_COMPENSATE ;
-    /**
-     * test name for BA Scenario 1.9
-     */
-    public static final String NAME_TEST_BA_1_9 = PREFIX_BA_TESTS + "1_9" ;
-    /**
-     * test description for BA Scenario 1.9
-     */
-    public static final String DESCRIPTION_TEST_BA_1_9 = "1.9 - " + BAInteropConstants.INTEROP_ELEMENT_COMPENSATION_FAIL ;
-    /**
-     * test name for BA Scenario 1.10
-     */
-    public static final String NAME_TEST_BA_1_10 = PREFIX_BA_TESTS + "1_10" ;
-    /**
-     * test description for BA Scenario 1.10
-     */
-    public static final String DESCRIPTION_TEST_BA_1_10 = "1.10 - " + BAInteropConstants.INTEROP_ELEMENT_PARTICIPANT_CANCEL_COMPLETED_RACE ;
-    /**
-     * test name for BA Scenario 1.11
-     */
-    public static final String NAME_TEST_BA_1_11 = PREFIX_BA_TESTS + "1_11" ;
-    /**
-     * test description for BA Scenario 1.11
-     */
-    public static final String DESCRIPTION_TEST_BA_1_11 = "1.11 - " + BAInteropConstants.INTEROP_ELEMENT_MESSAGE_LOSS_AND_RECOVERY ;
-    /**
-     * test name for BA Scenario 1.12
-     */
-    public static final String NAME_TEST_BA_1_12 = PREFIX_BA_TESTS + "1_12" ;
-    /**
-     * test description for BA Scenario 1.12
-     */
-    public static final String DESCRIPTION_TEST_BA_1_12 = "1.12 - " + BAInteropConstants.INTEROP_ELEMENT_MIXED_OUTCOME ;
-
-    /**
-     * The name to description map.
-     */
-    public static final Map DESCRIPTIONS ;
-    
-    static
-    {
-        final TreeMap descriptions = new TreeMap() ;
-        
-        descriptions.put(NAME_TEST_AT_1_1, DESCRIPTION_TEST_AT_1_1) ;
-        descriptions.put(NAME_TEST_AT_1_2, DESCRIPTION_TEST_AT_1_2) ;
-        descriptions.put(NAME_TEST_AT_2_1, DESCRIPTION_TEST_AT_2_1) ;
-        descriptions.put(NAME_TEST_AT_2_2, DESCRIPTION_TEST_AT_2_2) ;
-        descriptions.put(NAME_TEST_AT_3_1, DESCRIPTION_TEST_AT_3_1) ;
-        descriptions.put(NAME_TEST_AT_3_2, DESCRIPTION_TEST_AT_3_2) ;
-        descriptions.put(NAME_TEST_AT_3_3, DESCRIPTION_TEST_AT_3_3) ;
-        descriptions.put(NAME_TEST_AT_4_1, DESCRIPTION_TEST_AT_4_1) ;
-        descriptions.put(NAME_TEST_AT_4_2, DESCRIPTION_TEST_AT_4_2) ;
-        descriptions.put(NAME_TEST_AT_5_1, DESCRIPTION_TEST_AT_5_1) ;
-        descriptions.put(NAME_TEST_AT_5_2, DESCRIPTION_TEST_AT_5_2) ;
-        descriptions.put(NAME_TEST_AT_5_3, DESCRIPTION_TEST_AT_5_3) ;
-        descriptions.put(NAME_TEST_AT_5_4, DESCRIPTION_TEST_AT_5_4) ;
-        descriptions.put(NAME_TEST_AT_5_5, DESCRIPTION_TEST_AT_5_5) ;
-        descriptions.put(NAME_TEST_AT_5_6, DESCRIPTION_TEST_AT_5_6) ;
-        descriptions.put(NAME_TEST_BA_1_1, DESCRIPTION_TEST_BA_1_1) ;
-        descriptions.put(NAME_TEST_BA_1_2, DESCRIPTION_TEST_BA_1_2) ;
-        descriptions.put(NAME_TEST_BA_1_3, DESCRIPTION_TEST_BA_1_3) ;
-        descriptions.put(NAME_TEST_BA_1_4, DESCRIPTION_TEST_BA_1_4) ;
-        descriptions.put(NAME_TEST_BA_1_5, DESCRIPTION_TEST_BA_1_5) ;
-        descriptions.put(NAME_TEST_BA_1_6, DESCRIPTION_TEST_BA_1_6) ;
-        descriptions.put(NAME_TEST_BA_1_7, DESCRIPTION_TEST_BA_1_7) ;
-        descriptions.put(NAME_TEST_BA_1_8, DESCRIPTION_TEST_BA_1_8) ;
-        descriptions.put(NAME_TEST_BA_1_9, DESCRIPTION_TEST_BA_1_9) ;
-        descriptions.put(NAME_TEST_BA_1_10, DESCRIPTION_TEST_BA_1_10) ;
-        descriptions.put(NAME_TEST_BA_1_11, DESCRIPTION_TEST_BA_1_11) ;
-//        descriptions.put(NAME_TEST_BA_1_12, DESCRIPTION_TEST_BA_1_12) ;
-       
-        DESCRIPTIONS = descriptions ;
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestConstants.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestConstants.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestConstants.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,356 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.test ;
+
+import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
+import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * This class contains constants used to map the front end onto
+ * the WS-TX interop tests.
+ * @author kevin
+ */
+public class TestConstants
+{
+    /**
+     * The name of the Service URI parameter.
+     */
+    public static final String PARAM_SERVICE_URI = "serviceuri" ;
+    /**
+     * The name of the test parameter.
+     */
+    public static final String PARAM_TEST = "test" ;
+    /**
+     * The name of the test timeout parameter.
+     */
+    public static final String PARAM_TEST_TIMEOUT = "testTimeout" ;
+    /**
+     * The name of the asynchronous test flag parameter.
+     */
+    public static final String PARAM_ASYNC_TEST = "asyncTest" ;
+    /**
+     * The name of the result page parameter.
+     */
+    public static final String PARAM_RESULT_PAGE = "resultPage";
+    /**
+     * Default address of page with results.
+     */
+    public static final String DEFAULT_RESULT_PAGE_ADDRESS = "/results.jsp";
+
+    /**
+     * The name of the test results attribute.
+     */
+    public static final String ATTRIBUTE_TEST_RESULT = "testResult" ;
+    /**
+     * The name of the test validation attribute.
+     */
+    public static final String ATTRIBUTE_TEST_VALIDATION = "testValidation" ;
+    /**
+     * The name of the log count attribute.
+     */
+    public static final String ATTRIBUTE_LOG_COUNT = "logCount" ;
+    /**
+     * The name of the log name attribute.
+     */
+    public static final String ATTRIBUTE_LOG_NAME = "logName" ;
+    
+    /**
+     * test name for all tests
+     */
+    public static final String NAME_ALL_TESTS = "allTests" ;
+    /**
+     * test name for all AT tests
+     */
+    public static final String NAME_ALL_AT_TESTS = "allATTests" ;
+    /**
+     * test name for all BA tests
+     */
+    public static final String NAME_ALL_BA_TESTS = "allBATests" ;
+    /**
+     * The prefix for all AT tests.
+     */
+    public static final String PREFIX_AT_TESTS = "testAT" ;
+    /**
+     * The prefix for all BA tests.
+     */
+    public static final String PREFIX_BA_TESTS = "testBA" ;
+    
+    /**
+     * test name for AT Scenario 1.1
+     */
+    public static final String NAME_TEST_AT_1_1 = PREFIX_AT_TESTS + "1_1" ;
+    /**
+     * test description for AT Scenario 1.1
+     */
+    public static final String DESCRIPTION_TEST_AT_1_1 = "1.1 - " + ATInteropConstants.INTEROP_ELEMENT_COMPLETION_COMMIT ;
+    /**
+     * test name for AT Scenario 1.2
+     */
+    public static final String NAME_TEST_AT_1_2 = PREFIX_AT_TESTS + "1_2" ;
+    /**
+     * test description for AT Scenario 1.2
+     */
+    public static final String DESCRIPTION_TEST_AT_1_2 = "1.2 - " + ATInteropConstants.INTEROP_ELEMENT_COMPLETION_ROLLBACK ;
+    /**
+     * test name for AT Scenario 2.1
+     */
+    public static final String NAME_TEST_AT_2_1 = PREFIX_AT_TESTS + "2_1" ;
+    /**
+     * test description for AT Scenario 2.1
+     */
+    public static final String DESCRIPTION_TEST_AT_2_1 = "2.1 - " + ATInteropConstants.INTEROP_ELEMENT_COMMIT ;
+    /**
+     * test name for AT Scenario 2.2
+     */
+    public static final String NAME_TEST_AT_2_2 = PREFIX_AT_TESTS + "2_2" ;
+    /**
+     * test description for AT Scenario 2.2
+     */
+    public static final String DESCRIPTION_TEST_AT_2_2 = "2.2 - " + ATInteropConstants.INTEROP_ELEMENT_ROLLBACK ;
+    /**
+     * test name for AT Scenario 3.1
+     */
+    public static final String NAME_TEST_AT_3_1 = PREFIX_AT_TESTS + "3_1" ;
+    /**
+     * test description for AT Scenario 3.1
+     */
+    public static final String DESCRIPTION_TEST_AT_3_1 = "3.1 - " + ATInteropConstants.INTEROP_ELEMENT_PHASE_2_ROLLBACK ;
+    /**
+     * test name for AT Scenario 3.2
+     */
+    public static final String NAME_TEST_AT_3_2 = PREFIX_AT_TESTS + "3_2" ;
+    /**
+     * test description for AT Scenario 3.2
+     */
+    public static final String DESCRIPTION_TEST_AT_3_2 = "3.2 - " + ATInteropConstants.INTEROP_ELEMENT_READONLY ;
+    /**
+     * test name for AT Scenario 3.3
+     */
+    public static final String NAME_TEST_AT_3_3 = PREFIX_AT_TESTS + "3_3" ;
+    /**
+     * test description for AT Scenario 3.3
+     */
+    public static final String DESCRIPTION_TEST_AT_3_3 = "3.3 - " + ATInteropConstants.INTEROP_ELEMENT_VOLATILE_AND_DURABLE ;
+    /**
+     * test name for AT Scenario 4.1
+     */
+    public static final String NAME_TEST_AT_4_1 = PREFIX_AT_TESTS + "4_1" ;
+    /**
+     * test description for AT Scenario 4.1
+     */
+    public static final String DESCRIPTION_TEST_AT_4_1 = "4.1 - " + ATInteropConstants.INTEROP_ELEMENT_EARLY_READONLY ;
+    /**
+     * test name for AT Scenario 4.2
+     */
+    public static final String NAME_TEST_AT_4_2 = PREFIX_AT_TESTS + "4_2" ;
+    /**
+     * test description for AT Scenario 4.2
+     */
+    public static final String DESCRIPTION_TEST_AT_4_2 = "4.2 - " + ATInteropConstants.INTEROP_ELEMENT_EARLY_ABORTED ;
+    /**
+     * test name for AT Scenario 5.1
+     */
+    public static final String NAME_TEST_AT_5_1 = PREFIX_AT_TESTS + "5_1" ;
+    /**
+     * test description for AT Scenario 5.1
+     */
+    public static final String DESCRIPTION_TEST_AT_5_1 = "5.1 - " + ATInteropConstants.INTEROP_ELEMENT_REPLAY_COMMIT ;
+    /**
+     * test name for AT Scenario 5.2
+     */
+    public static final String NAME_TEST_AT_5_2 = PREFIX_AT_TESTS + "5_2" ;
+    /**
+     * test description for AT Scenario 5.2
+     */
+    public static final String DESCRIPTION_TEST_AT_5_2 = "5.2 - " + ATInteropConstants.INTEROP_ELEMENT_RETRY_PREPARED_COMMIT ;
+    /**
+     * test name for AT Scenario 5.3
+     */
+    public static final String NAME_TEST_AT_5_3 = PREFIX_AT_TESTS + "5_3" ;
+    /**
+     * test description for AT Scenario 5.3
+     */
+    public static final String DESCRIPTION_TEST_AT_5_3 = "5.3 - " + ATInteropConstants.INTEROP_ELEMENT_RETRY_PREPARED_ABORT ;
+    /**
+     * test name for AT Scenario 5.4
+     */
+    public static final String NAME_TEST_AT_5_4 = PREFIX_AT_TESTS + "5_4" ;
+    /**
+     * test description for AT Scenario 5.4
+     */
+    public static final String DESCRIPTION_TEST_AT_5_4 = "5.4 - " + ATInteropConstants.INTEROP_ELEMENT_RETRY_COMMIT ;
+    /**
+     * test name for AT Scenario 5.5
+     */
+    public static final String NAME_TEST_AT_5_5 = PREFIX_AT_TESTS + "5_5" ;
+    /**
+     * test description for AT Scenario 5.5
+     */
+    public static final String DESCRIPTION_TEST_AT_5_5 = "5.5 - " + ATInteropConstants.INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT ;
+    /**
+     * test name for AT Scenario 5.6
+     */
+    public static final String NAME_TEST_AT_5_6 = PREFIX_AT_TESTS + "5_6" ;
+    /**
+     * test description for AT Scenario 5.6
+     */
+    public static final String DESCRIPTION_TEST_AT_5_6 = "5.6 - " + ATInteropConstants.INTEROP_ELEMENT_LOST_COMMITTED ;
+
+    /**
+     * test name for BA Scenario 1.1
+     */
+    public static final String NAME_TEST_BA_1_1 = PREFIX_BA_TESTS + "1_1" ;
+    /**
+     * test description for BA Scenario 1.1
+     */
+    public static final String DESCRIPTION_TEST_BA_1_1 = "1.1 - " + BAInteropConstants.INTEROP_ELEMENT_CANCEL ;
+    /**
+     * test name for BA Scenario 1.2
+     */
+    public static final String NAME_TEST_BA_1_2 = PREFIX_BA_TESTS + "1_2" ;
+    /**
+     * test description for BA Scenario 1.2
+     */
+    public static final String DESCRIPTION_TEST_BA_1_2 = "1.2 - " + BAInteropConstants.INTEROP_ELEMENT_EXIT ;
+    /**
+     * test name for BA Scenario 1.3
+     */
+    public static final String NAME_TEST_BA_1_3 = PREFIX_BA_TESTS + "1_3" ;
+    /**
+     * test description for BA Scenario 1.3
+     */
+    public static final String DESCRIPTION_TEST_BA_1_3 = "1.3 - " + BAInteropConstants.INTEROP_ELEMENT_FAIL ;
+    /**
+     * test name for BA Scenario 1.4
+     */
+    public static final String NAME_TEST_BA_1_4 = PREFIX_BA_TESTS + "1_4" ;
+    /**
+     * test description for BA Scenario 1.4
+     */
+    public static final String DESCRIPTION_TEST_BA_1_4 = "1.4 - " + BAInteropConstants.INTEROP_ELEMENT_CANNOT_COMPLETE ;
+    /**
+     * test name for BA Scenario 1.5
+     */
+    public static final String NAME_TEST_BA_1_5 = PREFIX_BA_TESTS + "1_5" ;
+    /**
+     * test description for BA Scenario 1.5
+     */
+    public static final String DESCRIPTION_TEST_BA_1_5 = "1.5 - " + BAInteropConstants.INTEROP_ELEMENT_PARTICIPANT_COMPLETE_CLOSE ;
+    /**
+     * test name for BA Scenario 1.6
+     */
+    public static final String NAME_TEST_BA_1_6 = PREFIX_BA_TESTS + "1_6" ;
+    /**
+     * test description for BA Scenario 1.6
+     */
+    public static final String DESCRIPTION_TEST_BA_1_6 = "1.6 - " + BAInteropConstants.INTEROP_ELEMENT_COORDINATOR_COMPLETE_CLOSE ;
+    /**
+     * test name for BA Scenario 1.7
+     */
+    public static final String NAME_TEST_BA_1_7 = PREFIX_BA_TESTS + "1_7" ;
+    /**
+     * test description for BA Scenario 1.7
+     */
+    public static final String DESCRIPTION_TEST_BA_1_7 = "1.7 - " + BAInteropConstants.INTEROP_ELEMENT_UNSOLICITED_COMPLETE ;
+    /**
+     * test name for BA Scenario 1.8
+     */
+    public static final String NAME_TEST_BA_1_8 = PREFIX_BA_TESTS + "1_8" ;
+    /**
+     * test description for BA Scenario 1.8
+     */
+    public static final String DESCRIPTION_TEST_BA_1_8 = "1.8 - " + BAInteropConstants.INTEROP_ELEMENT_COMPENSATE ;
+    /**
+     * test name for BA Scenario 1.9
+     */
+    public static final String NAME_TEST_BA_1_9 = PREFIX_BA_TESTS + "1_9" ;
+    /**
+     * test description for BA Scenario 1.9
+     */
+    public static final String DESCRIPTION_TEST_BA_1_9 = "1.9 - " + BAInteropConstants.INTEROP_ELEMENT_COMPENSATION_FAIL ;
+    /**
+     * test name for BA Scenario 1.10
+     */
+    public static final String NAME_TEST_BA_1_10 = PREFIX_BA_TESTS + "1_10" ;
+    /**
+     * test description for BA Scenario 1.10
+     */
+    public static final String DESCRIPTION_TEST_BA_1_10 = "1.10 - " + BAInteropConstants.INTEROP_ELEMENT_PARTICIPANT_CANCEL_COMPLETED_RACE ;
+    /**
+     * test name for BA Scenario 1.11
+     */
+    public static final String NAME_TEST_BA_1_11 = PREFIX_BA_TESTS + "1_11" ;
+    /**
+     * test description for BA Scenario 1.11
+     */
+    public static final String DESCRIPTION_TEST_BA_1_11 = "1.11 - " + BAInteropConstants.INTEROP_ELEMENT_MESSAGE_LOSS_AND_RECOVERY ;
+    /**
+     * test name for BA Scenario 1.12
+     */
+    public static final String NAME_TEST_BA_1_12 = PREFIX_BA_TESTS + "1_12" ;
+    /**
+     * test description for BA Scenario 1.12
+     */
+    public static final String DESCRIPTION_TEST_BA_1_12 = "1.12 - " + BAInteropConstants.INTEROP_ELEMENT_MIXED_OUTCOME ;
+
+    /**
+     * The name to description map.
+     */
+    public static final Map DESCRIPTIONS ;
+    
+    static
+    {
+        final TreeMap descriptions = new TreeMap() ;
+        
+        descriptions.put(NAME_TEST_AT_1_1, DESCRIPTION_TEST_AT_1_1) ;
+        descriptions.put(NAME_TEST_AT_1_2, DESCRIPTION_TEST_AT_1_2) ;
+        descriptions.put(NAME_TEST_AT_2_1, DESCRIPTION_TEST_AT_2_1) ;
+        descriptions.put(NAME_TEST_AT_2_2, DESCRIPTION_TEST_AT_2_2) ;
+        descriptions.put(NAME_TEST_AT_3_1, DESCRIPTION_TEST_AT_3_1) ;
+        descriptions.put(NAME_TEST_AT_3_2, DESCRIPTION_TEST_AT_3_2) ;
+        descriptions.put(NAME_TEST_AT_3_3, DESCRIPTION_TEST_AT_3_3) ;
+        descriptions.put(NAME_TEST_AT_4_1, DESCRIPTION_TEST_AT_4_1) ;
+        descriptions.put(NAME_TEST_AT_4_2, DESCRIPTION_TEST_AT_4_2) ;
+        descriptions.put(NAME_TEST_AT_5_1, DESCRIPTION_TEST_AT_5_1) ;
+        descriptions.put(NAME_TEST_AT_5_2, DESCRIPTION_TEST_AT_5_2) ;
+        descriptions.put(NAME_TEST_AT_5_3, DESCRIPTION_TEST_AT_5_3) ;
+        descriptions.put(NAME_TEST_AT_5_4, DESCRIPTION_TEST_AT_5_4) ;
+        descriptions.put(NAME_TEST_AT_5_5, DESCRIPTION_TEST_AT_5_5) ;
+        descriptions.put(NAME_TEST_AT_5_6, DESCRIPTION_TEST_AT_5_6) ;
+        descriptions.put(NAME_TEST_BA_1_1, DESCRIPTION_TEST_BA_1_1) ;
+        descriptions.put(NAME_TEST_BA_1_2, DESCRIPTION_TEST_BA_1_2) ;
+        descriptions.put(NAME_TEST_BA_1_3, DESCRIPTION_TEST_BA_1_3) ;
+        descriptions.put(NAME_TEST_BA_1_4, DESCRIPTION_TEST_BA_1_4) ;
+        descriptions.put(NAME_TEST_BA_1_5, DESCRIPTION_TEST_BA_1_5) ;
+        descriptions.put(NAME_TEST_BA_1_6, DESCRIPTION_TEST_BA_1_6) ;
+        descriptions.put(NAME_TEST_BA_1_7, DESCRIPTION_TEST_BA_1_7) ;
+        descriptions.put(NAME_TEST_BA_1_8, DESCRIPTION_TEST_BA_1_8) ;
+        descriptions.put(NAME_TEST_BA_1_9, DESCRIPTION_TEST_BA_1_9) ;
+        descriptions.put(NAME_TEST_BA_1_10, DESCRIPTION_TEST_BA_1_10) ;
+        descriptions.put(NAME_TEST_BA_1_11, DESCRIPTION_TEST_BA_1_11) ;
+//        descriptions.put(NAME_TEST_BA_1_12, DESCRIPTION_TEST_BA_1_12) ;
+       
+        DESCRIPTIONS = descriptions ;
+    }
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogController.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogController.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogController.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,84 +0,0 @@
-package com.jboss.transaction.txinterop.test;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-
-/**
- * The test log controller.
- * @author kevin
- */
-public class TestLogController
-{
-    /**
-     * The base directory for logs, hardcoded for now.
-     */
-    private static File baseDir ;
-    
-    static
-    {
-        final String userHome = System.getProperty("user.home") ;
-        baseDir = new File(userHome, "logs") ;
-        if (!baseDir.exists())
-        {
-            baseDir.mkdir() ;
-        }
-    }
-
-    /**
-     * Read the contents of the specified log.
-     * @param logName The log to retrieve.
-     * @return The log contents.
-     * @throws IOException for reading errors.
-     */
-    public static String readLog(final String logName)
-        throws IOException
-    {
-        final File logFile = new File(baseDir, logName) ;
-        if (logFile.exists() && logFile.canRead())
-        {
-            final FileReader reader = new FileReader(logFile) ;
-            try
-            {
-                final StringBuffer buffer = new StringBuffer() ;
-                final char[] charBuffer = new char[256] ;
-                while(reader.ready())
-                {
-                    final int count = reader.read(charBuffer) ;
-                    if (count > 0)
-                    {
-                        buffer.append(charBuffer, 0, count) ;
-                    }
-                }
-                return buffer.toString() ;
-            }
-            finally
-            {
-                reader.close() ;
-            }
-        }
-        throw new IOException("Cannot read log file: " + logName) ;
-    }
-
-    /**
-     * Write the contents of the specified log.
-     * @param logName The log to write.
-     * @param contents The log contents.
-     * @throws IOException for reading errors.
-     */
-    public static void writeLog(final String logName, final String contents)
-        throws IOException
-    {
-        final File logFile = new File(baseDir, logName) ;
-        final FileWriter writer = new FileWriter(logFile) ;
-        try
-        {
-            writer.write(contents) ;
-        }
-        finally
-        {
-            writer.close() ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogController.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogController.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogController.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogController.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.test;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+
+/**
+ * The test log controller.
+ * @author kevin
+ */
+public class TestLogController
+{
+    /**
+     * The base directory for logs, hardcoded for now.
+     */
+    private static File baseDir ;
+    
+    static
+    {
+        final String userHome = System.getProperty("user.home") ;
+        baseDir = new File(userHome, "logs") ;
+        if (!baseDir.exists())
+        {
+            baseDir.mkdir() ;
+        }
+    }
+
+    /**
+     * Read the contents of the specified log.
+     * @param logName The log to retrieve.
+     * @return The log contents.
+     * @throws IOException for reading errors.
+     */
+    public static String readLog(final String logName)
+        throws IOException
+    {
+        final File logFile = new File(baseDir, logName) ;
+        if (logFile.exists() && logFile.canRead())
+        {
+            final FileReader reader = new FileReader(logFile) ;
+            try
+            {
+                final StringBuffer buffer = new StringBuffer() ;
+                final char[] charBuffer = new char[256] ;
+                while(reader.ready())
+                {
+                    final int count = reader.read(charBuffer) ;
+                    if (count > 0)
+                    {
+                        buffer.append(charBuffer, 0, count) ;
+                    }
+                }
+                return buffer.toString() ;
+            }
+            finally
+            {
+                reader.close() ;
+            }
+        }
+        throw new IOException("Cannot read log file: " + logName) ;
+    }
+
+    /**
+     * Write the contents of the specified log.
+     * @param logName The log to write.
+     * @param contents The log contents.
+     * @throws IOException for reading errors.
+     */
+    public static void writeLog(final String logName, final String contents)
+        throws IOException
+    {
+        final File logFile = new File(baseDir, logName) ;
+        final FileWriter writer = new FileWriter(logFile) ;
+        try
+        {
+            writer.write(contents) ;
+        }
+        finally
+        {
+            writer.close() ;
+        }
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogServlet.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogServlet.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,96 +0,0 @@
-package com.jboss.transaction.txinterop.test;
-
-import java.io.IOException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.arjuna.webservices.util.ClassLoaderHelper;
-
-/**
- * The test servlet.
- * @author kevin
- */
-public class TestLogServlet extends HttpServlet
-{
-    /**
-     * The servlet serial version UID.
-     */
-    private static final long serialVersionUID = 2566877081747112520L ;
-    
-    /**
-     * The not found HTML page.
-     */
-    private String notFoundResponse ;
-    /**
-     * The directory contents HTML page.
-     */
-    private String directoryContents ;
-    
-    /**
-     * Initialise the servlet.
-     * @param servletConfig The servlet configuration.
-     */
-    public void init(final ServletConfig servletConfig)
-        throws ServletException
-    {
-        super.init(servletConfig) ;
-        try
-        {
-            notFoundResponse = ClassLoaderHelper.getResourceAsString(TestLogServlet.class, "notFoundResponse.html") ;
-            directoryContents = ClassLoaderHelper.getResourceAsString(TestLogServlet.class, "directoryContents.html") ;
-        }
-        catch (final IOException ioe)
-        {
-            throw new ServletException("Failed to load HTML pages", ioe) ;
-        }
-    }
-    
-    /**
-     * Return the specified logs
-     * @param request The HTTP servlet request.
-     * @param response The HTTP servlet response.
-     */
-    protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
-        throws ServletException, IOException
-    {
-        final String logName = request.getPathInfo() ;
-        if ((logName == null) || (logName.length() == 0))
-        {
-            response.sendRedirect("logs/") ;
-            return ;
-        }
-        else if ("/".equals(logName))
-        {
-            response.setContentType("text/html") ;
-            response.setStatus(HttpServletResponse.SC_OK) ;
-            response.setContentLength(directoryContents.length()) ;
-            response.getOutputStream().print(directoryContents) ;
-        }
-        else
-        {
-            final String contents ;
-            try
-            {
-                contents = TestLogController.readLog(logName) ;
-            }
-            catch (final Throwable th)
-            {
-                log("Error reading log file", th) ;
-                response.setContentType("text/html") ;
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND) ;
-                response.setContentLength(notFoundResponse.length()) ;
-                response.getOutputStream().print(notFoundResponse) ;
-                return ;
-            }
-            
-            response.setContentType("text/xml") ;
-            response.setStatus(HttpServletResponse.SC_OK) ;
-            response.setContentLength(contents.length()) ;
-            response.getOutputStream().print(contents) ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogServlet.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogServlet.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogServlet.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestLogServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.test;
+
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.arjuna.webservices.util.ClassLoaderHelper;
+
+/**
+ * The test servlet.
+ * @author kevin
+ */
+public class TestLogServlet extends HttpServlet
+{
+    /**
+     * The servlet serial version UID.
+     */
+    private static final long serialVersionUID = 2566877081747112520L ;
+    
+    /**
+     * The not found HTML page.
+     */
+    private String notFoundResponse ;
+    /**
+     * The directory contents HTML page.
+     */
+    private String directoryContents ;
+    
+    /**
+     * Initialise the servlet.
+     * @param servletConfig The servlet configuration.
+     */
+    public void init(final ServletConfig servletConfig)
+        throws ServletException
+    {
+        super.init(servletConfig) ;
+        try
+        {
+            notFoundResponse = ClassLoaderHelper.getResourceAsString(TestLogServlet.class, "notFoundResponse.html") ;
+            directoryContents = ClassLoaderHelper.getResourceAsString(TestLogServlet.class, "directoryContents.html") ;
+        }
+        catch (final IOException ioe)
+        {
+            throw new ServletException("Failed to load HTML pages", ioe) ;
+        }
+    }
+    
+    /**
+     * Return the specified logs
+     * @param request The HTTP servlet request.
+     * @param response The HTTP servlet response.
+     */
+    protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
+        throws ServletException, IOException
+    {
+        final String logName = request.getPathInfo() ;
+        if ((logName == null) || (logName.length() == 0))
+        {
+            response.sendRedirect("logs/") ;
+            return ;
+        }
+        else if ("/".equals(logName))
+        {
+            response.setContentType("text/html") ;
+            response.setStatus(HttpServletResponse.SC_OK) ;
+            response.setContentLength(directoryContents.length()) ;
+            response.getOutputStream().print(directoryContents) ;
+        }
+        else
+        {
+            final String contents ;
+            try
+            {
+                contents = TestLogController.readLog(logName) ;
+            }
+            catch (final Throwable th)
+            {
+                log("Error reading log file", th) ;
+                response.setContentType("text/html") ;
+                response.setStatus(HttpServletResponse.SC_NOT_FOUND) ;
+                response.setContentLength(notFoundResponse.length()) ;
+                response.getOutputStream().print(notFoundResponse) ;
+                return ;
+            }
+            
+            response.setContentType("text/xml") ;
+            response.setStatus(HttpServletResponse.SC_OK) ;
+            response.setContentLength(contents.length()) ;
+            response.getOutputStream().print(contents) ;
+        }
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestRunner.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestRunner.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestRunner.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,136 +0,0 @@
-package com.jboss.transaction.txinterop.test;
-
-import com.jboss.transaction.txinterop.interop.ATTestCase;
-import com.jboss.transaction.txinterop.interop.BATestCase;
-import com.jboss.transaction.txinterop.interop.InteropTestCase;
-import com.jboss.transaction.txinterop.interop.InteropTestSuite;
-import com.jboss.transaction.txinterop.interop.MessageLogging;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-/**
- * Class responsible for executing the appropriate JUnit test.
- * @author kevin
- */
-public class TestRunner
-{
-    /**
-     * The log message prefix.
-     */
-    private static final String LOG_MESSAGE_PREFIX = "<log:log xmlns:log=\"http://docs.oasis-open.org/ws-tx/logs/\">" ;
-    /**
-     * The log message suffix.
-     */
-    private static final String LOG_MESSAGE_SUFFIX = "</log:log>";
-    
-    /**
-     * The AT test class.
-     */
-    private static final Class AT_TEST_CLASS = ATTestCase.class ;
-    /**
-     * The BA test class.
-     */
-    private static final Class BA_TEST_CLASS = BATestCase.class ;
-    
-    /**
-     * Execute the specific test against the specified participant.
-     * @param participantURI The URI of the participant.
-     * @param testTimeout The test timeout.
-     * @param asyncTest The asynchronous test flag.
-     * @param testName The name of the test to execute.
-     * @return The test result.
-     */
-    public static TestResult execute(final String participantURI, final long testTimeout, final boolean asyncTest, final String testName)
-    {
-        MessageLogging.clearThreadLog() ;
-        final Test test ;
-        if (TestConstants.NAME_ALL_TESTS.equals(testName))
-        {
-            final TestSuite testSuite = new TestSuite() ;
-            testSuite.addTest(new InteropTestSuite(participantURI, testTimeout, asyncTest, AT_TEST_CLASS)) ;
-            testSuite.addTest(new InteropTestSuite(participantURI, testTimeout, asyncTest, BA_TEST_CLASS)) ;
-            test = testSuite ;
-        }
-        else if (TestConstants.NAME_ALL_AT_TESTS.equals(testName))
-        {
-            test = new InteropTestSuite(participantURI, testTimeout, asyncTest, AT_TEST_CLASS) ;
-        }
-        else if (TestConstants.NAME_ALL_BA_TESTS.equals(testName))
-        {
-            test = new InteropTestSuite(participantURI, testTimeout, asyncTest, BA_TEST_CLASS) ;
-        }
-        else if (testName.startsWith(TestConstants.PREFIX_AT_TESTS))
-        {
-            final Class testClass = AT_TEST_CLASS ;
-            try
-            {
-                test = createTest(testClass, participantURI, testTimeout, asyncTest, testName) ;
-            }
-            catch (final Throwable th)
-            {
-                System.err.println("Unexpected error instantiating test class: " + th) ;
-                return null ;
-            }
-        }
-        else if (testName.startsWith(TestConstants.PREFIX_BA_TESTS))
-        {
-            final Class testClass = BA_TEST_CLASS ;
-            try
-            {
-                test = createTest(testClass, participantURI, testTimeout, asyncTest, testName) ;
-            }
-            catch (final Throwable th)
-            {
-                System.err.println("Unexpected error instantiating test class: " + th) ;
-                return null ;
-            }
-        }
-        else
-        {
-            System.err.println("Unidentified test name: " + testName) ;
-            return null ;
-        }
-        MessageLogging.appendThreadLog(LOG_MESSAGE_PREFIX) ;
-        final TestResult testResult = new FullTestResult() ;
-        test.run(testResult) ;
-        MessageLogging.appendThreadLog(LOG_MESSAGE_SUFFIX) ;
-        return testResult ;
-    }
-    
-    /**
-     * Create the test instance.
-     * @param testClass The test class name.
-     * @param participantURI The participant URI.
-     * @param testTimeout The test timeout.
-     * @param asyncTest The asynchronous test flag.
-     * @param testName The test name.
-     * @return The test instance.
-     * @throws IllegalAccessException For access exception instantiating the test class.
-     * @throws InstantiationException For errors instantiating the test class.
-     * @throws IllegalArgumentException For an invalid test class.
-     */
-    private static TestCase createTest(final Class testClass, final String participantURI, final long testTimeout, final boolean asyncTest, final String testName)
-        throws IllegalAccessException, InstantiationException, IllegalArgumentException
-    {
-        final Object testObject = testClass.newInstance() ;
-        if (testObject instanceof InteropTestCase)
-        {
-            final InteropTestCase interopTestCase = (InteropTestCase)testObject ;
-            interopTestCase.setParticipantURI(participantURI) ; 
-            interopTestCase.setTestTimeout(testTimeout) ; 
-            interopTestCase.setAsyncTest(asyncTest) ; 
-            interopTestCase.setName(testName) ;
-            return interopTestCase ;
-        }
-        else if (testObject instanceof TestCase)
-        {
-            final TestCase test = (TestCase)testObject ;
-            test.setName(testName) ;
-            return test ;
-        }
-        throw new IllegalArgumentException("Invalid class: " + testClass.getName()) ;
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestRunner.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestRunner.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestRunner.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestRunner.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,156 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.test;
+
+import com.jboss.transaction.txinterop.interop.ATTestCase;
+import com.jboss.transaction.txinterop.interop.BATestCase;
+import com.jboss.transaction.txinterop.interop.InteropTestCase;
+import com.jboss.transaction.txinterop.interop.InteropTestSuite;
+import com.jboss.transaction.txinterop.interop.MessageLogging;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+/**
+ * Class responsible for executing the appropriate JUnit test.
+ * @author kevin
+ */
+public class TestRunner
+{
+    /**
+     * The log message prefix.
+     */
+    private static final String LOG_MESSAGE_PREFIX = "<log:log xmlns:log=\"http://docs.oasis-open.org/ws-tx/logs/\">" ;
+    /**
+     * The log message suffix.
+     */
+    private static final String LOG_MESSAGE_SUFFIX = "</log:log>";
+    
+    /**
+     * The AT test class.
+     */
+    private static final Class AT_TEST_CLASS = ATTestCase.class ;
+    /**
+     * The BA test class.
+     */
+    private static final Class BA_TEST_CLASS = BATestCase.class ;
+    
+    /**
+     * Execute the specific test against the specified participant.
+     * @param participantURI The URI of the participant.
+     * @param testTimeout The test timeout.
+     * @param asyncTest The asynchronous test flag.
+     * @param testName The name of the test to execute.
+     * @return The test result.
+     */
+    public static TestResult execute(final String participantURI, final long testTimeout, final boolean asyncTest, final String testName)
+    {
+        MessageLogging.clearThreadLog() ;
+        final Test test ;
+        if (TestConstants.NAME_ALL_TESTS.equals(testName))
+        {
+            final TestSuite testSuite = new TestSuite() ;
+            testSuite.addTest(new InteropTestSuite(participantURI, testTimeout, asyncTest, AT_TEST_CLASS)) ;
+            testSuite.addTest(new InteropTestSuite(participantURI, testTimeout, asyncTest, BA_TEST_CLASS)) ;
+            test = testSuite ;
+        }
+        else if (TestConstants.NAME_ALL_AT_TESTS.equals(testName))
+        {
+            test = new InteropTestSuite(participantURI, testTimeout, asyncTest, AT_TEST_CLASS) ;
+        }
+        else if (TestConstants.NAME_ALL_BA_TESTS.equals(testName))
+        {
+            test = new InteropTestSuite(participantURI, testTimeout, asyncTest, BA_TEST_CLASS) ;
+        }
+        else if (testName.startsWith(TestConstants.PREFIX_AT_TESTS))
+        {
+            final Class testClass = AT_TEST_CLASS ;
+            try
+            {
+                test = createTest(testClass, participantURI, testTimeout, asyncTest, testName) ;
+            }
+            catch (final Throwable th)
+            {
+                System.err.println("Unexpected error instantiating test class: " + th) ;
+                return null ;
+            }
+        }
+        else if (testName.startsWith(TestConstants.PREFIX_BA_TESTS))
+        {
+            final Class testClass = BA_TEST_CLASS ;
+            try
+            {
+                test = createTest(testClass, participantURI, testTimeout, asyncTest, testName) ;
+            }
+            catch (final Throwable th)
+            {
+                System.err.println("Unexpected error instantiating test class: " + th) ;
+                return null ;
+            }
+        }
+        else
+        {
+            System.err.println("Unidentified test name: " + testName) ;
+            return null ;
+        }
+        MessageLogging.appendThreadLog(LOG_MESSAGE_PREFIX) ;
+        final TestResult testResult = new FullTestResult() ;
+        test.run(testResult) ;
+        MessageLogging.appendThreadLog(LOG_MESSAGE_SUFFIX) ;
+        return testResult ;
+    }
+    
+    /**
+     * Create the test instance.
+     * @param testClass The test class name.
+     * @param participantURI The participant URI.
+     * @param testTimeout The test timeout.
+     * @param asyncTest The asynchronous test flag.
+     * @param testName The test name.
+     * @return The test instance.
+     * @throws IllegalAccessException For access exception instantiating the test class.
+     * @throws InstantiationException For errors instantiating the test class.
+     * @throws IllegalArgumentException For an invalid test class.
+     */
+    private static TestCase createTest(final Class testClass, final String participantURI, final long testTimeout, final boolean asyncTest, final String testName)
+        throws IllegalAccessException, InstantiationException, IllegalArgumentException
+    {
+        final Object testObject = testClass.newInstance() ;
+        if (testObject instanceof InteropTestCase)
+        {
+            final InteropTestCase interopTestCase = (InteropTestCase)testObject ;
+            interopTestCase.setParticipantURI(participantURI) ; 
+            interopTestCase.setTestTimeout(testTimeout) ; 
+            interopTestCase.setAsyncTest(asyncTest) ; 
+            interopTestCase.setName(testName) ;
+            return interopTestCase ;
+        }
+        else if (testObject instanceof TestCase)
+        {
+            final TestCase test = (TestCase)testObject ;
+            test.setName(testName) ;
+            return test ;
+        }
+        throw new IllegalArgumentException("Invalid class: " + testClass.getName()) ;
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestServlet.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestServlet.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,206 +0,0 @@
-package com.jboss.transaction.txinterop.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestResult;
-
-import com.arjuna.webservices.util.ClassLoaderHelper;
-import com.jboss.transaction.txinterop.interop.MessageLogging;
-
-/**
- * The test servlet.
- * @author kevin
- */
-public class TestServlet extends HttpServlet
-{
-    /**
-     * The servlet serial version UID.
-     */
-    private static final long serialVersionUID = 6764303043215036856L ;
-    
-    /**
-     * The validation templates.
-     */
-    private Templates validationTemplates ;
-
-    /**
-     * Initialise the servlet.
-     * @param config The servlet configuration.
-     */
-    public void init(final ServletConfig config)
-        throws ServletException
-    {
-        super.init(config) ;
-        
-        final InputStream is = ClassLoaderHelper.getResourceAsStream(getClass(), "processor.xsl") ;
-        if (is == null)
-        {
-            throw new ServletException("Cannot locate transformation stylesheet") ;
-        }
-        final TransformerFactory factory = TransformerFactory.newInstance() ;
-        try
-        {
-            validationTemplates = factory.newTemplates(new StreamSource(is)) ;
-        }
-        catch (final TransformerConfigurationException tce)
-        {
-            throw new ServletException("Error creating transformation template!", tce) ;
-        }
-    }
-    
-    /**
-     * Execute the test
-     * @param request The HTTP servlet request.
-     * @param response The HTTP servlet response.
-     */
-    protected void doPost(final HttpServletRequest request, final HttpServletResponse response)
-        throws ServletException, IOException
-    {
-        final String serviceURI = request.getParameter(TestConstants.PARAM_SERVICE_URI) ;
-        final String test = request.getParameter(TestConstants.PARAM_TEST) ;
-        final String testTimeoutValue = request.getParameter(TestConstants.PARAM_TEST_TIMEOUT) ;
-        // final String asyncTestValue = request.getParameter(TestConstants.PARAM_ASYNC_TEST) ;
-        String resultPageAddress = request.getParameter(TestConstants.PARAM_RESULT_PAGE);
-        if (resultPageAddress == null || resultPageAddress.length() == 0)
-        {
-            resultPageAddress = TestConstants.DEFAULT_RESULT_PAGE_ADDRESS;
-        }
-
-        final int serviceURILength = (serviceURI == null ? 0 : serviceURI.length()) ;
-        final int testLength = (test == null ? 0 : test.length()) ;
-        
-        long testTimeout = 0 ;
-        
-        boolean testTimeoutValid = false ;
-        if ((testTimeoutValue != null) && (testTimeoutValue.length() > 0))
-        {
-            try
-            {
-                testTimeout = Long.parseLong(testTimeoutValue) ;
-                testTimeoutValid = true ;
-            }
-            catch (final NumberFormatException nfe) {} // ignore
-        }
-        
-        // final boolean asyncTest = (asyncTestValue != null) ;
-        final boolean asyncTest = true ;
-
-        if ((serviceURILength == 0) || (testLength == 0) || !testTimeoutValid)
-        {
-            final RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/invalidParameters.html") ;
-            dispatcher.forward(request, response) ;
-            return ;
-        }
-        
-        final HttpSession session = request.getSession() ;
-        final String id = session.getId() ;
-        final int logCount = getLogCount(session) ;
-        final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss") ;
-        final String date = format.format(new Date()) ;
-        final String logName = date + "-" + id + "-" + logCount ;
-
-        session.setAttribute(TestConstants.ATTRIBUTE_TEST_RESULT, null) ;
-        session.setAttribute(TestConstants.ATTRIBUTE_TEST_VALIDATION, null) ;
-        session.setAttribute(TestConstants.ATTRIBUTE_LOG_NAME, null) ;
-
-        final String threadLog ;
-        try
-        {
-            final TestResult result = TestRunner.execute(serviceURI, testTimeout, asyncTest, test) ;
-            if (result != null)
-            {
-                session.setAttribute(TestConstants.ATTRIBUTE_TEST_RESULT, result) ;
-                
-                threadLog = MessageLogging.getThreadLog() ;
-                
-                try
-                {
-                    TestLogController.writeLog(logName, threadLog) ;
-                    session.setAttribute(TestConstants.ATTRIBUTE_LOG_NAME, logName) ;
-                }
-                catch (final IOException ioe)
-                {
-                    log("Unexpected IOException writing message log", ioe) ;
-                }
-            }
-            else
-            {
-                threadLog = null ;
-            }
-        }
-        finally
-        {
-            MessageLogging.clearThreadLog() ;
-        }
-        
-        if ((threadLog != null) && (threadLog.length() > 0))
-        {
-            try
-            {
-                final String testValidation = transform(threadLog) ;
-                session.setAttribute(TestConstants.ATTRIBUTE_TEST_VALIDATION, testValidation) ;
-            }
-            catch (final Throwable th)
-            {
-                log("Unexpected throwable transforming message log", th) ;
-            }
-        }
-        
-        final RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(resultPageAddress) ;
-        dispatcher.forward(request, response) ;
-    }
-    
-    /**
-     * Get the log count from the session, incrementing afterwards.
-     * @param session The current HTTP session.
-     * @return The log count.
-     */
-    private int getLogCount(final HttpSession session)
-    {
-        final Object logCountObject = session.getAttribute(TestConstants.ATTRIBUTE_LOG_COUNT) ;
-        final int logCount = (logCountObject == null ? 1 : ((Integer)logCountObject).intValue() + 1) ;
-        session.setAttribute(TestConstants.ATTRIBUTE_LOG_COUNT, new Integer(logCount)) ;
-        return logCount ;
-    }
-    
-    /**
-     * Transform the specified message log.
-     * @param messageLog The specified message log.
-     * @return The transformed result.
-     * @throws TransformerConfigurationException For transformer configuration errors.
-     * @throws TransformerException The transformation errors.
-     */
-    private String transform(final String messageLog)
-        throws TransformerConfigurationException, TransformerException
-    {
-        final Source source = new StreamSource(new StringReader(messageLog)) ;
-        final Transformer transformer = validationTemplates.newTransformer() ;
-        final StringWriter writer = new StringWriter() ;
-        final Result result = new StreamResult(writer) ;
-        transformer.transform(source, result) ;
-        return writer.toString() ;
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestServlet.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestServlet.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestServlet.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/TestServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,226 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import junit.framework.TestResult;
+
+import com.arjuna.webservices.util.ClassLoaderHelper;
+import com.jboss.transaction.txinterop.interop.MessageLogging;
+
+/**
+ * The test servlet.
+ * @author kevin
+ */
+public class TestServlet extends HttpServlet
+{
+    /**
+     * The servlet serial version UID.
+     */
+    private static final long serialVersionUID = 6764303043215036856L ;
+    
+    /**
+     * The validation templates.
+     */
+    private Templates validationTemplates ;
+
+    /**
+     * Initialise the servlet.
+     * @param config The servlet configuration.
+     */
+    public void init(final ServletConfig config)
+        throws ServletException
+    {
+        super.init(config) ;
+        
+        final InputStream is = ClassLoaderHelper.getResourceAsStream(getClass(), "processor.xsl") ;
+        if (is == null)
+        {
+            throw new ServletException("Cannot locate transformation stylesheet") ;
+        }
+        final TransformerFactory factory = TransformerFactory.newInstance() ;
+        try
+        {
+            validationTemplates = factory.newTemplates(new StreamSource(is)) ;
+        }
+        catch (final TransformerConfigurationException tce)
+        {
+            throw new ServletException("Error creating transformation template!", tce) ;
+        }
+    }
+    
+    /**
+     * Execute the test
+     * @param request The HTTP servlet request.
+     * @param response The HTTP servlet response.
+     */
+    protected void doPost(final HttpServletRequest request, final HttpServletResponse response)
+        throws ServletException, IOException
+    {
+        final String serviceURI = request.getParameter(TestConstants.PARAM_SERVICE_URI) ;
+        final String test = request.getParameter(TestConstants.PARAM_TEST) ;
+        final String testTimeoutValue = request.getParameter(TestConstants.PARAM_TEST_TIMEOUT) ;
+        // final String asyncTestValue = request.getParameter(TestConstants.PARAM_ASYNC_TEST) ;
+        String resultPageAddress = request.getParameter(TestConstants.PARAM_RESULT_PAGE);
+        if (resultPageAddress == null || resultPageAddress.length() == 0)
+        {
+            resultPageAddress = TestConstants.DEFAULT_RESULT_PAGE_ADDRESS;
+        }
+
+        final int serviceURILength = (serviceURI == null ? 0 : serviceURI.length()) ;
+        final int testLength = (test == null ? 0 : test.length()) ;
+        
+        long testTimeout = 0 ;
+        
+        boolean testTimeoutValid = false ;
+        if ((testTimeoutValue != null) && (testTimeoutValue.length() > 0))
+        {
+            try
+            {
+                testTimeout = Long.parseLong(testTimeoutValue) ;
+                testTimeoutValid = true ;
+            }
+            catch (final NumberFormatException nfe) {} // ignore
+        }
+        
+        // final boolean asyncTest = (asyncTestValue != null) ;
+        final boolean asyncTest = true ;
+
+        if ((serviceURILength == 0) || (testLength == 0) || !testTimeoutValid)
+        {
+            final RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/invalidParameters.html") ;
+            dispatcher.forward(request, response) ;
+            return ;
+        }
+        
+        final HttpSession session = request.getSession() ;
+        final String id = session.getId() ;
+        final int logCount = getLogCount(session) ;
+        final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss") ;
+        final String date = format.format(new Date()) ;
+        final String logName = date + "-" + id + "-" + logCount ;
+
+        session.setAttribute(TestConstants.ATTRIBUTE_TEST_RESULT, null) ;
+        session.setAttribute(TestConstants.ATTRIBUTE_TEST_VALIDATION, null) ;
+        session.setAttribute(TestConstants.ATTRIBUTE_LOG_NAME, null) ;
+
+        final String threadLog ;
+        try
+        {
+            final TestResult result = TestRunner.execute(serviceURI, testTimeout, asyncTest, test) ;
+            if (result != null)
+            {
+                session.setAttribute(TestConstants.ATTRIBUTE_TEST_RESULT, result) ;
+                
+                threadLog = MessageLogging.getThreadLog() ;
+                
+                try
+                {
+                    TestLogController.writeLog(logName, threadLog) ;
+                    session.setAttribute(TestConstants.ATTRIBUTE_LOG_NAME, logName) ;
+                }
+                catch (final IOException ioe)
+                {
+                    log("Unexpected IOException writing message log", ioe) ;
+                }
+            }
+            else
+            {
+                threadLog = null ;
+            }
+        }
+        finally
+        {
+            MessageLogging.clearThreadLog() ;
+        }
+        
+        if ((threadLog != null) && (threadLog.length() > 0))
+        {
+            try
+            {
+                final String testValidation = transform(threadLog) ;
+                session.setAttribute(TestConstants.ATTRIBUTE_TEST_VALIDATION, testValidation) ;
+            }
+            catch (final Throwable th)
+            {
+                log("Unexpected throwable transforming message log", th) ;
+            }
+        }
+        
+        final RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(resultPageAddress) ;
+        dispatcher.forward(request, response) ;
+    }
+    
+    /**
+     * Get the log count from the session, incrementing afterwards.
+     * @param session The current HTTP session.
+     * @return The log count.
+     */
+    private int getLogCount(final HttpSession session)
+    {
+        final Object logCountObject = session.getAttribute(TestConstants.ATTRIBUTE_LOG_COUNT) ;
+        final int logCount = (logCountObject == null ? 1 : ((Integer)logCountObject).intValue() + 1) ;
+        session.setAttribute(TestConstants.ATTRIBUTE_LOG_COUNT, new Integer(logCount)) ;
+        return logCount ;
+    }
+    
+    /**
+     * Transform the specified message log.
+     * @param messageLog The specified message log.
+     * @return The transformed result.
+     * @throws TransformerConfigurationException For transformer configuration errors.
+     * @throws TransformerException The transformation errors.
+     */
+    private String transform(final String messageLog)
+        throws TransformerConfigurationException, TransformerException
+    {
+        final Source source = new StreamSource(new StringReader(messageLog)) ;
+        final Transformer transformer = validationTemplates.newTransformer() ;
+        final StringWriter writer = new StringWriter() ;
+        final Result result = new StreamResult(writer) ;
+        transformer.transform(source, result) ;
+        return writer.toString() ;
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/XMLResultsServlet.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/XMLResultsServlet.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/XMLResultsServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,245 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.txinterop.test;
-
-import org.dom4j.dom.DOMDocument;
-import org.dom4j.dom.DOMElement;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.XMLWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Formats test results to the JUnit XML format.
- * @author <a href="mailto:istudens at redhat.com">Ivo Studensky</a>
- * @version $Revision$
- */
-public class XMLResultsServlet extends HttpServlet
-{
-   public void doGet(HttpServletRequest request, HttpServletResponse response)
-       throws ServletException, IOException
-   {
-      doStatus(request, response);
-   }
-
-   public void doPost(HttpServletRequest request, HttpServletResponse response)
-       throws ServletException, IOException
-   {
-      doStatus(request, response);
-   }
-
-   public void doStatus(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
-   {
-      response.setContentType("text/xml");
-      response.setHeader("Cache-Control", "no-cache");
-
-      HttpSession session = request.getSession();
-      final FullTestResult testResult = (FullTestResult) session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT);
-
-      DOMDocument report = new DOMDocument();
-      DOMElement testsuite = new DOMElement("testsuite");
-      report.setRootElement(testsuite);
-
-      if (testResult == null)
-      {
-         // No JUnit test results generated.
-      }
-      else
-      {
-         List passedTests = testResult.getPassedTests();
-         List failedTests = testResult.getFailedTests();
-         List errorTests  = testResult.getErrorTests();
-
-         final int runCount = testResult.runCount() ;
-         final int errorCount = testResult.errorCount() ;
-         final int failureCount = testResult.failureCount() ;
-
-         testsuite.addAttribute("name", "com.jboss.transaction.txinterop.interop.InteropTestSuite");
-         testsuite.addAttribute("errors", Integer.toString(errorCount));
-         testsuite.addAttribute("failures", Integer.toString(failureCount));
-         testsuite.addAttribute("hostname", request.getServerName());
-         testsuite.addAttribute("tests", Integer.toString(runCount));
-         testsuite.addAttribute("timestamp", new Date().toString());
-
-         DOMElement properties = new DOMElement("properties");
-         testsuite.add(properties);
-         DOMElement status = newPropertyDOMElement("status");
-         properties.add(status);
-         status.addAttribute("value", "finished");
-
-         long totalDuration = 0;
-
-         if (! passedTests.isEmpty())
-         {
-             Iterator passedTestsIterator = passedTests.iterator();
-             while (passedTestsIterator.hasNext())
-             {
-                 FullTestResult.PassedTest passedTest = (FullTestResult.PassedTest) passedTestsIterator.next();
-                 totalDuration += passedTest.duration;
-
-                 final String name = passedTest.test.toString();
-                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
-
-                 testsuite.add(newTestcase(
-                         passedTest.test.getClass().getName(), name + ": " + description, passedTest.duration));
-             }
-         }
-
-         if (! failedTests.isEmpty())
-         {
-             Iterator failedTestsIterator = failedTests.iterator();
-             while (failedTestsIterator.hasNext())
-             {
-                 FullTestResult.FailedTest failedTest = (FullTestResult.FailedTest) failedTestsIterator.next();
-                 totalDuration += failedTest.duration;
-
-                 final String name = failedTest.test.toString();
-                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
-                 CharArrayWriter charArrayWriter = new CharArrayWriter();
-                 PrintWriter printWriter     = new PrintWriter(charArrayWriter, true);
-                 failedTest.assertionFailedError.printStackTrace(printWriter);
-                 printWriter.close();
-                 charArrayWriter.close();
-
-                 testsuite.add(newFailedTestcase(
-                         failedTest.test.getClass().getName(), name + ": " + description, failedTest.duration,
-                         failedTest.assertionFailedError.getMessage(), charArrayWriter.toString()));
-             }
-         }
-
-         if (! errorTests.isEmpty())
-         {
-             Iterator errorTestsIterator = errorTests.iterator();
-             while (errorTestsIterator.hasNext())
-             {
-                 FullTestResult.ErrorTest errorTest = (FullTestResult.ErrorTest) errorTestsIterator.next();
-                 totalDuration += errorTest.duration;
-
-                 final String name = errorTest.test.toString();
-                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
-                 CharArrayWriter charArrayWriter = new CharArrayWriter();
-                 PrintWriter     printWriter     = new PrintWriter(charArrayWriter, true);
-                 errorTest.throwable.printStackTrace(printWriter);
-                 printWriter.close();
-                 charArrayWriter.close();
-
-                 System.out.println("charArrayWriter.toString()=" + charArrayWriter.toString());
-                 testsuite.add(newErrorTestcase(
-                         errorTest.test.getClass().getName(), name + ": " + description, errorTest.duration,
-                         errorTest.throwable.getMessage(), charArrayWriter.toString()));
-             }
-         }
-
-         // total time of all tests
-         testsuite.addAttribute("time", Float.toString(totalDuration / 1000f));
-      }
-
-      String logContent = null;
-      final String logName = (String)session.getAttribute(TestConstants.ATTRIBUTE_LOG_NAME) ;
-      if (logName != null)
-      {
-         try
-         {
-            logContent = TestLogController.readLog(logName) ;
-         }
-         catch (final Throwable th)
-         {
-            log("Error reading log file", th) ;
-         }
-      }
-
-      testsuite.add(new DOMElement("system-out").addCDATA((logContent != null) ? logContent : ""));
-      testsuite.add(new DOMElement("system-err").addCDATA(""));
-
-      XMLWriter outputter = new XMLWriter(response.getWriter(), OutputFormat.createPrettyPrint());
-      try {
-          outputter.write(testsuite);
-          outputter.close();
-      } catch (IOException e) {
-          throw new ServletException(e);
-      }
-   }
-
-   private DOMElement newPropertyDOMElement(String name)
-   {
-       return newPropertyDOMElement(name, null);
-   }
-
-   private DOMElement newPropertyDOMElement(String name, String value)
-   {
-       DOMElement property = new DOMElement("property");
-       property.addAttribute("name", name);
-       if (value != null)
-       {
-           property.addAttribute("value", value);
-       }
-       return property;
-   }
-
-   private DOMElement newTestcase(String classname, String name, long duration)
-   {
-       return newTestcase(classname, name, duration, null, null, null);
-   }
-
-   private DOMElement newFailedTestcase(String classname, String name, long duration, String failureMessage, String failureDetail)
-   {
-       return newTestcase(classname, name, duration, "junit.framework.AssertionFailedError", failureMessage, failureDetail);
-   }
-
-   private DOMElement newErrorTestcase(String classname, String name, long duration, String failureMessage, String failureDetail)
-   {
-       return newTestcase(classname, name, duration, "junit.framework.throwable", failureMessage, failureDetail);
-   }
-
-   private DOMElement newTestcase(String classname, String name, long duration, String failureMessage, String failureType, String failureDetail)
-   {
-       DOMElement testcase = new DOMElement("testcase");
-       testcase.addAttribute("classname", classname);
-       testcase.addAttribute("name", name);
-       testcase.addAttribute("time", Float.toString(duration / 1000f));    // converts from miliseconds to seconds
-       if (failureMessage != null)
-       {
-           DOMElement failure = new DOMElement("failure");
-           testcase.add(failure);
-           failure.addAttribute("message", failureMessage);
-           if (failureType != null)
-           {
-               failure.addAttribute("type", failureType);
-           }
-           if (failureDetail != null)
-           {
-               failure.addCDATA(failureDetail);
-           }
-       }
-       return testcase;
-   }
-
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/XMLResultsServlet.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/XMLResultsServlet.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/XMLResultsServlet.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/XMLResultsServlet.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,245 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.test;
+
+import org.dom4j.dom.DOMDocument;
+import org.dom4j.dom.DOMElement;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Formats test results to the JUnit XML format.
+ * @author <a href="mailto:istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision$
+ */
+public class XMLResultsServlet extends HttpServlet
+{
+   public void doGet(HttpServletRequest request, HttpServletResponse response)
+       throws ServletException, IOException
+   {
+      doStatus(request, response);
+   }
+
+   public void doPost(HttpServletRequest request, HttpServletResponse response)
+       throws ServletException, IOException
+   {
+      doStatus(request, response);
+   }
+
+   public void doStatus(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+   {
+      response.setContentType("text/xml");
+      response.setHeader("Cache-Control", "no-cache");
+
+      HttpSession session = request.getSession();
+      final FullTestResult testResult = (FullTestResult) session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT);
+
+      DOMDocument report = new DOMDocument();
+      DOMElement testsuite = new DOMElement("testsuite");
+      report.setRootElement(testsuite);
+
+      if (testResult == null)
+      {
+         // No JUnit test results generated.
+      }
+      else
+      {
+         List passedTests = testResult.getPassedTests();
+         List failedTests = testResult.getFailedTests();
+         List errorTests  = testResult.getErrorTests();
+
+         final int runCount = testResult.runCount() ;
+         final int errorCount = testResult.errorCount() ;
+         final int failureCount = testResult.failureCount() ;
+
+         testsuite.addAttribute("name", "com.jboss.transaction.txinterop.interop.InteropTestSuite");
+         testsuite.addAttribute("errors", Integer.toString(errorCount));
+         testsuite.addAttribute("failures", Integer.toString(failureCount));
+         testsuite.addAttribute("hostname", request.getServerName());
+         testsuite.addAttribute("tests", Integer.toString(runCount));
+         testsuite.addAttribute("timestamp", new Date().toString());
+
+         DOMElement properties = new DOMElement("properties");
+         testsuite.add(properties);
+         DOMElement status = newPropertyDOMElement("status");
+         properties.add(status);
+         status.addAttribute("value", "finished");
+
+         long totalDuration = 0;
+
+         if (! passedTests.isEmpty())
+         {
+             Iterator passedTestsIterator = passedTests.iterator();
+             while (passedTestsIterator.hasNext())
+             {
+                 FullTestResult.PassedTest passedTest = (FullTestResult.PassedTest) passedTestsIterator.next();
+                 totalDuration += passedTest.duration;
+
+                 final String name = passedTest.test.toString();
+                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
+
+                 testsuite.add(newTestcase(
+                         passedTest.test.getClass().getName(), name + ": " + description, passedTest.duration));
+             }
+         }
+
+         if (! failedTests.isEmpty())
+         {
+             Iterator failedTestsIterator = failedTests.iterator();
+             while (failedTestsIterator.hasNext())
+             {
+                 FullTestResult.FailedTest failedTest = (FullTestResult.FailedTest) failedTestsIterator.next();
+                 totalDuration += failedTest.duration;
+
+                 final String name = failedTest.test.toString();
+                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
+                 CharArrayWriter charArrayWriter = new CharArrayWriter();
+                 PrintWriter printWriter     = new PrintWriter(charArrayWriter, true);
+                 failedTest.assertionFailedError.printStackTrace(printWriter);
+                 printWriter.close();
+                 charArrayWriter.close();
+
+                 testsuite.add(newFailedTestcase(
+                         failedTest.test.getClass().getName(), name + ": " + description, failedTest.duration,
+                         failedTest.assertionFailedError.getMessage(), charArrayWriter.toString()));
+             }
+         }
+
+         if (! errorTests.isEmpty())
+         {
+             Iterator errorTestsIterator = errorTests.iterator();
+             while (errorTestsIterator.hasNext())
+             {
+                 FullTestResult.ErrorTest errorTest = (FullTestResult.ErrorTest) errorTestsIterator.next();
+                 totalDuration += errorTest.duration;
+
+                 final String name = errorTest.test.toString();
+                 final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
+                 CharArrayWriter charArrayWriter = new CharArrayWriter();
+                 PrintWriter     printWriter     = new PrintWriter(charArrayWriter, true);
+                 errorTest.throwable.printStackTrace(printWriter);
+                 printWriter.close();
+                 charArrayWriter.close();
+
+                 System.out.println("charArrayWriter.toString()=" + charArrayWriter.toString());
+                 testsuite.add(newErrorTestcase(
+                         errorTest.test.getClass().getName(), name + ": " + description, errorTest.duration,
+                         errorTest.throwable.getMessage(), charArrayWriter.toString()));
+             }
+         }
+
+         // total time of all tests
+         testsuite.addAttribute("time", Float.toString(totalDuration / 1000f));
+      }
+
+      String logContent = null;
+      final String logName = (String)session.getAttribute(TestConstants.ATTRIBUTE_LOG_NAME) ;
+      if (logName != null)
+      {
+         try
+         {
+            logContent = TestLogController.readLog(logName) ;
+         }
+         catch (final Throwable th)
+         {
+            log("Error reading log file", th) ;
+         }
+      }
+
+      testsuite.add(new DOMElement("system-out").addCDATA((logContent != null) ? logContent : ""));
+      testsuite.add(new DOMElement("system-err").addCDATA(""));
+
+      XMLWriter outputter = new XMLWriter(response.getWriter(), OutputFormat.createPrettyPrint());
+      try {
+          outputter.write(testsuite);
+          outputter.close();
+      } catch (IOException e) {
+          throw new ServletException(e);
+      }
+   }
+
+   private DOMElement newPropertyDOMElement(String name)
+   {
+       return newPropertyDOMElement(name, null);
+   }
+
+   private DOMElement newPropertyDOMElement(String name, String value)
+   {
+       DOMElement property = new DOMElement("property");
+       property.addAttribute("name", name);
+       if (value != null)
+       {
+           property.addAttribute("value", value);
+       }
+       return property;
+   }
+
+   private DOMElement newTestcase(String classname, String name, long duration)
+   {
+       return newTestcase(classname, name, duration, null, null, null);
+   }
+
+   private DOMElement newFailedTestcase(String classname, String name, long duration, String failureMessage, String failureDetail)
+   {
+       return newTestcase(classname, name, duration, "junit.framework.AssertionFailedError", failureMessage, failureDetail);
+   }
+
+   private DOMElement newErrorTestcase(String classname, String name, long duration, String failureMessage, String failureDetail)
+   {
+       return newTestcase(classname, name, duration, "junit.framework.throwable", failureMessage, failureDetail);
+   }
+
+   private DOMElement newTestcase(String classname, String name, long duration, String failureMessage, String failureType, String failureDetail)
+   {
+       DOMElement testcase = new DOMElement("testcase");
+       testcase.addAttribute("classname", classname);
+       testcase.addAttribute("name", name);
+       testcase.addAttribute("time", Float.toString(duration / 1000f));    // converts from miliseconds to seconds
+       if (failureMessage != null)
+       {
+           DOMElement failure = new DOMElement("failure");
+           testcase.add(failure);
+           failure.addAttribute("message", failureMessage);
+           if (failureType != null)
+           {
+               failure.addAttribute("type", failureType);
+           }
+           if (failureDetail != null)
+           {
+               failure.addCDATA(failureDetail);
+           }
+       }
+       return testcase;
+   }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/directoryContents.html
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/directoryContents.html	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/directoryContents.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,25 +0,0 @@
-<html>
-  <head>
-    <title>JBoss Transaction WS-TX interop results</title>
-  </head>
-  <body>
-    <h1>WS-TX Interop results</h1>
-    <!--
-    <p>These log files are the results of executing the JBoss Transaction WS-TX Interop client against public endpoints</p>
-    <table>
-    <thead>
-    <tr><td>Endpoint</td><td>Log file</td></tr>
-    </thead>
-    <tbody>
-    <tr><td>JBoss</td><td><a href="jboss-jboss.xml">jboss-jboss.xml</a></td></tr>
-    <tr><td>IBM</td><td><a href="jboss-ibm.xml">jboss-ibm.xml</a></td></tr>
-    <tr><td>Sun</td><td><a href="jboss-sun.xml">jboss-sun.xml</a></td></tr>
-    <tr><td>Microsoft</td><td><a href="jboss-msft.xml">jboss-msft.xml</a></td></tr>
-    <tr><td>Apache</td><td><a href="jboss-apache.xml">jboss-apache.xml</a></td></tr>
-    <tr><td>WSO2</td><td><a href="jboss-wso2.xml">jboss-wso2.xml</a></td></tr>
-    </tbody>
-    </table>
-    -->
-    <p>Please send any queries to the <a href="mailto:kevin.conner at jboss.com?subject=Log%20results%20query">interop test contact</a></p>
-  </body>
-</html>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/directoryContents.html (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/directoryContents.html)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/directoryContents.html	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/directoryContents.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,45 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<html>
+  <head>
+    <title>JBoss Transaction WS-TX interop results</title>
+  </head>
+  <body>
+    <h1>WS-TX Interop results</h1>
+    <!--
+    <p>These log files are the results of executing the JBoss Transaction WS-TX Interop client against public endpoints</p>
+    <table>
+    <thead>
+    <tr><td>Endpoint</td><td>Log file</td></tr>
+    </thead>
+    <tbody>
+    <tr><td>JBoss</td><td><a href="jboss-jboss.xml">jboss-jboss.xml</a></td></tr>
+    <tr><td>IBM</td><td><a href="jboss-ibm.xml">jboss-ibm.xml</a></td></tr>
+    <tr><td>Sun</td><td><a href="jboss-sun.xml">jboss-sun.xml</a></td></tr>
+    <tr><td>Microsoft</td><td><a href="jboss-msft.xml">jboss-msft.xml</a></td></tr>
+    <tr><td>Apache</td><td><a href="jboss-apache.xml">jboss-apache.xml</a></td></tr>
+    <tr><td>WSO2</td><td><a href="jboss-wso2.xml">jboss-wso2.xml</a></td></tr>
+    </tbody>
+    </table>
+    -->
+    <p>Please send any queries to the <a href="mailto:kevin.conner at jboss.com?subject=Log%20results%20query">interop test contact</a></p>
+  </body>
+</html>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/notFoundResponse.html
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/notFoundResponse.html	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/notFoundResponse.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <title>Log file not found</title>
-  </head>
-  <body>
-    <h1>Log file not found</h1>
-    Requested log file could not be found
-  </body>
-</html>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/notFoundResponse.html (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/notFoundResponse.html)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/notFoundResponse.html	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/notFoundResponse.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,29 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<html>
+  <head>
+    <title>Log file not found</title>
+  </head>
+  <body>
+    <h1>Log file not found</h1>
+    Requested log file could not be found
+  </body>
+</html>

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/processor.xsl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/processor.xsl	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/processor.xsl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,3 +0,0 @@
-<xsl:transform
-  id = "empty" version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-</xsl:transform>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/processor.xsl (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/processor.xsl)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/processor.xsl	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/test/processor.xsl	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,23 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<xsl:transform
+  id = "empty" version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</xsl:transform>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/CoordinationContextManager.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/CoordinationContextManager.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/CoordinationContextManager.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,59 +0,0 @@
-package com.jboss.transaction.txinterop.webservices;
-
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-
-import javax.xml.ws.handler.MessageContext;
-
-/**
- * Helper class for passing a coordination context in a SOAP header when using JaxWS
- */
-public class CoordinationContextManager {
-    /**
-     * The key used for the coordination context within a message exchange.
-     */
-    private static final String COORDINATION_CONTEXT_PROPERTY = "org.jboss.xts.message.context.coordination.context.property";
-
-    /**
-     * The coordination context associated with the thread.
-     */
-    private static final ThreadLocal THREAD_CONTEXT = new ThreadLocal() ;
-
-    /**
-     * Get the coordination context from the message context if present.
-     * @param messageContext The message context.
-     * @return The coordination context or null if not present.
-     */
-    public static CoordinationContextType getContext(final MessageContext messageContext)
-    {
-        return (CoordinationContextType)messageContext.get(COORDINATION_CONTEXT_PROPERTY) ;
-    }
-
-    /**
-     * Set the coordination context for the message context.
-     * @param messageContext The message context.
-     * @param coordinationContext The coordination context.
-     */
-    public static void setContext(final MessageContext messageContext, final CoordinationContextType coordinationContext)
-    {
-        messageContext.put(COORDINATION_CONTEXT_PROPERTY, coordinationContext) ;
-        messageContext.setScope(COORDINATION_CONTEXT_PROPERTY, MessageContext.Scope.APPLICATION);
-    }
-
-    /**
-     * Get the coordination context from the current thread if present.
-     * @return The coordination context or null if not present.
-     */
-    public static CoordinationContextType getThreadContext()
-    {
-        return (CoordinationContextType)THREAD_CONTEXT.get() ;
-    }
-
-    /**
-     * Set the coordination context for the current thread.
-     * @param coordinationContext The coordination context.
-     */
-    public static void setThreadContext(final CoordinationContextType coordinationContext)
-    {
-        THREAD_CONTEXT.set(coordinationContext) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/CoordinationContextManager.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/CoordinationContextManager.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/CoordinationContextManager.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/CoordinationContextManager.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices;
+
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * Helper class for passing a coordination context in a SOAP header when using JaxWS
+ */
+public class CoordinationContextManager {
+    /**
+     * The key used for the coordination context within a message exchange.
+     */
+    private static final String COORDINATION_CONTEXT_PROPERTY = "org.jboss.xts.message.context.coordination.context.property";
+
+    /**
+     * The coordination context associated with the thread.
+     */
+    private static final ThreadLocal THREAD_CONTEXT = new ThreadLocal() ;
+
+    /**
+     * Get the coordination context from the message context if present.
+     * @param messageContext The message context.
+     * @return The coordination context or null if not present.
+     */
+    public static CoordinationContextType getContext(final MessageContext messageContext)
+    {
+        return (CoordinationContextType)messageContext.get(COORDINATION_CONTEXT_PROPERTY) ;
+    }
+
+    /**
+     * Set the coordination context for the message context.
+     * @param messageContext The message context.
+     * @param coordinationContext The coordination context.
+     */
+    public static void setContext(final MessageContext messageContext, final CoordinationContextType coordinationContext)
+    {
+        messageContext.put(COORDINATION_CONTEXT_PROPERTY, coordinationContext) ;
+        messageContext.setScope(COORDINATION_CONTEXT_PROPERTY, MessageContext.Scope.APPLICATION);
+    }
+
+    /**
+     * Get the coordination context from the current thread if present.
+     * @return The coordination context or null if not present.
+     */
+    public static CoordinationContextType getThreadContext()
+    {
+        return (CoordinationContextType)THREAD_CONTEXT.get() ;
+    }
+
+    /**
+     * Set the coordination context for the current thread.
+     * @param coordinationContext The coordination context.
+     */
+    public static void setThreadContext(final CoordinationContextType coordinationContext)
+    {
+        THREAD_CONTEXT.set(coordinationContext) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/InteropConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/InteropConstants.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/InteropConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,12 +0,0 @@
-package com.jboss.transaction.txinterop.webservices;
-
-/**
- * Interface containing WS-TX Interop constants.
- */
-public interface InteropConstants
-{
-    /**
-     * The interop test participant service name.
-     */
-    public String SERVICE_PARTICIPANT = "TX11Participant" ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/InteropConstants.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/InteropConstants.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/InteropConstants.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/InteropConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices;
+
+/**
+ * Interface containing WS-TX Interop constants.
+ */
+public interface InteropConstants
+{
+    /**
+     * The interop test participant service name.
+     */
+    public String SERVICE_PARTICIPANT = "TX11Participant" ;
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropConstants.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,245 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop;
-
-import javax.xml.namespace.QName;
-
-/**
- * Interface containing WS-TX AT Interop constants.
- */
-public interface ATInteropConstants
-{
-    /**
-     * The interop test initiator service name.
-     */
-    public String SERVICE_INITIATOR = "ATInitiatorService" ;
-
-    /**
-     * The interop test participant service name.
-     */
-    public String SERVICE_PARTICIPANT = "ATParticipantService" ;
-
-    /**
-     * The interop Namespace.
-     */
-    public String INTEROP_NAMESPACE = "http://fabrikam123.com" ;
-    /**
-     * The interop namespace prefix.
-     */
-    public String INTEROP_PREFIX = "atinterop" ;
-    
-    /**
-     * The participant action prefix.
-     */
-    public String INTEROP_ACTION_PARTICIPANT_PREFIX = INTEROP_NAMESPACE + "/ParticipantPortType/" ;
-    /**
-     * The initiator action prefix.
-     */
-    public String INTEROP_ACTION_INITIATOR_PREFIX = INTEROP_NAMESPACE + "/InitiatorPortType/" ;
-
-    /**
-     * The completion commit element.
-     */
-    public String INTEROP_ELEMENT_COMPLETION_COMMIT = "CompletionCommit" ;
-    /**
-     * The completion commit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_COMPLETION_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPLETION_COMMIT, INTEROP_PREFIX) ;
-    /**
-     * The completion commit Action.
-     */
-    public String INTEROP_ACTION_COMPLETION_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPLETION_COMMIT ;
-    
-    /**
-     * The completion rollback element.
-     */
-    public String INTEROP_ELEMENT_COMPLETION_ROLLBACK = "CompletionRollback" ;
-    /**
-     * The completion rollback QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_COMPLETION_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPLETION_ROLLBACK, INTEROP_PREFIX) ;
-    /**
-     * The completion rollback Action.
-     */
-    public String INTEROP_ACTION_COMPLETION_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPLETION_ROLLBACK ;
-    
-    /**
-     * The commit element.
-     */
-    public String INTEROP_ELEMENT_COMMIT = "Commit" ;
-    /**
-     * The commit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMMIT, INTEROP_PREFIX) ;
-    /**
-     * The commit Action.
-     */
-    public String INTEROP_ACTION_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMMIT ;
-    
-    /**
-     * The rollback element.
-     */
-    public String INTEROP_ELEMENT_ROLLBACK = "Rollback" ;
-    /**
-     * The rollback QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_ROLLBACK, INTEROP_PREFIX) ;
-    /**
-     * The rollback Action.
-     */
-    public String INTEROP_ACTION_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_ROLLBACK ;
-    
-    /**
-     * The phase 2 rollback element.
-     */
-    public String INTEROP_ELEMENT_PHASE_2_ROLLBACK = "Phase2Rollback" ;
-    /**
-     * The phase 2 rollback QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_PHASE_2_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PHASE_2_ROLLBACK, INTEROP_PREFIX) ;
-    /**
-     * The phase 2 rollback Action.
-     */
-    public String INTEROP_ACTION_PHASE_2_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PHASE_2_ROLLBACK ;
-    
-    /**
-     * The readonly element.
-     */
-    public String INTEROP_ELEMENT_READONLY = "Readonly" ;
-    /**
-     * The readonly QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_READONLY = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_READONLY, INTEROP_PREFIX) ;
-    /**
-     * The readonly Action.
-     */
-    public String INTEROP_ACTION_READONLY = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_READONLY ;
-    
-    /**
-     * The volatile and durable element.
-     */
-    public String INTEROP_ELEMENT_VOLATILE_AND_DURABLE = "VolatileAndDurable" ;
-    /**
-     * The volatile and durable QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_VOLATILE_AND_DURABLE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_VOLATILE_AND_DURABLE, INTEROP_PREFIX) ;
-    /**
-     * The volatile and durable Action.
-     */
-    public String INTEROP_ACTION_VOLATILE_AND_DURABLE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_VOLATILE_AND_DURABLE ;
-    
-    /**
-     * The early readonly element.
-     */
-    public String INTEROP_ELEMENT_EARLY_READONLY = "EarlyReadonly" ;
-    /**
-     * The early readonly QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_EARLY_READONLY = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_EARLY_READONLY, INTEROP_PREFIX) ;
-    /**
-     * The early readonly Action.
-     */
-    public String INTEROP_ACTION_EARLY_READONLY = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_EARLY_READONLY ;
-    
-    /**
-     * The early aborted element.
-     */
-    public String INTEROP_ELEMENT_EARLY_ABORTED = "EarlyAborted" ;
-    /**
-     * The early aborted QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_EARLY_ABORTED = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_EARLY_ABORTED, INTEROP_PREFIX) ;
-    /**
-     * The early aborted Action.
-     */
-    public String INTEROP_ACTION_EARLY_ABORTED = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_EARLY_ABORTED ;
-    
-    /**
-     * The replay commit element.
-     */
-    public String INTEROP_ELEMENT_REPLAY_COMMIT = "ReplayCommit" ;
-    /**
-     * The replay commit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_REPLAY_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_REPLAY_COMMIT, INTEROP_PREFIX) ;
-    /**
-     * The replay commit Action.
-     */
-    public String INTEROP_ACTION_REPLAY_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_REPLAY_COMMIT ;
-    
-    /**
-     * The retry prepared commit element.
-     */
-    public String INTEROP_ELEMENT_RETRY_PREPARED_COMMIT = "RetryPreparedCommit" ;
-    /**
-     * The retry prepared commit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_RETRY_PREPARED_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_PREPARED_COMMIT, INTEROP_PREFIX) ;
-    /**
-     * The retry prepared commit Action.
-     */
-    public String INTEROP_ACTION_RETRY_PREPARED_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_PREPARED_COMMIT ;
-    
-    /**
-     * The retry prepared abort element.
-     */
-    public String INTEROP_ELEMENT_RETRY_PREPARED_ABORT = "RetryPreparedAbort" ;
-    /**
-     * The retry prepared abort QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_RETRY_PREPARED_ABORT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_PREPARED_ABORT, INTEROP_PREFIX) ;
-    /**
-     * The retry prepared abort Action.
-     */
-    public String INTEROP_ACTION_RETRY_PREPARED_ABORT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_PREPARED_ABORT ;
-    
-    /**
-     * The retry commit element.
-     */
-    public String INTEROP_ELEMENT_RETRY_COMMIT = "RetryCommit" ;
-    /**
-     * The retry commit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_RETRY_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_COMMIT, INTEROP_PREFIX) ;
-    /**
-     * The retry commit Action.
-     */
-    public String INTEROP_ACTION_RETRY_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_COMMIT ;
-    
-    /**
-     * The prepared after timeout element.
-     */
-    public String INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT = "PreparedAfterTimeout" ;
-    /**
-     * The prepared after timeout QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_PREPARED_AFTER_TIMEOUT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT, INTEROP_PREFIX) ;
-    /**
-     * The prepared after timeout Action.
-     */
-    public String INTEROP_ACTION_PREPARED_AFTER_TIMEOUT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT ;
-    
-    /**
-     * The lost committed element.
-     */
-    public String INTEROP_ELEMENT_LOST_COMMITTED = "LostCommitted" ;
-    /**
-     * The lost committed QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_LOST_COMMITTED = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_LOST_COMMITTED, INTEROP_PREFIX) ;
-    /**
-     * The lost committed Action.
-     */
-    public String INTEROP_ACTION_LOST_COMMITTED = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_LOST_COMMITTED ;
-    
-    /**
-     * The response element.
-     */
-    public String INTEROP_ELEMENT_RESPONSE = "Response" ;
-    /**
-     * The response QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_RESPONSE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RESPONSE, INTEROP_PREFIX) ;
-    /**
-     * The response Action.
-     */
-    public String INTEROP_ACTION_RESPONSE = INTEROP_ACTION_INITIATOR_PREFIX + INTEROP_ELEMENT_RESPONSE ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropConstants.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropConstants.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropConstants.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,265 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Interface containing WS-TX AT Interop constants.
+ */
+public interface ATInteropConstants
+{
+    /**
+     * The interop test initiator service name.
+     */
+    public String SERVICE_INITIATOR = "ATInitiatorService" ;
+
+    /**
+     * The interop test participant service name.
+     */
+    public String SERVICE_PARTICIPANT = "ATParticipantService" ;
+
+    /**
+     * The interop Namespace.
+     */
+    public String INTEROP_NAMESPACE = "http://fabrikam123.com" ;
+    /**
+     * The interop namespace prefix.
+     */
+    public String INTEROP_PREFIX = "atinterop" ;
+    
+    /**
+     * The participant action prefix.
+     */
+    public String INTEROP_ACTION_PARTICIPANT_PREFIX = INTEROP_NAMESPACE + "/ParticipantPortType/" ;
+    /**
+     * The initiator action prefix.
+     */
+    public String INTEROP_ACTION_INITIATOR_PREFIX = INTEROP_NAMESPACE + "/InitiatorPortType/" ;
+
+    /**
+     * The completion commit element.
+     */
+    public String INTEROP_ELEMENT_COMPLETION_COMMIT = "CompletionCommit" ;
+    /**
+     * The completion commit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_COMPLETION_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPLETION_COMMIT, INTEROP_PREFIX) ;
+    /**
+     * The completion commit Action.
+     */
+    public String INTEROP_ACTION_COMPLETION_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPLETION_COMMIT ;
+    
+    /**
+     * The completion rollback element.
+     */
+    public String INTEROP_ELEMENT_COMPLETION_ROLLBACK = "CompletionRollback" ;
+    /**
+     * The completion rollback QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_COMPLETION_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPLETION_ROLLBACK, INTEROP_PREFIX) ;
+    /**
+     * The completion rollback Action.
+     */
+    public String INTEROP_ACTION_COMPLETION_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPLETION_ROLLBACK ;
+    
+    /**
+     * The commit element.
+     */
+    public String INTEROP_ELEMENT_COMMIT = "Commit" ;
+    /**
+     * The commit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMMIT, INTEROP_PREFIX) ;
+    /**
+     * The commit Action.
+     */
+    public String INTEROP_ACTION_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMMIT ;
+    
+    /**
+     * The rollback element.
+     */
+    public String INTEROP_ELEMENT_ROLLBACK = "Rollback" ;
+    /**
+     * The rollback QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_ROLLBACK, INTEROP_PREFIX) ;
+    /**
+     * The rollback Action.
+     */
+    public String INTEROP_ACTION_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_ROLLBACK ;
+    
+    /**
+     * The phase 2 rollback element.
+     */
+    public String INTEROP_ELEMENT_PHASE_2_ROLLBACK = "Phase2Rollback" ;
+    /**
+     * The phase 2 rollback QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_PHASE_2_ROLLBACK = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PHASE_2_ROLLBACK, INTEROP_PREFIX) ;
+    /**
+     * The phase 2 rollback Action.
+     */
+    public String INTEROP_ACTION_PHASE_2_ROLLBACK = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PHASE_2_ROLLBACK ;
+    
+    /**
+     * The readonly element.
+     */
+    public String INTEROP_ELEMENT_READONLY = "Readonly" ;
+    /**
+     * The readonly QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_READONLY = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_READONLY, INTEROP_PREFIX) ;
+    /**
+     * The readonly Action.
+     */
+    public String INTEROP_ACTION_READONLY = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_READONLY ;
+    
+    /**
+     * The volatile and durable element.
+     */
+    public String INTEROP_ELEMENT_VOLATILE_AND_DURABLE = "VolatileAndDurable" ;
+    /**
+     * The volatile and durable QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_VOLATILE_AND_DURABLE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_VOLATILE_AND_DURABLE, INTEROP_PREFIX) ;
+    /**
+     * The volatile and durable Action.
+     */
+    public String INTEROP_ACTION_VOLATILE_AND_DURABLE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_VOLATILE_AND_DURABLE ;
+    
+    /**
+     * The early readonly element.
+     */
+    public String INTEROP_ELEMENT_EARLY_READONLY = "EarlyReadonly" ;
+    /**
+     * The early readonly QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_EARLY_READONLY = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_EARLY_READONLY, INTEROP_PREFIX) ;
+    /**
+     * The early readonly Action.
+     */
+    public String INTEROP_ACTION_EARLY_READONLY = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_EARLY_READONLY ;
+    
+    /**
+     * The early aborted element.
+     */
+    public String INTEROP_ELEMENT_EARLY_ABORTED = "EarlyAborted" ;
+    /**
+     * The early aborted QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_EARLY_ABORTED = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_EARLY_ABORTED, INTEROP_PREFIX) ;
+    /**
+     * The early aborted Action.
+     */
+    public String INTEROP_ACTION_EARLY_ABORTED = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_EARLY_ABORTED ;
+    
+    /**
+     * The replay commit element.
+     */
+    public String INTEROP_ELEMENT_REPLAY_COMMIT = "ReplayCommit" ;
+    /**
+     * The replay commit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_REPLAY_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_REPLAY_COMMIT, INTEROP_PREFIX) ;
+    /**
+     * The replay commit Action.
+     */
+    public String INTEROP_ACTION_REPLAY_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_REPLAY_COMMIT ;
+    
+    /**
+     * The retry prepared commit element.
+     */
+    public String INTEROP_ELEMENT_RETRY_PREPARED_COMMIT = "RetryPreparedCommit" ;
+    /**
+     * The retry prepared commit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_RETRY_PREPARED_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_PREPARED_COMMIT, INTEROP_PREFIX) ;
+    /**
+     * The retry prepared commit Action.
+     */
+    public String INTEROP_ACTION_RETRY_PREPARED_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_PREPARED_COMMIT ;
+    
+    /**
+     * The retry prepared abort element.
+     */
+    public String INTEROP_ELEMENT_RETRY_PREPARED_ABORT = "RetryPreparedAbort" ;
+    /**
+     * The retry prepared abort QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_RETRY_PREPARED_ABORT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_PREPARED_ABORT, INTEROP_PREFIX) ;
+    /**
+     * The retry prepared abort Action.
+     */
+    public String INTEROP_ACTION_RETRY_PREPARED_ABORT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_PREPARED_ABORT ;
+    
+    /**
+     * The retry commit element.
+     */
+    public String INTEROP_ELEMENT_RETRY_COMMIT = "RetryCommit" ;
+    /**
+     * The retry commit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_RETRY_COMMIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RETRY_COMMIT, INTEROP_PREFIX) ;
+    /**
+     * The retry commit Action.
+     */
+    public String INTEROP_ACTION_RETRY_COMMIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_RETRY_COMMIT ;
+    
+    /**
+     * The prepared after timeout element.
+     */
+    public String INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT = "PreparedAfterTimeout" ;
+    /**
+     * The prepared after timeout QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_PREPARED_AFTER_TIMEOUT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT, INTEROP_PREFIX) ;
+    /**
+     * The prepared after timeout Action.
+     */
+    public String INTEROP_ACTION_PREPARED_AFTER_TIMEOUT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PREPARED_AFTER_TIMEOUT ;
+    
+    /**
+     * The lost committed element.
+     */
+    public String INTEROP_ELEMENT_LOST_COMMITTED = "LostCommitted" ;
+    /**
+     * The lost committed QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_LOST_COMMITTED = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_LOST_COMMITTED, INTEROP_PREFIX) ;
+    /**
+     * The lost committed Action.
+     */
+    public String INTEROP_ACTION_LOST_COMMITTED = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_LOST_COMMITTED ;
+    
+    /**
+     * The response element.
+     */
+    public String INTEROP_ELEMENT_RESPONSE = "Response" ;
+    /**
+     * The response QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_RESPONSE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RESPONSE, INTEROP_PREFIX) ;
+    /**
+     * The response Action.
+     */
+    public String INTEROP_ACTION_RESPONSE = INTEROP_ACTION_INITIATOR_PREFIX + INTEROP_ELEMENT_RESPONSE ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropUtil.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropUtil.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropUtil.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,145 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop;
-
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.webservices11.wsarj.InstanceIdentifier;
-import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.wsc11.ActivationCoordinator;
-import com.arjuna.wsc11.RegistrationCoordinator;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.arjuna.wst.CompletionCoordinatorParticipant;
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.Participant;
-import com.arjuna.wst.Volatile2PCParticipant;
-import com.arjuna.wst11.messaging.engines.ParticipantEngine;
-import com.arjuna.wst11.stub.CompletionStub;
-
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
-
-/**
- * Utility methods
- */
-public class ATInteropUtil
-{
-    /**
-     * Get a coordination context.
-     * @param coordinatorURI The coordinator URI.
-     * @return The coordination context.
-     * @throws Exception for errors.
-     */
-    public static CoordinationContextType createCoordinationContext(final String coordinatorURI)
-        throws Exception
-    {
-        return ActivationCoordinator.createCoordinationContext(coordinatorURI, MessageId.getMessageId(), AtomicTransactionConstants.WSAT_PROTOCOL, null, null) ;
-    }
-
-    /**
-     * Register for completion.
-     * @param context The coordination context.
-     * @return The endpoint for communicating with the coordinator.
-     * @throws Exception for errors.
-     */
-    public static CompletionCoordinatorParticipant registerCompletion(final CoordinationContextType context, final String id)
-        throws Exception
-    {
-        final W3CEndpointReference completionCoordinator = register(context, getCompletionParticipant(id), AtomicTransactionConstants.WSAT_SUB_PROTOCOL_COMPLETION) ;
-        return new CompletionStub(id, completionCoordinator);
-    }
-    
-    /**
-     * Register a durable participant in the specified coordination context.
-     * @param context The coordination context.
-     * @param participant The durable 2PC participant
-     * @param id The participant id.
-     * @return The participant engine.
-     * @throws Exception for errors.
-     */
-    public static ParticipantEngine registerDurable2PC(final CoordinationContextType context, final Durable2PCParticipant participant, final String id)
-        throws Exception
-    {
-        return registerParticipant(context, participant, id, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_DURABLE_2PC) ;
-    }
-    
-    /**
-     * Register a volatile participant in the specified coordination context.
-     * @param context The coordination context.
-     * @param participant The volatile 2PC participant
-     * @param id The participant id.
-     * @return The participant engine.
-     * @throws Exception for errors.
-     */
-    public static ParticipantEngine registerVolatile2PC(final CoordinationContextType context, final Volatile2PCParticipant participant, final String id)
-        throws Exception
-    {
-        return registerParticipant(context, participant, id, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_VOLATILE_2PC) ;
-    }
-    
-    /**
-     * Register the participant in the specified coordination context.
-     * @param context The coordination context.
-     * @param participant The participant.
-     * @param id The participant id.
-     * @param protocol The sub protocol to register for.
-     * @return The participant engine.
-     * @throws Exception for errors.
-     */
-    private static ParticipantEngine registerParticipant(final CoordinationContextType context, final Participant participant, final String id, final String protocol)
-        throws Exception
-    {
-        final W3CEndpointReference coordinator = RegistrationCoordinator.register(context, MessageId.getMessageId(),
-            getParticipant(id), protocol) ;
-        final ParticipantEngine engine = new ParticipantEngine(participant, id, coordinator) ;
-        ParticipantProcessor.getProcessor().activateParticipant(engine, id) ;
-        return engine ;
-    }
-    
-    /**
-     * Register for a sub protocol.
-     * @param context The coordination context.
-     * @param participant The participant EPR.
-     * @param protocol The protocol.
-     * @return The coordinator endpoint.
-     * @throws Exception for errors.
-     */
-    private static W3CEndpointReference register(final CoordinationContextType context, final W3CEndpointReference participant, final String protocol)
-        throws Exception
-    {
-        return RegistrationCoordinator.register(context, MessageId.getMessageId(), participant, protocol) ;
-    }
-
-    /**
-     * Get an endpoint reference for the completion initiator service.
-     * @param id The completion id.
-     * @return The endpoint reference.
-     */
-    private static W3CEndpointReference getCompletionParticipant(final String id)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        final String serviceURI = serviceRegistry.getServiceURI(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME) ;
-        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
-        builder.serviceName(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_QNAME);
-        builder.endpointName(AtomicTransactionConstants.COMPLETION_INITIATOR_PORT_QNAME);
-        builder.address(serviceURI);
-        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
-        return builder.build();
-    }
-
-    /**
-     * Get an endpoint reference for the participant service.
-     * @param id The participant id.
-     * @return The endpoint reference.
-     */
-    private static W3CEndpointReference getParticipant(final String id)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        final String serviceURI = serviceRegistry.getServiceURI(AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME) ;
-        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
-        builder.serviceName(AtomicTransactionConstants.PARTICIPANT_SERVICE_QNAME);
-        builder.endpointName(AtomicTransactionConstants.PARTICIPANT_PORT_QNAME);
-        builder.address(serviceURI);
-        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
-        return builder.build();
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropUtil.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropUtil.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropUtil.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ATInteropUtil.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,165 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop;
+
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.webservices11.wsarj.InstanceIdentifier;
+import com.arjuna.webservices11.ServiceRegistry;
+import com.arjuna.wsc11.ActivationCoordinator;
+import com.arjuna.wsc11.RegistrationCoordinator;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.arjuna.wst.CompletionCoordinatorParticipant;
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.Participant;
+import com.arjuna.wst.Volatile2PCParticipant;
+import com.arjuna.wst11.messaging.engines.ParticipantEngine;
+import com.arjuna.wst11.stub.CompletionStub;
+
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
+
+/**
+ * Utility methods
+ */
+public class ATInteropUtil
+{
+    /**
+     * Get a coordination context.
+     * @param coordinatorURI The coordinator URI.
+     * @return The coordination context.
+     * @throws Exception for errors.
+     */
+    public static CoordinationContextType createCoordinationContext(final String coordinatorURI)
+        throws Exception
+    {
+        return ActivationCoordinator.createCoordinationContext(coordinatorURI, MessageId.getMessageId(), AtomicTransactionConstants.WSAT_PROTOCOL, null, null) ;
+    }
+
+    /**
+     * Register for completion.
+     * @param context The coordination context.
+     * @return The endpoint for communicating with the coordinator.
+     * @throws Exception for errors.
+     */
+    public static CompletionCoordinatorParticipant registerCompletion(final CoordinationContextType context, final String id)
+        throws Exception
+    {
+        final W3CEndpointReference completionCoordinator = register(context, getCompletionParticipant(id), AtomicTransactionConstants.WSAT_SUB_PROTOCOL_COMPLETION) ;
+        return new CompletionStub(id, completionCoordinator);
+    }
+    
+    /**
+     * Register a durable participant in the specified coordination context.
+     * @param context The coordination context.
+     * @param participant The durable 2PC participant
+     * @param id The participant id.
+     * @return The participant engine.
+     * @throws Exception for errors.
+     */
+    public static ParticipantEngine registerDurable2PC(final CoordinationContextType context, final Durable2PCParticipant participant, final String id)
+        throws Exception
+    {
+        return registerParticipant(context, participant, id, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_DURABLE_2PC) ;
+    }
+    
+    /**
+     * Register a volatile participant in the specified coordination context.
+     * @param context The coordination context.
+     * @param participant The volatile 2PC participant
+     * @param id The participant id.
+     * @return The participant engine.
+     * @throws Exception for errors.
+     */
+    public static ParticipantEngine registerVolatile2PC(final CoordinationContextType context, final Volatile2PCParticipant participant, final String id)
+        throws Exception
+    {
+        return registerParticipant(context, participant, id, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_VOLATILE_2PC) ;
+    }
+    
+    /**
+     * Register the participant in the specified coordination context.
+     * @param context The coordination context.
+     * @param participant The participant.
+     * @param id The participant id.
+     * @param protocol The sub protocol to register for.
+     * @return The participant engine.
+     * @throws Exception for errors.
+     */
+    private static ParticipantEngine registerParticipant(final CoordinationContextType context, final Participant participant, final String id, final String protocol)
+        throws Exception
+    {
+        final W3CEndpointReference coordinator = RegistrationCoordinator.register(context, MessageId.getMessageId(),
+            getParticipant(id), protocol) ;
+        final ParticipantEngine engine = new ParticipantEngine(participant, id, coordinator) ;
+        ParticipantProcessor.getProcessor().activateParticipant(engine, id) ;
+        return engine ;
+    }
+    
+    /**
+     * Register for a sub protocol.
+     * @param context The coordination context.
+     * @param participant The participant EPR.
+     * @param protocol The protocol.
+     * @return The coordinator endpoint.
+     * @throws Exception for errors.
+     */
+    private static W3CEndpointReference register(final CoordinationContextType context, final W3CEndpointReference participant, final String protocol)
+        throws Exception
+    {
+        return RegistrationCoordinator.register(context, MessageId.getMessageId(), participant, protocol) ;
+    }
+
+    /**
+     * Get an endpoint reference for the completion initiator service.
+     * @param id The completion id.
+     * @return The endpoint reference.
+     */
+    private static W3CEndpointReference getCompletionParticipant(final String id)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        final String serviceURI = serviceRegistry.getServiceURI(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME) ;
+        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
+        builder.serviceName(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_QNAME);
+        builder.endpointName(AtomicTransactionConstants.COMPLETION_INITIATOR_PORT_QNAME);
+        builder.address(serviceURI);
+        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
+        return builder.build();
+    }
+
+    /**
+     * Get an endpoint reference for the participant service.
+     * @param id The participant id.
+     * @return The endpoint reference.
+     */
+    private static W3CEndpointReference getParticipant(final String id)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        final String serviceURI = serviceRegistry.getServiceURI(AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME) ;
+        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
+        builder.serviceName(AtomicTransactionConstants.PARTICIPANT_SERVICE_QNAME);
+        builder.endpointName(AtomicTransactionConstants.PARTICIPANT_PORT_QNAME);
+        builder.address(serviceURI);
+        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
+        return builder.build();
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,544 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop;
-
-import java.io.IOException;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.SoapFaultType;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.SoapFault11;
-import com.jboss.transaction.txinterop.webservices.atinterop.client.AsyncParticipantClient;
-import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorCallback;
-import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The participant stub.
- */
-public class AsyncParticipantStub implements ParticipantStub
-{
-    /***
-     * The participant stub singletong.
-     */
-    private static final ParticipantStub PARTICIPANT_STUB = new AsyncParticipantStub() ;
-    
-    /**
-     * Get the participant stub singleton.
-     * @return The participant stub singleton.
-     */
-    public static ParticipantStub getParticipantStub()
-    {
-        return PARTICIPANT_STUB ;
-    }
-    
-    /**
-     * Send a completion commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionCommit(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a completion rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionRollback(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a phase2Rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a readonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a volatileAndDurable request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send an earlyReadonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a earlyAborted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a replayCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a retryPreparedCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a retryPreparedAbort request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a retryCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a preparedAfterTimeout request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Send a lostCommitted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        final RequestCallback callback = new RequestCallback() ;
-        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Handle the callback.
-     * @param callback The callback.
-     * @throws SoapFault for errors.
-     */
-    private static void handleCallback(final RequestCallback callback)
-        throws SoapFault
-    {
-        if (callback.hasFailed())
-        {
-            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback execution failed") ;
-        }
-        else if (!callback.hasTriggered())
-        {
-            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback wasn't triggered") ;
-        }
-        else if (!callback.isResponse())
-        {
-            throw callback.getSoapFault() ;
-        }
-    }
-    
-    /**
-     * The request callback class.
-     */
-    private static final class RequestCallback extends ATInitiatorCallback
-    {
-        /**
-         * The response flag.
-         */
-        private boolean response ;
-        /**
-         * The SOAP fault response.
-         */
-        private SoapFault soapFault ;
-        
-        /**
-         * A response.
-         * @param addressingProperties The current addressing context.
-         */
-        public void response(final AddressingProperties addressingProperties)
-        {
-            this.response = true ;
-        }
-
-        /**
-         * A SOAP fault response.
-         * @param soapFault The SOAP fault response.
-         * @param addressingProperties The current addressing context.
-         */
-        public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
-        {
-            this.soapFault = soapFault ;
-        }
-        
-        /**
-         * Was a response received?
-         * @return true if a response was received, false otherwise.
-         */
-        boolean isResponse()
-        {
-            return response ;
-        }
-        
-        /**
-         * Get the SOAP fault.
-         * @return The SOAP fault or null.
-         */
-        SoapFault getSoapFault()
-        {
-            return soapFault ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,564 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop;
+
+import java.io.IOException;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.SoapFaultType;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.SoapFault11;
+import com.jboss.transaction.txinterop.webservices.atinterop.client.AsyncParticipantClient;
+import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorCallback;
+import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The participant stub.
+ */
+public class AsyncParticipantStub implements ParticipantStub
+{
+    /***
+     * The participant stub singletong.
+     */
+    private static final ParticipantStub PARTICIPANT_STUB = new AsyncParticipantStub() ;
+    
+    /**
+     * Get the participant stub singleton.
+     * @return The participant stub singleton.
+     */
+    public static ParticipantStub getParticipantStub()
+    {
+        return PARTICIPANT_STUB ;
+    }
+    
+    /**
+     * Send a completion commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionCommit(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a completion rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionRollback(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a phase2Rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a readonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a volatileAndDurable request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send an earlyReadonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a earlyAborted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a replayCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a retryPreparedCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a retryPreparedAbort request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a retryCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a preparedAfterTimeout request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Send a lostCommitted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        final RequestCallback callback = new RequestCallback() ;
+        final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Handle the callback.
+     * @param callback The callback.
+     * @throws SoapFault for errors.
+     */
+    private static void handleCallback(final RequestCallback callback)
+        throws SoapFault
+    {
+        if (callback.hasFailed())
+        {
+            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback execution failed") ;
+        }
+        else if (!callback.hasTriggered())
+        {
+            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback wasn't triggered") ;
+        }
+        else if (!callback.isResponse())
+        {
+            throw callback.getSoapFault() ;
+        }
+    }
+    
+    /**
+     * The request callback class.
+     */
+    private static final class RequestCallback extends ATInitiatorCallback
+    {
+        /**
+         * The response flag.
+         */
+        private boolean response ;
+        /**
+         * The SOAP fault response.
+         */
+        private SoapFault soapFault ;
+        
+        /**
+         * A response.
+         * @param addressingProperties The current addressing context.
+         */
+        public void response(final AddressingProperties addressingProperties)
+        {
+            this.response = true ;
+        }
+
+        /**
+         * A SOAP fault response.
+         * @param soapFault The SOAP fault response.
+         * @param addressingProperties The current addressing context.
+         */
+        public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+        {
+            this.soapFault = soapFault ;
+        }
+        
+        /**
+         * Was a response received?
+         * @return true if a response was received, false otherwise.
+         */
+        boolean isResponse()
+        {
+            return response ;
+        }
+        
+        /**
+         * Get the SOAP fault.
+         * @return The SOAP fault or null.
+         */
+        SoapFault getSoapFault()
+        {
+            return soapFault ;
+        }
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ParticipantStub.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,162 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop;
-
-import java.io.IOException;
-
-import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-
-/**
- * The interface for the participant stub.
- */
-public interface ParticipantStub
-{
-    /**
-     * Send a completion commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionCommit(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a completion rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionRollback(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a phase2Rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a readonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a volatileAndDurable request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send an earlyReadonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a earlyAborted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a replayCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a retryPreparedCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a retryPreparedAbort request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a retryCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a preparedAfterTimeout request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-
-    /**
-     * Send a lostCommitted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ParticipantStub.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ParticipantStub.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ParticipantStub.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/ParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,182 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop;
+
+import java.io.IOException;
+
+import com.arjuna.webservices.SoapFault;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+
+/**
+ * The interface for the participant stub.
+ */
+public interface ParticipantStub
+{
+    /**
+     * Send a completion commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionCommit(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a completion rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionRollback(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a phase2Rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a readonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a volatileAndDurable request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send an earlyReadonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a earlyAborted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a replayCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a retryPreparedCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a retryPreparedAbort request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a retryCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a preparedAfterTimeout request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+
+    /**
+     * Send a lostCommitted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,271 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop;
-
-import java.io.IOException;
-
-import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.jboss.transaction.txinterop.webservices.atinterop.client.SyncParticipantClient;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The participant stub.
- */
-public class SyncParticipantStub implements ParticipantStub
-{
-    /**
-     * The participant stub singletong.
-     */
-    private static final ParticipantStub PARTICIPANT_STUB = new SyncParticipantStub() ;
-    
-    /**
-     * Get the participant stub singleton.
-     * @return The participant stub singleton.
-     */
-    public static ParticipantStub getParticipantStub()
-    {
-        return PARTICIPANT_STUB ;
-    }
-    
-    /**
-     * Send a completion commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionCommit(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
-    }
-
-    /**
-     * Send a completion rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void completionRollback(final String serviceURI, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
-    }
-
-    /**
-     * Send a commit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a phase2Rollback request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a readonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-
-        SyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a volatileAndDurable request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send an earlyReadonly request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a earlyAborted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a replayCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a retryPreparedCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a retryPreparedAbort request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a retryCommit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a preparedAfterTimeout request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
-    }
-
-    /**
-     * Send a lostCommitted request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,291 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop;
+
+import java.io.IOException;
+
+import com.arjuna.webservices.SoapFault;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.jboss.transaction.txinterop.webservices.atinterop.client.SyncParticipantClient;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The participant stub.
+ */
+public class SyncParticipantStub implements ParticipantStub
+{
+    /**
+     * The participant stub singletong.
+     */
+    private static final ParticipantStub PARTICIPANT_STUB = new SyncParticipantStub() ;
+    
+    /**
+     * Get the participant stub singleton.
+     * @return The participant stub singleton.
+     */
+    public static ParticipantStub getParticipantStub()
+    {
+        return PARTICIPANT_STUB ;
+    }
+    
+    /**
+     * Send a completion commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionCommit(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
+    }
+
+    /**
+     * Send a completion rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void completionRollback(final String serviceURI, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
+    }
+
+    /**
+     * Send a commit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void commit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a phase2Rollback request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void phase2Rollback(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a readonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void readonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+
+        SyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a volatileAndDurable request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void volatileAndDurable(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send an earlyReadonly request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyReadonly(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a earlyAborted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void earlyAborted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a replayCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void replayCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a retryPreparedCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a retryPreparedAbort request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryPreparedAbort(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a retryCommit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void retryCommit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a preparedAfterTimeout request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void preparedAfterTimeout(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
+    }
+
+    /**
+     * Send a lostCommitted request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void lostCommitted(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,170 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.client;
-
-import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
-
-import javax.xml.ws.addressing.*;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.handler.Handler;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.net.URISyntaxException;
-import java.net.URI;
-
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.ServiceRegistry;
-import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorService;
-import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantService;
-import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;
-import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantPortType;
-import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
-import com.jboss.transaction.txinterop.webservices.handlers.CoordinationContextHandler;
-
-/**
- * Created by IntelliJ IDEA.
- * User: adinn
- * Date: Apr 17, 2008
- * Time: 4:18:34 PM
- * To change this template use File | Settings | File Templates.
- */
-public class ATInteropClient {
-    // TODO -- do we really need a thread local here or can we just use one service?
-    /**
-     *  thread local which maintains a per thread activation service instance
-     */
-    private static ThreadLocal<InitiatorService> initiatorService = new ThreadLocal<InitiatorService>();
-
-    /**
-     *  thread local which maintains a per thread activation service instance
-     */
-    private static ThreadLocal<ParticipantService> participantService = new ThreadLocal<ParticipantService>();
-
-    /**
-     *  builder used to construct addressing info for calls
-     */
-    private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-
-    /**
-     * fetch a coordinator activation service unique to the current thread
-     * @return
-     */
-    private static synchronized InitiatorService getInitiatorService()
-    {
-        if (initiatorService.get() == null) {
-            initiatorService.set(new InitiatorService());
-        }
-        return initiatorService.get();
-    }
-
-    /**
-     * fetch a coordinator registration service unique to the current thread
-     * @return
-     */
-    private static synchronized ParticipantService getParticipantService()
-    {
-        if (participantService.get() == null) {
-            participantService.set(new ParticipantService());
-        }
-        return participantService.get();
-    }
-
-    public static InitiatorPortType getInitiatorPort(AddressingProperties addressingProperties,
-                                                       String action)
-    {
-        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
-        InitiatorService service = getInitiatorService();
-        InitiatorPortType port = service.getPort(InitiatorPortType.class);
-        BindingProvider bindingProvider = (BindingProvider)port;
-        AttributedURI toUri = addressingProperties.getTo();
-        List<Handler> customHandlerChain = new ArrayList<Handler>();
-        /*
-         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
-         */
-		customHandlerChain.add(new WSAddressingClientHandler());
-        bindingProvider.getBinding().setHandlerChain(customHandlerChain);
-
-        Map<String, Object> requestContext = bindingProvider.getRequestContext();
-        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
-	    // jbossws should do this for us . . .
-	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
-        try {
-            addressingProperties.setAction(builder.newURI(action));
-            addressingProperties.setFrom(getParticipant());
-        } catch (URISyntaxException use) {
-            // TODO log this error
-        }
-
-        return port;
-    }
-
-    // don't think we ever need this as we get a registration port from the endpoint ref returned by
-    // the activation port request
-    public static ParticipantPortType getParticipantPort(AddressingProperties addressingProperties, String action)
-    {
-        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
-        ParticipantService service = getParticipantService();
-        ParticipantPortType port = service.getPort(ParticipantPortType.class);
-        BindingProvider bindingProvider = (BindingProvider)port;
-        AttributedURI toUri = addressingProperties.getTo();
-        List<Handler> customHandlerChain = new ArrayList<Handler>();
-        /*
-         * we need to add the coordination context handler in the case where we are passing a
-         * coordination context via a header element
-         */
-        customHandlerChain.add(new CoordinationContextHandler());
-        /*
-         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
-         */
-		customHandlerChain.add(new WSAddressingClientHandler());
-		bindingProvider.getBinding().setHandlerChain(customHandlerChain);
-
-        Map<String, Object> requestContext = bindingProvider.getRequestContext();
-        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
-	    // jbossws should do this for us . . .
-	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
-        try {
-            addressingProperties.setAction(builder.newURI(action));
-            addressingProperties.setFrom(getInitiator());
-        } catch (URISyntaxException use) {
-            // TODO log this error
-        }
-
-        return port;
-    }
-
-    private static EndpointReference initiator;
-    private static EndpointReference participant;
-
-    private static synchronized EndpointReference getInitiator()
-    {
-        if (initiator == null) {
-            final String initiatorURIString =
-                ServiceRegistry.getRegistry().getServiceURI(ATInteropConstants.SERVICE_INITIATOR);
-            try {
-                URI initiatorURI = new URI(initiatorURIString);
-                initiator = builder.newEndpointReference(initiatorURI);
-            } catch (URISyntaxException use) {
-                // TODO - log fault and throw exception
-            }
-        }
-        return initiator;
-    }
-
-    private static synchronized EndpointReference getParticipant()
-    {
-        if (participant == null) {
-            final String participantURIString =
-                    ServiceRegistry.getRegistry().getServiceURI(ATInteropConstants.SERVICE_PARTICIPANT);
-            try {
-                URI participantURI = new URI(participantURIString);
-                participant = builder.newEndpointReference(participantURI);
-            } catch (URISyntaxException use) {
-                // TODO - log fault and throw exception
-            }
-        }
-        return participant;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,190 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.client;
+
+import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
+
+import javax.xml.ws.addressing.*;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import javax.xml.ws.handler.Handler;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.net.URISyntaxException;
+import java.net.URI;
+
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.ServiceRegistry;
+import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorService;
+import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantService;
+import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;
+import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantPortType;
+import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
+import com.jboss.transaction.txinterop.webservices.handlers.CoordinationContextHandler;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: adinn
+ * Date: Apr 17, 2008
+ * Time: 4:18:34 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class ATInteropClient {
+    // TODO -- do we really need a thread local here or can we just use one service?
+    /**
+     *  thread local which maintains a per thread activation service instance
+     */
+    private static ThreadLocal<InitiatorService> initiatorService = new ThreadLocal<InitiatorService>();
+
+    /**
+     *  thread local which maintains a per thread activation service instance
+     */
+    private static ThreadLocal<ParticipantService> participantService = new ThreadLocal<ParticipantService>();
+
+    /**
+     *  builder used to construct addressing info for calls
+     */
+    private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+
+    /**
+     * fetch a coordinator activation service unique to the current thread
+     * @return
+     */
+    private static synchronized InitiatorService getInitiatorService()
+    {
+        if (initiatorService.get() == null) {
+            initiatorService.set(new InitiatorService());
+        }
+        return initiatorService.get();
+    }
+
+    /**
+     * fetch a coordinator registration service unique to the current thread
+     * @return
+     */
+    private static synchronized ParticipantService getParticipantService()
+    {
+        if (participantService.get() == null) {
+            participantService.set(new ParticipantService());
+        }
+        return participantService.get();
+    }
+
+    public static InitiatorPortType getInitiatorPort(AddressingProperties addressingProperties,
+                                                       String action)
+    {
+        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
+        InitiatorService service = getInitiatorService();
+        InitiatorPortType port = service.getPort(InitiatorPortType.class);
+        BindingProvider bindingProvider = (BindingProvider)port;
+        AttributedURI toUri = addressingProperties.getTo();
+        List<Handler> customHandlerChain = new ArrayList<Handler>();
+        /*
+         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
+         */
+		customHandlerChain.add(new WSAddressingClientHandler());
+        bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+
+        Map<String, Object> requestContext = bindingProvider.getRequestContext();
+        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
+	    // jbossws should do this for us . . .
+	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
+        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
+        try {
+            addressingProperties.setAction(builder.newURI(action));
+            addressingProperties.setFrom(getParticipant());
+        } catch (URISyntaxException use) {
+            // TODO log this error
+        }
+
+        return port;
+    }
+
+    // don't think we ever need this as we get a registration port from the endpoint ref returned by
+    // the activation port request
+    public static ParticipantPortType getParticipantPort(AddressingProperties addressingProperties, String action)
+    {
+        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
+        ParticipantService service = getParticipantService();
+        ParticipantPortType port = service.getPort(ParticipantPortType.class);
+        BindingProvider bindingProvider = (BindingProvider)port;
+        AttributedURI toUri = addressingProperties.getTo();
+        List<Handler> customHandlerChain = new ArrayList<Handler>();
+        /*
+         * we need to add the coordination context handler in the case where we are passing a
+         * coordination context via a header element
+         */
+        customHandlerChain.add(new CoordinationContextHandler());
+        /*
+         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
+         */
+		customHandlerChain.add(new WSAddressingClientHandler());
+		bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+
+        Map<String, Object> requestContext = bindingProvider.getRequestContext();
+        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
+	    // jbossws should do this for us . . .
+	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
+        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
+        try {
+            addressingProperties.setAction(builder.newURI(action));
+            addressingProperties.setFrom(getInitiator());
+        } catch (URISyntaxException use) {
+            // TODO log this error
+        }
+
+        return port;
+    }
+
+    private static EndpointReference initiator;
+    private static EndpointReference participant;
+
+    private static synchronized EndpointReference getInitiator()
+    {
+        if (initiator == null) {
+            final String initiatorURIString =
+                ServiceRegistry.getRegistry().getServiceURI(ATInteropConstants.SERVICE_INITIATOR);
+            try {
+                URI initiatorURI = new URI(initiatorURIString);
+                initiator = builder.newEndpointReference(initiatorURI);
+            } catch (URISyntaxException use) {
+                // TODO - log fault and throw exception
+            }
+        }
+        return initiator;
+    }
+
+    private static synchronized EndpointReference getParticipant()
+    {
+        if (participant == null) {
+            final String participantURIString =
+                    ServiceRegistry.getRegistry().getServiceURI(ATInteropConstants.SERVICE_PARTICIPANT);
+            try {
+                URI participantURI = new URI(participantURIString);
+                participant = builder.newEndpointReference(participantURI);
+            } catch (URISyntaxException use) {
+                // TODO - log fault and throw exception
+            }
+        }
+        return participant;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,456 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.client;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.ServiceRegistry;
-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;
-import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantPortType;
-
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.EndpointReference;
-import javax.xml.ws.addressing.AddressingBuilder;
-
-/**
- * The participant client.
- * @author kevin
- */
-public class AsyncParticipantClient
-{
-    /**
-     * The client singleton.
-     */
-    private static final AsyncParticipantClient CLIENT = new AsyncParticipantClient() ;
-
-    /**
-     * The completion commit action.
-     */
-    private static final String completionCommitAction = ATInteropConstants.INTEROP_ACTION_COMPLETION_COMMIT ;
-    /**
-     * The completion rollback Action.
-     */
-    private static final String completionRollbackAction = ATInteropConstants.INTEROP_ACTION_COMPLETION_ROLLBACK ;
-    /**
-     * The commit Action.
-     */
-    private static final String commitAction = ATInteropConstants.INTEROP_ACTION_COMMIT ;
-    /**
-     * The rollback Action.
-     */
-    private static final String rollbackAction = ATInteropConstants.INTEROP_ACTION_ROLLBACK ;
-    /**
-     * The phase 2 rollback Action.
-     */
-    private static final String phase2RollbackAction = ATInteropConstants.INTEROP_ACTION_PHASE_2_ROLLBACK ;
-    /**
-     * The readonly Action.
-     */
-    private static final String readonlyAction = ATInteropConstants.INTEROP_ACTION_READONLY ;
-    /**
-     * The volatile and durable Action.
-     */
-    private static final String volatileAndDurableAction = ATInteropConstants.INTEROP_ACTION_VOLATILE_AND_DURABLE ;
-    /**
-     * The early readonly Action.
-     */
-    private static final String earlyReadonlyAction = ATInteropConstants.INTEROP_ACTION_EARLY_READONLY ;
-    /**
-     * The early aborted Action.
-     */
-    private static final String earlyAbortedAction = ATInteropConstants.INTEROP_ACTION_EARLY_ABORTED ;
-    /**
-     * The replay commit Action.
-     */
-    private static final String replayCommitAction = ATInteropConstants.INTEROP_ACTION_REPLAY_COMMIT ;
-    /**
-     * The retry prepared commit Action.
-     */
-    private static final String retryPreparedCommitAction = ATInteropConstants.INTEROP_ACTION_RETRY_PREPARED_COMMIT ;
-    /**
-     * The retry prepared abort Action.
-     */
-    private static final String retryPreparedAbortAction = ATInteropConstants.INTEROP_ACTION_RETRY_PREPARED_ABORT ;
-    /**
-     * The retry commit Action.
-     */
-    private static final String retryCommitAction = ATInteropConstants.INTEROP_ACTION_RETRY_COMMIT ;
-    /**
-     * The prepared after timeout Action.
-     */
-    private static final String preparedAfterTimeoutAction = ATInteropConstants.INTEROP_ACTION_PREPARED_AFTER_TIMEOUT ;
-    /**
-     * The lost committed Action.
-     */
-    private static final String lostCommittedAction = ATInteropConstants.INTEROP_ACTION_LOST_COMMITTED ;
-
-    /**
-     * The initiator URI for replies.
-     */
-    private EndpointReference initiator = null;
-
-    /**
-     * Construct the interop synch client.
-     */
-    private AsyncParticipantClient()
-    {
-        //final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
-
-        // Add WS-Addressing
-        //AddressingPolicy.register(handlerRegistry) ;
-        // Add coordination context
-        //CoordinationContextPolicy.register(handlerRegistry) ;
-        // Add client policies
-        //ClientPolicy.register(handlerRegistry) ;
-
-        //soapService = new SoapService(handlerRegistry) ;
-        AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-        final String initiatorURIString = ServiceRegistry.getRegistry().getServiceURI(ATInteropConstants.SERVICE_INITIATOR) ;
-        URI uri = null;
-        try {
-            uri = new URI(initiatorURIString);
-            initiator = builder.newEndpointReference(uri);
-        } catch (URISyntaxException e) {
-            // TODO log error here
-        }
-    }
-    /**
-     * Send a completion commit request.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompletionCommit(final AddressingProperties addressingProperties, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, completionCommitAction);
-        port.completionCommit(coordinatorURI);
-    }
-
-    /**
-     * Send a completion rollback request.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompletionRollback(final AddressingProperties addressingProperties, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, completionRollbackAction);
-        port.completionRollback(coordinatorURI);
-    }
-
-    /**
-     * Send a commit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, commitAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.commit();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a rollback request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, rollbackAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.rollback();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a phase2Rollback request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, phase2RollbackAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.phase2Rollback();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a readonly request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, readonlyAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.readonly();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a volatileAndDurable request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, volatileAndDurableAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.volatileAndDurable();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send an earlyReadonly request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, earlyReadonlyAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.earlyReadonly();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a earlyAborted request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendEarlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, earlyAbortedAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.earlyAborted();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a replayCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendReplayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, replayCommitAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.replayCommit();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a retryPreparedCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, retryPreparedCommitAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.retryPreparedCommit();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a retryPreparedAbort request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, retryPreparedAbortAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.retryPreparedAbort();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a retryCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, retryCommitAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.retryCommit();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a preparedAfterTimeout request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, preparedAfterTimeoutAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.preparedAfterTimeout();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Send a lostCommitted request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendLostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, lostCommittedAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try
-        {
-            port.lostCommitted();
-        }
-        finally
-        {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-
-    /**
-     * Get the Interop client singleton.
-     * @return The Interop client singleton.
-     */
-    public static AsyncParticipantClient getClient()
-    {
-        return CLIENT ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,476 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.client;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URI;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices11.ServiceRegistry;
+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;
+import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantPortType;
+
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.EndpointReference;
+import javax.xml.ws.addressing.AddressingBuilder;
+
+/**
+ * The participant client.
+ * @author kevin
+ */
+public class AsyncParticipantClient
+{
+    /**
+     * The client singleton.
+     */
+    private static final AsyncParticipantClient CLIENT = new AsyncParticipantClient() ;
+
+    /**
+     * The completion commit action.
+     */
+    private static final String completionCommitAction = ATInteropConstants.INTEROP_ACTION_COMPLETION_COMMIT ;
+    /**
+     * The completion rollback Action.
+     */
+    private static final String completionRollbackAction = ATInteropConstants.INTEROP_ACTION_COMPLETION_ROLLBACK ;
+    /**
+     * The commit Action.
+     */
+    private static final String commitAction = ATInteropConstants.INTEROP_ACTION_COMMIT ;
+    /**
+     * The rollback Action.
+     */
+    private static final String rollbackAction = ATInteropConstants.INTEROP_ACTION_ROLLBACK ;
+    /**
+     * The phase 2 rollback Action.
+     */
+    private static final String phase2RollbackAction = ATInteropConstants.INTEROP_ACTION_PHASE_2_ROLLBACK ;
+    /**
+     * The readonly Action.
+     */
+    private static final String readonlyAction = ATInteropConstants.INTEROP_ACTION_READONLY ;
+    /**
+     * The volatile and durable Action.
+     */
+    private static final String volatileAndDurableAction = ATInteropConstants.INTEROP_ACTION_VOLATILE_AND_DURABLE ;
+    /**
+     * The early readonly Action.
+     */
+    private static final String earlyReadonlyAction = ATInteropConstants.INTEROP_ACTION_EARLY_READONLY ;
+    /**
+     * The early aborted Action.
+     */
+    private static final String earlyAbortedAction = ATInteropConstants.INTEROP_ACTION_EARLY_ABORTED ;
+    /**
+     * The replay commit Action.
+     */
+    private static final String replayCommitAction = ATInteropConstants.INTEROP_ACTION_REPLAY_COMMIT ;
+    /**
+     * The retry prepared commit Action.
+     */
+    private static final String retryPreparedCommitAction = ATInteropConstants.INTEROP_ACTION_RETRY_PREPARED_COMMIT ;
+    /**
+     * The retry prepared abort Action.
+     */
+    private static final String retryPreparedAbortAction = ATInteropConstants.INTEROP_ACTION_RETRY_PREPARED_ABORT ;
+    /**
+     * The retry commit Action.
+     */
+    private static final String retryCommitAction = ATInteropConstants.INTEROP_ACTION_RETRY_COMMIT ;
+    /**
+     * The prepared after timeout Action.
+     */
+    private static final String preparedAfterTimeoutAction = ATInteropConstants.INTEROP_ACTION_PREPARED_AFTER_TIMEOUT ;
+    /**
+     * The lost committed Action.
+     */
+    private static final String lostCommittedAction = ATInteropConstants.INTEROP_ACTION_LOST_COMMITTED ;
+
+    /**
+     * The initiator URI for replies.
+     */
+    private EndpointReference initiator = null;
+
+    /**
+     * Construct the interop synch client.
+     */
+    private AsyncParticipantClient()
+    {
+        //final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+
+        // Add WS-Addressing
+        //AddressingPolicy.register(handlerRegistry) ;
+        // Add coordination context
+        //CoordinationContextPolicy.register(handlerRegistry) ;
+        // Add client policies
+        //ClientPolicy.register(handlerRegistry) ;
+
+        //soapService = new SoapService(handlerRegistry) ;
+        AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+        final String initiatorURIString = ServiceRegistry.getRegistry().getServiceURI(ATInteropConstants.SERVICE_INITIATOR) ;
+        URI uri = null;
+        try {
+            uri = new URI(initiatorURIString);
+            initiator = builder.newEndpointReference(uri);
+        } catch (URISyntaxException e) {
+            // TODO log error here
+        }
+    }
+    /**
+     * Send a completion commit request.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompletionCommit(final AddressingProperties addressingProperties, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, completionCommitAction);
+        port.completionCommit(coordinatorURI);
+    }
+
+    /**
+     * Send a completion rollback request.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompletionRollback(final AddressingProperties addressingProperties, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, completionRollbackAction);
+        port.completionRollback(coordinatorURI);
+    }
+
+    /**
+     * Send a commit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, commitAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.commit();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a rollback request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, rollbackAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.rollback();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a phase2Rollback request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, phase2RollbackAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.phase2Rollback();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a readonly request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, readonlyAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.readonly();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a volatileAndDurable request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, volatileAndDurableAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.volatileAndDurable();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send an earlyReadonly request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, earlyReadonlyAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.earlyReadonly();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a earlyAborted request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendEarlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, earlyAbortedAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.earlyAborted();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a replayCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendReplayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, replayCommitAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.replayCommit();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a retryPreparedCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, retryPreparedCommitAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.retryPreparedCommit();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a retryPreparedAbort request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, retryPreparedAbortAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.retryPreparedAbort();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a retryCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, retryCommitAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.retryCommit();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a preparedAfterTimeout request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, preparedAfterTimeoutAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.preparedAfterTimeout();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Send a lostCommitted request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendLostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, lostCommittedAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try
+        {
+            port.lostCommitted();
+        }
+        finally
+        {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+
+    /**
+     * Get the Interop client singleton.
+     * @return The Interop client singleton.
+     */
+    public static AsyncParticipantClient getClient()
+    {
+        return CLIENT ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,110 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.client;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.net.URISyntaxException;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.SoapFaultType;
-import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
-import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;
-
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.JAXWSAConstants;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.handler.Handler;
-import javax.xml.namespace.QName;
-
-import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
-import org.jboss.jbossts.xts.soapfault.SoapFaultService;
-
-/**
- * The initiator client.
- * @author kevin
- */
-public class InitiatorClient
-{
-    /**
-     * The client singleton.
-     */
-    private static final InitiatorClient CLIENT = new InitiatorClient() ;
-    
-    /**
-     * The response action.
-     */
-    private static final String responseAction = ATInteropConstants.INTEROP_ACTION_RESPONSE ;
-    
-    /**
-     * Construct the interop synch client.
-     */
-    private InitiatorClient()
-    {
-        //final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
-        
-        // Add WS-Addressing
-        //AddressingPolicy.register(handlerRegistry) ;
-        // Add client policies
-        //ClientPolicy.register(handlerRegistry) ;
-        
-        //soapService = new SoapService(handlerRegistry) ;
-    }
-
-    /**
-     * Send a response.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendResponse(final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        InitiatorPortType port = ATInteropClient.getInitiatorPort(addressingProperties, responseAction);
-        port.response();
-    }
-
-    /**
-     * Send a fault.
-     * @param addressingProperties The addressing context.
-     * @param soapFault The SOAP fault.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault11 soapFault)
-        throws SoapFault, IOException
-    {
-        String soapFaultAction = soapFault.getAction() ;
-        AttributedURI actionURI = null;
-        if (soapFaultAction == null)
-        {
-            soapFaultAction = faultAction;
-        }
-        try {
-            actionURI = builder.newURI(soapFaultAction);
-        } catch (URISyntaxException e) {
-            // TODO log error here
-        }
-        AddressingProperties replyProperties = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId());
-        AddressingHelper.installNoneReplyTo(replyProperties);
-        SoapFaultClient.sendSoapFault(soapFault, addressingProperties, actionURI);
-    }
-
-    private static final String faultAction = AtomicTransactionConstants.WSAT_ACTION_FAULT;
-    private static final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-    /**
-     * Get the Interop client singleton.
-     * @return The Interop client singleton.
-     */
-    public static InitiatorClient getClient()
-    {
-        return CLIENT ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.client;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.net.URISyntaxException;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.SoapFaultType;
+import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
+import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
+import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;
+
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.AttributedURI;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.addressing.AddressingBuilder;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.handler.Handler;
+import javax.xml.namespace.QName;
+
+import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
+import org.jboss.jbossts.xts.soapfault.SoapFaultService;
+
+/**
+ * The initiator client.
+ * @author kevin
+ */
+public class InitiatorClient
+{
+    /**
+     * The client singleton.
+     */
+    private static final InitiatorClient CLIENT = new InitiatorClient() ;
+    
+    /**
+     * The response action.
+     */
+    private static final String responseAction = ATInteropConstants.INTEROP_ACTION_RESPONSE ;
+    
+    /**
+     * Construct the interop synch client.
+     */
+    private InitiatorClient()
+    {
+        //final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+        
+        // Add WS-Addressing
+        //AddressingPolicy.register(handlerRegistry) ;
+        // Add client policies
+        //ClientPolicy.register(handlerRegistry) ;
+        
+        //soapService = new SoapService(handlerRegistry) ;
+    }
+
+    /**
+     * Send a response.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendResponse(final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        InitiatorPortType port = ATInteropClient.getInitiatorPort(addressingProperties, responseAction);
+        port.response();
+    }
+
+    /**
+     * Send a fault.
+     * @param addressingProperties The addressing context.
+     * @param soapFault The SOAP fault.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault11 soapFault)
+        throws SoapFault, IOException
+    {
+        String soapFaultAction = soapFault.getAction() ;
+        AttributedURI actionURI = null;
+        if (soapFaultAction == null)
+        {
+            soapFaultAction = faultAction;
+        }
+        try {
+            actionURI = builder.newURI(soapFaultAction);
+        } catch (URISyntaxException e) {
+            // TODO log error here
+        }
+        AddressingProperties replyProperties = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId());
+        AddressingHelper.installNoneReplyTo(replyProperties);
+        SoapFaultClient.sendSoapFault(soapFault, addressingProperties, actionURI);
+    }
+
+    private static final String faultAction = AtomicTransactionConstants.WSAT_ACTION_FAULT;
+    private static final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+    /**
+     * Get the Interop client singleton.
+     * @return The Interop client singleton.
+     */
+    public static InitiatorClient getClient()
+    {
+        return CLIENT ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,278 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.client;
-
-import java.io.IOException;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-import com.arjuna.webservices.*;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
-
-/**
- * The participant client.
- * @author kevin
- */
-public class SyncParticipantClient
-{
-    /**
-     * The client singleton.
-     */
-    private static final SyncParticipantClient CLIENT = new SyncParticipantClient() ;
-    
-    /**
-     * The completion commit action.
-     */
-    private static final String completionCommitAction = ATInteropConstants.INTEROP_ACTION_COMPLETION_COMMIT ;
-    /**
-     * The completion rollback Action.
-     */
-    private static final String completionRollbackAction = ATInteropConstants.INTEROP_ACTION_COMPLETION_ROLLBACK ;
-    /**
-     * The commit Action.
-     */
-    private static final String commitAction = ATInteropConstants.INTEROP_ACTION_COMMIT ;
-    /**
-     * The rollback Action.
-     */
-    private static final String rollbackAction = ATInteropConstants.INTEROP_ACTION_ROLLBACK ;
-    /**
-     * The phase 2 rollback Action.
-     */
-    private static final String phase2RollbackAction = ATInteropConstants.INTEROP_ACTION_PHASE_2_ROLLBACK ;
-    /**
-     * The readonly Action.
-     */
-    private static final String readonlyAction = ATInteropConstants.INTEROP_ACTION_READONLY ;
-    /**
-     * The volatile and durable Action.
-     */
-    private static final String volatileAndDurableAction = ATInteropConstants.INTEROP_ACTION_VOLATILE_AND_DURABLE ;
-    /**
-     * The early readonly Action.
-     */
-    private static final String earlyReadonlyAction = ATInteropConstants.INTEROP_ACTION_EARLY_READONLY ;
-    /**
-     * The early aborted Action.
-     */
-    private static final String earlyAbortedAction = ATInteropConstants.INTEROP_ACTION_EARLY_ABORTED ;
-    /**
-     * The replay commit Action.
-     */
-    private static final String replayCommitAction = ATInteropConstants.INTEROP_ACTION_REPLAY_COMMIT ;
-    /**
-     * The retry prepared commit Action.
-     */
-    private static final String retryPreparedCommitAction = ATInteropConstants.INTEROP_ACTION_RETRY_PREPARED_COMMIT ;
-    /**
-     * The retry prepared abort Action.
-     */
-    private static final String retryPreparedAbortAction = ATInteropConstants.INTEROP_ACTION_RETRY_PREPARED_ABORT ;
-    /**
-     * The retry commit Action.
-     */
-    private static final String retryCommitAction = ATInteropConstants.INTEROP_ACTION_RETRY_COMMIT ;
-    /**
-     * The prepared after timeout Action.
-     */
-    private static final String preparedAfterTimeoutAction = ATInteropConstants.INTEROP_ACTION_PREPARED_AFTER_TIMEOUT ;
-    /**
-     * The lost committed Action.
-     */
-    private static final String lostCommittedAction = ATInteropConstants.INTEROP_ACTION_LOST_COMMITTED ;
-    
-    /**
-     * Construct the interop synch client.
-     */
-    private SyncParticipantClient()
-    {
-    }
-
-    /**
-     * Send a completion commit request.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompletionCommit(final AddressingProperties addressingProperties, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a completion rollback request.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @param coordinatorURI The coordinator URI.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompletionRollback(final AddressingProperties addressingProperties, final String coordinatorURI)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a commit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a rollback request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a phase2Rollback request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a readonly request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a volatileAndDurable request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send an earlyReadonly request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a earlyAborted request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendEarlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a replayCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendReplayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a retryPreparedCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a retryPreparedAbort request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a retryCommit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendRetryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a preparedAfterTimeout request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-
-    /**
-     * Send a lostCommitted request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendLostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Get the Interop client singleton.
-     * @return The Interop client singleton.
-     */
-    public static SyncParticipantClient getClient()
-    {
-        return CLIENT ;
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,298 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.client;
+
+import java.io.IOException;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+import com.arjuna.webservices.*;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
+
+/**
+ * The participant client.
+ * @author kevin
+ */
+public class SyncParticipantClient
+{
+    /**
+     * The client singleton.
+     */
+    private static final SyncParticipantClient CLIENT = new SyncParticipantClient() ;
+    
+    /**
+     * The completion commit action.
+     */
+    private static final String completionCommitAction = ATInteropConstants.INTEROP_ACTION_COMPLETION_COMMIT ;
+    /**
+     * The completion rollback Action.
+     */
+    private static final String completionRollbackAction = ATInteropConstants.INTEROP_ACTION_COMPLETION_ROLLBACK ;
+    /**
+     * The commit Action.
+     */
+    private static final String commitAction = ATInteropConstants.INTEROP_ACTION_COMMIT ;
+    /**
+     * The rollback Action.
+     */
+    private static final String rollbackAction = ATInteropConstants.INTEROP_ACTION_ROLLBACK ;
+    /**
+     * The phase 2 rollback Action.
+     */
+    private static final String phase2RollbackAction = ATInteropConstants.INTEROP_ACTION_PHASE_2_ROLLBACK ;
+    /**
+     * The readonly Action.
+     */
+    private static final String readonlyAction = ATInteropConstants.INTEROP_ACTION_READONLY ;
+    /**
+     * The volatile and durable Action.
+     */
+    private static final String volatileAndDurableAction = ATInteropConstants.INTEROP_ACTION_VOLATILE_AND_DURABLE ;
+    /**
+     * The early readonly Action.
+     */
+    private static final String earlyReadonlyAction = ATInteropConstants.INTEROP_ACTION_EARLY_READONLY ;
+    /**
+     * The early aborted Action.
+     */
+    private static final String earlyAbortedAction = ATInteropConstants.INTEROP_ACTION_EARLY_ABORTED ;
+    /**
+     * The replay commit Action.
+     */
+    private static final String replayCommitAction = ATInteropConstants.INTEROP_ACTION_REPLAY_COMMIT ;
+    /**
+     * The retry prepared commit Action.
+     */
+    private static final String retryPreparedCommitAction = ATInteropConstants.INTEROP_ACTION_RETRY_PREPARED_COMMIT ;
+    /**
+     * The retry prepared abort Action.
+     */
+    private static final String retryPreparedAbortAction = ATInteropConstants.INTEROP_ACTION_RETRY_PREPARED_ABORT ;
+    /**
+     * The retry commit Action.
+     */
+    private static final String retryCommitAction = ATInteropConstants.INTEROP_ACTION_RETRY_COMMIT ;
+    /**
+     * The prepared after timeout Action.
+     */
+    private static final String preparedAfterTimeoutAction = ATInteropConstants.INTEROP_ACTION_PREPARED_AFTER_TIMEOUT ;
+    /**
+     * The lost committed Action.
+     */
+    private static final String lostCommittedAction = ATInteropConstants.INTEROP_ACTION_LOST_COMMITTED ;
+    
+    /**
+     * Construct the interop synch client.
+     */
+    private SyncParticipantClient()
+    {
+    }
+
+    /**
+     * Send a completion commit request.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompletionCommit(final AddressingProperties addressingProperties, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a completion rollback request.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @param coordinatorURI The coordinator URI.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompletionRollback(final AddressingProperties addressingProperties, final String coordinatorURI)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a commit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a rollback request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a phase2Rollback request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a readonly request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a volatileAndDurable request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send an earlyReadonly request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a earlyAborted request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendEarlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a replayCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendReplayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a retryPreparedCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a retryPreparedAbort request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a retryCommit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendRetryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a preparedAfterTimeout request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+
+    /**
+     * Send a lostCommitted request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendLostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Get the Interop client singleton.
+     * @return The Interop client singleton.
+     */
+    public static SyncParticipantClient getClient()
+    {
+        return CLIENT ;
+    }
+}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorPortType.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,28 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.atinterop.generated;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebService(name = "InitiatorPortType", targetNamespace = "http://fabrikam123.com")
-public interface InitiatorPortType {
-
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Response", action = "http://fabrikam123.com/Response")
-    @Oneway
-    @RequestWrapper(localName = "Response", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void response();
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorPortType.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorPortType.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorPortType.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.atinterop.generated;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebService(name = "InitiatorPortType", targetNamespace = "http://fabrikam123.com")
+public interface InitiatorPortType {
+
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Response", action = "http://fabrikam123.com/Response")
+    @Oneway
+    @RequestWrapper(localName = "Response", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void response();
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorService.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorService.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,58 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.atinterop.generated;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebServiceClient(name = "InitiatorService", targetNamespace = "http://fabrikam123.com", wsdlLocation = "wsdl/interopat-initiator-binding.wsdl")
-public class InitiatorService
-    extends Service
-{
-
-    private final static URL INITIATORSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorService.class.getResource(".");
-            url = new URL(baseUrl, "wsdl/interopat-initiator-binding.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'wsdl/interopat-initiator-binding.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        INITIATORSERVICE_WSDL_LOCATION = url;
-    }
-
-    public InitiatorService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public InitiatorService() {
-        super(INITIATORSERVICE_WSDL_LOCATION, new QName("http://fabrikam123.com", "InitiatorService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns InitiatorPortType
-     */
-    @WebEndpoint(name = "InitiatorPortType")
-    public InitiatorPortType getInitiatorPortType() {
-        return super.getPort(new QName("http://fabrikam123.com", "InitiatorPortType"), InitiatorPortType.class);
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorService.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorService.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorService.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/InitiatorService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.atinterop.generated;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebServiceClient(name = "InitiatorService", targetNamespace = "http://fabrikam123.com", wsdlLocation = "wsdl/interopat-initiator-binding.wsdl")
+public class InitiatorService
+    extends Service
+{
+
+    private final static URL INITIATORSERVICE_WSDL_LOCATION;
+    private final static Logger logger = Logger.getLogger(com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorService.class.getName());
+
+    static {
+        URL url = null;
+        try {
+            URL baseUrl;
+            baseUrl = com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorService.class.getResource(".");
+            url = new URL(baseUrl, "wsdl/interopat-initiator-binding.wsdl");
+        } catch (MalformedURLException e) {
+            logger.warning("Failed to create URL for the wsdl Location: 'wsdl/interopat-initiator-binding.wsdl', retrying as a local file");
+            logger.warning(e.getMessage());
+        }
+        INITIATORSERVICE_WSDL_LOCATION = url;
+    }
+
+    public InitiatorService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public InitiatorService() {
+        super(INITIATORSERVICE_WSDL_LOCATION, new QName("http://fabrikam123.com", "InitiatorService"));
+    }
+
+    /**
+     * 
+     * @return
+     *     returns InitiatorPortType
+     */
+    @WebEndpoint(name = "InitiatorPortType")
+    public InitiatorPortType getInitiatorPortType() {
+        return super.getPort(new QName("http://fabrikam123.com", "InitiatorPortType"), InitiatorPortType.class);
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ObjectFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ObjectFactory.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ObjectFactory.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,203 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.atinterop.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.jboss.transaction.txinterop.webservices.atinterop.generated package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
- at XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _Readonly_QNAME = new QName("http://fabrikam123.com", "Readonly");
-    private final static QName _Response_QNAME = new QName("http://fabrikam123.com", "Response");
-    private final static QName _Commit_QNAME = new QName("http://fabrikam123.com", "Commit");
-    private final static QName _VolatileAndDurable_QNAME = new QName("http://fabrikam123.com", "VolatileAndDurable");
-    private final static QName _ReplayCommit_QNAME = new QName("http://fabrikam123.com", "ReplayCommit");
-    private final static QName _PreparedAfterTimeout_QNAME = new QName("http://fabrikam123.com", "PreparedAfterTimeout");
-    private final static QName _Phase2Rollback_QNAME = new QName("http://fabrikam123.com", "Phase2Rollback");
-    private final static QName _EarlyAborted_QNAME = new QName("http://fabrikam123.com", "EarlyAborted");
-    private final static QName _EarlyReadonly_QNAME = new QName("http://fabrikam123.com", "EarlyReadonly");
-    private final static QName _Rollback_QNAME = new QName("http://fabrikam123.com", "Rollback");
-    private final static QName _CompletionCommit_QNAME = new QName("http://fabrikam123.com", "CompletionCommit");
-    private final static QName _RetryCommit_QNAME = new QName("http://fabrikam123.com", "RetryCommit");
-    private final static QName _RetryPreparedCommit_QNAME = new QName("http://fabrikam123.com", "RetryPreparedCommit");
-    private final static QName _RetryPreparedAbort_QNAME = new QName("http://fabrikam123.com", "RetryPreparedAbort");
-    private final static QName _LostCommitted_QNAME = new QName("http://fabrikam123.com", "LostCommitted");
-    private final static QName _CompletionRollback_QNAME = new QName("http://fabrikam123.com", "CompletionRollback");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.jboss.transaction.txinterop.webservices.atinterop.generated
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link TestMessageType }
-     * 
-     */
-    public TestMessageType createTestMessageType() {
-        return new TestMessageType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "Readonly")
-    public JAXBElement<TestMessageType> createReadonly(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Readonly_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "Response")
-    public JAXBElement<TestMessageType> createResponse(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Response_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "Commit")
-    public JAXBElement<TestMessageType> createCommit(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Commit_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "VolatileAndDurable")
-    public JAXBElement<TestMessageType> createVolatileAndDurable(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_VolatileAndDurable_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "ReplayCommit")
-    public JAXBElement<TestMessageType> createReplayCommit(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_ReplayCommit_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "PreparedAfterTimeout")
-    public JAXBElement<TestMessageType> createPreparedAfterTimeout(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_PreparedAfterTimeout_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "Phase2Rollback")
-    public JAXBElement<TestMessageType> createPhase2Rollback(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Phase2Rollback_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "EarlyAborted")
-    public JAXBElement<TestMessageType> createEarlyAborted(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_EarlyAborted_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "EarlyReadonly")
-    public JAXBElement<TestMessageType> createEarlyReadonly(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_EarlyReadonly_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "Rollback")
-    public JAXBElement<TestMessageType> createRollback(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Rollback_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "CompletionCommit")
-    public JAXBElement<String> createCompletionCommit(String value) {
-        return new JAXBElement<String>(_CompletionCommit_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "RetryCommit")
-    public JAXBElement<TestMessageType> createRetryCommit(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_RetryCommit_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "RetryPreparedCommit")
-    public JAXBElement<TestMessageType> createRetryPreparedCommit(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_RetryPreparedCommit_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "RetryPreparedAbort")
-    public JAXBElement<TestMessageType> createRetryPreparedAbort(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_RetryPreparedAbort_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "LostCommitted")
-    public JAXBElement<TestMessageType> createLostCommitted(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_LostCommitted_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "CompletionRollback")
-    public JAXBElement<String> createCompletionRollback(String value) {
-        return new JAXBElement<String>(_CompletionRollback_QNAME, String.class, null, value);
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ObjectFactory.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ObjectFactory.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ObjectFactory.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ObjectFactory.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,223 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.atinterop.generated;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the com.jboss.transaction.txinterop.webservices.atinterop.generated package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+ at XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _Readonly_QNAME = new QName("http://fabrikam123.com", "Readonly");
+    private final static QName _Response_QNAME = new QName("http://fabrikam123.com", "Response");
+    private final static QName _Commit_QNAME = new QName("http://fabrikam123.com", "Commit");
+    private final static QName _VolatileAndDurable_QNAME = new QName("http://fabrikam123.com", "VolatileAndDurable");
+    private final static QName _ReplayCommit_QNAME = new QName("http://fabrikam123.com", "ReplayCommit");
+    private final static QName _PreparedAfterTimeout_QNAME = new QName("http://fabrikam123.com", "PreparedAfterTimeout");
+    private final static QName _Phase2Rollback_QNAME = new QName("http://fabrikam123.com", "Phase2Rollback");
+    private final static QName _EarlyAborted_QNAME = new QName("http://fabrikam123.com", "EarlyAborted");
+    private final static QName _EarlyReadonly_QNAME = new QName("http://fabrikam123.com", "EarlyReadonly");
+    private final static QName _Rollback_QNAME = new QName("http://fabrikam123.com", "Rollback");
+    private final static QName _CompletionCommit_QNAME = new QName("http://fabrikam123.com", "CompletionCommit");
+    private final static QName _RetryCommit_QNAME = new QName("http://fabrikam123.com", "RetryCommit");
+    private final static QName _RetryPreparedCommit_QNAME = new QName("http://fabrikam123.com", "RetryPreparedCommit");
+    private final static QName _RetryPreparedAbort_QNAME = new QName("http://fabrikam123.com", "RetryPreparedAbort");
+    private final static QName _LostCommitted_QNAME = new QName("http://fabrikam123.com", "LostCommitted");
+    private final static QName _CompletionRollback_QNAME = new QName("http://fabrikam123.com", "CompletionRollback");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.jboss.transaction.txinterop.webservices.atinterop.generated
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link TestMessageType }
+     * 
+     */
+    public TestMessageType createTestMessageType() {
+        return new TestMessageType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "Readonly")
+    public JAXBElement<TestMessageType> createReadonly(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Readonly_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "Response")
+    public JAXBElement<TestMessageType> createResponse(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Response_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "Commit")
+    public JAXBElement<TestMessageType> createCommit(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Commit_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "VolatileAndDurable")
+    public JAXBElement<TestMessageType> createVolatileAndDurable(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_VolatileAndDurable_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "ReplayCommit")
+    public JAXBElement<TestMessageType> createReplayCommit(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_ReplayCommit_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "PreparedAfterTimeout")
+    public JAXBElement<TestMessageType> createPreparedAfterTimeout(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_PreparedAfterTimeout_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "Phase2Rollback")
+    public JAXBElement<TestMessageType> createPhase2Rollback(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Phase2Rollback_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "EarlyAborted")
+    public JAXBElement<TestMessageType> createEarlyAborted(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_EarlyAborted_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "EarlyReadonly")
+    public JAXBElement<TestMessageType> createEarlyReadonly(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_EarlyReadonly_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "Rollback")
+    public JAXBElement<TestMessageType> createRollback(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Rollback_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "CompletionCommit")
+    public JAXBElement<String> createCompletionCommit(String value) {
+        return new JAXBElement<String>(_CompletionCommit_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "RetryCommit")
+    public JAXBElement<TestMessageType> createRetryCommit(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_RetryCommit_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "RetryPreparedCommit")
+    public JAXBElement<TestMessageType> createRetryPreparedCommit(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_RetryPreparedCommit_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "RetryPreparedAbort")
+    public JAXBElement<TestMessageType> createRetryPreparedAbort(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_RetryPreparedAbort_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "LostCommitted")
+    public JAXBElement<TestMessageType> createLostCommitted(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_LostCommitted_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com", name = "CompletionRollback")
+    public JAXBElement<String> createCompletionRollback(String value) {
+        return new JAXBElement<String>(_CompletionRollback_QNAME, String.class, null, value);
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantPortType.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,148 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.atinterop.generated;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.RequestWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebService(name = "ParticipantPortType", targetNamespace = "http://fabrikam123.com")
-public interface ParticipantPortType {
-
-
-    /**
-     * 
-     * @param parameters
-     */
-    @WebMethod(operationName = "CompletionCommit", action = "http://fabrikam123.com/CompletionCommit")
-    @Oneway
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public void completionCommit(
-        @WebParam(name = "CompletionCommit", targetNamespace = "http://fabrikam123.com", partName = "parameters")
-        String parameters);
-
-    /**
-     * 
-     * @param parameters
-     */
-    @WebMethod(operationName = "CompletionRollback", action = "http://fabrikam123.com/CompletionRollback")
-    @Oneway
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public void completionRollback(
-        @WebParam(name = "CompletionRollback", targetNamespace = "http://fabrikam123.com", partName = "parameters")
-        String parameters);
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Commit", action = "http://fabrikam123.com/Commit")
-    @Oneway
-    @RequestWrapper(localName = "Commit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void commit();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Rollback", action = "http://fabrikam123.com/Rollback")
-    @Oneway
-    @RequestWrapper(localName = "Rollback", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void rollback();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Phase2Rollback", action = "http://fabrikam123.com/Phase2Rollback")
-    @Oneway
-    @RequestWrapper(localName = "Phase2Rollback", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void phase2Rollback();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Readonly", action = "http://fabrikam123.com/Readonly")
-    @Oneway
-    @RequestWrapper(localName = "Readonly", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void readonly();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "VolatileAndDurable", action = "http://fabrikam123.com/VolatileAndDurable")
-    @Oneway
-    @RequestWrapper(localName = "VolatileAndDurable", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void volatileAndDurable();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "EarlyReadonly", action = "http://fabrikam123.com/EarlyReadonly")
-    @Oneway
-    @RequestWrapper(localName = "EarlyReadonly", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void earlyReadonly();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "EarlyAborted", action = "http://fabrikam123.com/EarlyAborted")
-    @Oneway
-    @RequestWrapper(localName = "EarlyAborted", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void earlyAborted();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "ReplayCommit", action = "http://fabrikam123.com/ReplayCommit")
-    @Oneway
-    @RequestWrapper(localName = "ReplayCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void replayCommit();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "RetryPreparedCommit", action = "http://fabrikam123.com/RetryPreparedCommit")
-    @Oneway
-    @RequestWrapper(localName = "RetryPreparedCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void retryPreparedCommit();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "RetryPreparedAbort", action = "http://fabrikam123.com/RetryPreparedAbort")
-    @Oneway
-    @RequestWrapper(localName = "RetryPreparedAbort", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void retryPreparedAbort();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "RetryCommit", action = "http://fabrikam123.com/RetryCommit")
-    @Oneway
-    @RequestWrapper(localName = "RetryCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void retryCommit();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "PreparedAfterTimeout", action = "http://fabrikam123.com/PreparedAfterTimeout")
-    @Oneway
-    @RequestWrapper(localName = "PreparedAfterTimeout", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void preparedAfterTimeout();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "LostCommitted", action = "http://fabrikam123.com/LostCommitted")
-    @Oneway
-    @RequestWrapper(localName = "LostCommitted", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void lostCommitted();
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantPortType.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantPortType.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantPortType.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,168 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.atinterop.generated;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.RequestWrapper;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebService(name = "ParticipantPortType", targetNamespace = "http://fabrikam123.com")
+public interface ParticipantPortType {
+
+
+    /**
+     * 
+     * @param parameters
+     */
+    @WebMethod(operationName = "CompletionCommit", action = "http://fabrikam123.com/CompletionCommit")
+    @Oneway
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void completionCommit(
+        @WebParam(name = "CompletionCommit", targetNamespace = "http://fabrikam123.com", partName = "parameters")
+        String parameters);
+
+    /**
+     * 
+     * @param parameters
+     */
+    @WebMethod(operationName = "CompletionRollback", action = "http://fabrikam123.com/CompletionRollback")
+    @Oneway
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void completionRollback(
+        @WebParam(name = "CompletionRollback", targetNamespace = "http://fabrikam123.com", partName = "parameters")
+        String parameters);
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Commit", action = "http://fabrikam123.com/Commit")
+    @Oneway
+    @RequestWrapper(localName = "Commit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void commit();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Rollback", action = "http://fabrikam123.com/Rollback")
+    @Oneway
+    @RequestWrapper(localName = "Rollback", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void rollback();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Phase2Rollback", action = "http://fabrikam123.com/Phase2Rollback")
+    @Oneway
+    @RequestWrapper(localName = "Phase2Rollback", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void phase2Rollback();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Readonly", action = "http://fabrikam123.com/Readonly")
+    @Oneway
+    @RequestWrapper(localName = "Readonly", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void readonly();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "VolatileAndDurable", action = "http://fabrikam123.com/VolatileAndDurable")
+    @Oneway
+    @RequestWrapper(localName = "VolatileAndDurable", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void volatileAndDurable();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "EarlyReadonly", action = "http://fabrikam123.com/EarlyReadonly")
+    @Oneway
+    @RequestWrapper(localName = "EarlyReadonly", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void earlyReadonly();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "EarlyAborted", action = "http://fabrikam123.com/EarlyAborted")
+    @Oneway
+    @RequestWrapper(localName = "EarlyAborted", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void earlyAborted();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "ReplayCommit", action = "http://fabrikam123.com/ReplayCommit")
+    @Oneway
+    @RequestWrapper(localName = "ReplayCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void replayCommit();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "RetryPreparedCommit", action = "http://fabrikam123.com/RetryPreparedCommit")
+    @Oneway
+    @RequestWrapper(localName = "RetryPreparedCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void retryPreparedCommit();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "RetryPreparedAbort", action = "http://fabrikam123.com/RetryPreparedAbort")
+    @Oneway
+    @RequestWrapper(localName = "RetryPreparedAbort", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void retryPreparedAbort();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "RetryCommit", action = "http://fabrikam123.com/RetryCommit")
+    @Oneway
+    @RequestWrapper(localName = "RetryCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void retryCommit();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "PreparedAfterTimeout", action = "http://fabrikam123.com/PreparedAfterTimeout")
+    @Oneway
+    @RequestWrapper(localName = "PreparedAfterTimeout", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void preparedAfterTimeout();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "LostCommitted", action = "http://fabrikam123.com/LostCommitted")
+    @Oneway
+    @RequestWrapper(localName = "LostCommitted", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void lostCommitted();
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantService.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantService.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,58 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.atinterop.generated;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebServiceClient(name = "ParticipantService", targetNamespace = "http://fabrikam123.com", wsdlLocation = "wsdl/interopat-participant-binding.wsdl")
-public class ParticipantService
-    extends Service
-{
-
-    private final static URL PARTICIPANTSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantService.class.getResource(".");
-            url = new URL(baseUrl, "wsdl/interopat-participant-binding.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'wsdl/interopat-participant-binding.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        PARTICIPANTSERVICE_WSDL_LOCATION = url;
-    }
-
-    public ParticipantService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public ParticipantService() {
-        super(PARTICIPANTSERVICE_WSDL_LOCATION, new QName("http://fabrikam123.com", "ParticipantService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns ParticipantPortType
-     */
-    @WebEndpoint(name = "ParticipantPortType")
-    public ParticipantPortType getParticipantPortType() {
-        return super.getPort(new QName("http://fabrikam123.com", "ParticipantPortType"), ParticipantPortType.class);
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantService.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantService.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantService.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/ParticipantService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.atinterop.generated;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebServiceClient(name = "ParticipantService", targetNamespace = "http://fabrikam123.com", wsdlLocation = "wsdl/interopat-participant-binding.wsdl")
+public class ParticipantService
+    extends Service
+{
+
+    private final static URL PARTICIPANTSERVICE_WSDL_LOCATION;
+    private final static Logger logger = Logger.getLogger(com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantService.class.getName());
+
+    static {
+        URL url = null;
+        try {
+            URL baseUrl;
+            baseUrl = com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantService.class.getResource(".");
+            url = new URL(baseUrl, "wsdl/interopat-participant-binding.wsdl");
+        } catch (MalformedURLException e) {
+            logger.warning("Failed to create URL for the wsdl Location: 'wsdl/interopat-participant-binding.wsdl', retrying as a local file");
+            logger.warning(e.getMessage());
+        }
+        PARTICIPANTSERVICE_WSDL_LOCATION = url;
+    }
+
+    public ParticipantService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ParticipantService() {
+        super(PARTICIPANTSERVICE_WSDL_LOCATION, new QName("http://fabrikam123.com", "ParticipantService"));
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ParticipantPortType
+     */
+    @WebEndpoint(name = "ParticipantPortType")
+    public ParticipantPortType getParticipantPortType() {
+        return super.getPort(new QName("http://fabrikam123.com", "ParticipantPortType"), ParticipantPortType.class);
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestMessageType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestMessageType.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestMessageType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,32 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.atinterop.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TestMessageType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TestMessageType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "TestMessageType")
-public class TestMessageType {
-
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestMessageType.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestMessageType.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestMessageType.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestMessageType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.atinterop.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for TestMessageType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TestMessageType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "TestMessageType")
+public class TestMessageType {
+
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestURLMessageType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestURLMessageType.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestURLMessageType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,62 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.atinterop.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TestURLMessageType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TestURLMessageType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="URL" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "TestURLMessageType", propOrder = {
-    "url"
-})
-public class TestURLMessageType {
-
-    @XmlElement(name = "URL", required = true)
-    protected String url;
-
-    /**
-     * Gets the value of the url property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURL() {
-        return url;
-    }
-
-    /**
-     * Sets the value of the url property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURL(String value) {
-        this.url = value;
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestURLMessageType.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestURLMessageType.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestURLMessageType.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/TestURLMessageType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.atinterop.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for TestURLMessageType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TestURLMessageType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="URL" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "TestURLMessageType", propOrder = {
+    "url"
+})
+public class TestURLMessageType {
+
+    @XmlElement(name = "URL", required = true)
+    protected String url;
+
+    /**
+     * Gets the value of the url property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getURL() {
+        return url;
+    }
+
+    /**
+     * Sets the value of the url property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setURL(String value) {
+        this.url = value;
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/package-info.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/package-info.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/package-info.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,2 +0,0 @@
- at javax.xml.bind.annotation.XmlSchema(namespace = "http://fabrikam123.com")
-package com.jboss.transaction.txinterop.webservices.atinterop.generated;

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/package-info.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/package-info.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/package-info.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/generated/package-info.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+ at javax.xml.bind.annotation.XmlSchema(namespace = "http://fabrikam123.com")
+package com.jboss.transaction.txinterop.webservices.atinterop.generated;

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,22 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.participant;
-
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.Prepared;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The commit durable 2PC participant
- */
-public class CommitDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Prepared() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.participant;
+
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.Prepared;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The commit durable 2PC participant
+ */
+public class CommitDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Prepared() ;
+    }    
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,37 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.participant;
-
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.Prepared;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The durable 2PC participant which fails the first call to commit.
- */
-public class CommitFailureDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * The drop commit flag.
-     */
-    private boolean dropCommit ;
-    
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Prepared() ;
-    }
-    
-    public void commit()
-        throws WrongStateException, SystemException
-    {
-        if (!dropCommit)
-        {
-            dropCommit = true ;
-            throw new IllegalStateException("Forced failure of commit") ;
-        }
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.participant;
+
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.Prepared;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The durable 2PC participant which fails the first call to commit.
+ */
+public class CommitFailureDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * The drop commit flag.
+     */
+    private boolean dropCommit ;
+    
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Prepared() ;
+    }
+    
+    public void commit()
+        throws WrongStateException, SystemException
+    {
+        if (!dropCommit)
+        {
+            dropCommit = true ;
+            throw new IllegalStateException("Forced failure of commit") ;
+        }
+    }
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureRecoveryDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureRecoveryDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureRecoveryDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,69 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.participant;
-
-import java.util.TimerTask;
-
-import com.arjuna.webservices.util.TransportTimer;
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.Prepared;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-import com.arjuna.wst11.messaging.engines.ParticipantEngine;
-
-/**
- * The durable 2PC participant which fails the first call to commit and recovers.
- */
-public class CommitFailureRecoveryDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * The participant engine.
-     */
-    private ParticipantEngine engine ;
-    /**
-     * The set recovery flag.
-     */
-    private boolean setRecovery ;
-    /**
-     * The recovering flag.
-     */
-    private boolean recovering ;
-    
-    /**
-     * Set the participant engine.
-     * @param engine The participant engine.
-     */
-    public void setEngine(final ParticipantEngine engine)
-    {
-        this.engine = engine ;
-    }
-    
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Prepared() ;
-    }
-    
-    public void commit()
-        throws WrongStateException, SystemException
-    {
-        if (!setRecovery)
-        {
-            setRecovery = true ;
-            final TimerTask timerTask = new TimerTask() {
-                public void run() {
-                    recovering = true ;
-                    engine.recovery() ;
-                }
-            } ;
-            TransportTimer.getTimer().schedule(timerTask, 2000) ;
-        }
-        
-        if (!recovering)
-        {
-            throw new IllegalStateException("Forced failure of commit") ;
-        }
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureRecoveryDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureRecoveryDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureRecoveryDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitFailureRecoveryDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.participant;
+
+import java.util.TimerTask;
+
+import com.arjuna.webservices.util.TransportTimer;
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.Prepared;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+import com.arjuna.wst11.messaging.engines.ParticipantEngine;
+
+/**
+ * The durable 2PC participant which fails the first call to commit and recovers.
+ */
+public class CommitFailureRecoveryDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * The participant engine.
+     */
+    private ParticipantEngine engine ;
+    /**
+     * The set recovery flag.
+     */
+    private boolean setRecovery ;
+    /**
+     * The recovering flag.
+     */
+    private boolean recovering ;
+    
+    /**
+     * Set the participant engine.
+     * @param engine The participant engine.
+     */
+    public void setEngine(final ParticipantEngine engine)
+    {
+        this.engine = engine ;
+    }
+    
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Prepared() ;
+    }
+    
+    public void commit()
+        throws WrongStateException, SystemException
+    {
+        if (!setRecovery)
+        {
+            setRecovery = true ;
+            final TimerTask timerTask = new TimerTask() {
+                public void run() {
+                    recovering = true ;
+                    engine.recovery() ;
+                }
+            } ;
+            TransportTimer.getTimer().schedule(timerTask, 2000) ;
+        }
+        
+        if (!recovering)
+        {
+            throw new IllegalStateException("Forced failure of commit") ;
+        }
+    }
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitVolatile2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitVolatile2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitVolatile2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,22 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.participant;
-
-import com.arjuna.wst.Prepared;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Volatile2PCParticipant;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The commit volatile 2PC participant
- */
-public class CommitVolatile2PCParticipant extends ParticipantAdapter implements Volatile2PCParticipant
-{
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Prepared() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitVolatile2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitVolatile2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitVolatile2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/CommitVolatile2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.participant;
+
+import com.arjuna.wst.Prepared;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Volatile2PCParticipant;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The commit volatile 2PC participant
+ */
+public class CommitVolatile2PCParticipant extends ParticipantAdapter implements Volatile2PCParticipant
+{
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Prepared() ;
+    }    
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ParticipantAdapter.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ParticipantAdapter.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ParticipantAdapter.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,44 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.participant;
-
-import com.arjuna.wst.Participant;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The base participant adapter.
- */
-public abstract class ParticipantAdapter implements Participant
-{
-    /**
-     * Commit the participant.
-     */
-    public void commit()
-        throws WrongStateException, SystemException
-    {
-    }
-
-    /**
-     * Rollback the participant.
-     */
-    public void rollback()
-        throws WrongStateException, SystemException
-    {
-    }
-    
-    /**
-     * Handle an error on the participant.
-     */
-    public void error()
-        throws SystemException
-    {
-    }
-
-    /**
-     * Handle an unknown on the participant.
-     */
-    public void unknown()
-        throws SystemException
-    {
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ParticipantAdapter.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ParticipantAdapter.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ParticipantAdapter.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ParticipantAdapter.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.participant;
+
+import com.arjuna.wst.Participant;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The base participant adapter.
+ */
+public abstract class ParticipantAdapter implements Participant
+{
+    /**
+     * Commit the participant.
+     */
+    public void commit()
+        throws WrongStateException, SystemException
+    {
+    }
+
+    /**
+     * Rollback the participant.
+     */
+    public void rollback()
+        throws WrongStateException, SystemException
+    {
+    }
+    
+    /**
+     * Handle an error on the participant.
+     */
+    public void error()
+        throws SystemException
+    {
+    }
+
+    /**
+     * Handle an unknown on the participant.
+     */
+    public void unknown()
+        throws SystemException
+    {
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ReadonlyDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ReadonlyDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ReadonlyDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,22 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.participant;
-
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.ReadOnly;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The readonly durable 2PC participant
- */
-public class ReadonlyDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * Vote readonly.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new ReadOnly() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ReadonlyDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ReadonlyDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ReadonlyDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/ReadonlyDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.participant;
+
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.ReadOnly;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The readonly durable 2PC participant
+ */
+public class ReadonlyDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * Vote readonly.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new ReadOnly() ;
+    }    
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/RollbackDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/RollbackDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/RollbackDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,22 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.participant;
-
-import com.arjuna.wst.Aborted;
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The rollback durable 2PC participant
- */
-public class RollbackDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * Vote to abort.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Aborted() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/RollbackDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/RollbackDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/RollbackDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/RollbackDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.participant;
+
+import com.arjuna.wst.Aborted;
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The rollback durable 2PC participant
+ */
+public class RollbackDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * Vote to abort.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Aborted() ;
+    }    
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableDurable2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableDurable2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,22 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.participant;
-
-import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst.Prepared;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-
-/**
- * The VolatileAndDurable durable 2PC participant
- */
-public class VolatileAndDurableDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
-{
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        return new Prepared() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableDurable2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableDurable2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableDurable2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableDurable2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.participant;
+
+import com.arjuna.wst.Durable2PCParticipant;
+import com.arjuna.wst.Prepared;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+
+/**
+ * The VolatileAndDurable durable 2PC participant
+ */
+public class VolatileAndDurableDurable2PCParticipant extends ParticipantAdapter implements Durable2PCParticipant
+{
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        return new Prepared() ;
+    }    
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableVolatile2PCParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableVolatile2PCParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableVolatile2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,47 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.participant;
-
-import com.arjuna.ats.arjuna.common.Uid;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wst.ReadOnly;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.Volatile2PCParticipant;
-import com.arjuna.wst.Vote;
-import com.arjuna.wst.WrongStateException;
-import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropUtil;
-
-/**
- * The VolatileAndDurable volatile 2PC participant
- */
-public class VolatileAndDurableVolatile2PCParticipant extends ParticipantAdapter implements Volatile2PCParticipant
-{
-    /**
-     * The current coordination context.
-     */
-    private final CoordinationContextType coordinationContext ;
-    
-    /**
-     * Construct the participant.
-     * @param coordinationContext The coordination context.
-     */
-    public VolatileAndDurableVolatile2PCParticipant(final CoordinationContextType coordinationContext)
-    {
-        this.coordinationContext = coordinationContext ;
-    }
-    
-    /**
-     * Vote to prepare.
-     */
-    public Vote prepare()
-        throws WrongStateException, SystemException
-    {
-        try
-        {
-            ATInteropUtil.registerDurable2PC(coordinationContext, new VolatileAndDurableDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SystemException(th.getMessage()) ;
-        }
-        return new ReadOnly() ;
-    }    
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableVolatile2PCParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableVolatile2PCParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableVolatile2PCParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/participant/VolatileAndDurableVolatile2PCParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.participant;
+
+import com.arjuna.ats.arjuna.common.Uid;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wst.ReadOnly;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.Volatile2PCParticipant;
+import com.arjuna.wst.Vote;
+import com.arjuna.wst.WrongStateException;
+import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropUtil;
+
+/**
+ * The VolatileAndDurable volatile 2PC participant
+ */
+public class VolatileAndDurableVolatile2PCParticipant extends ParticipantAdapter implements Volatile2PCParticipant
+{
+    /**
+     * The current coordination context.
+     */
+    private final CoordinationContextType coordinationContext ;
+    
+    /**
+     * Construct the participant.
+     * @param coordinationContext The coordination context.
+     */
+    public VolatileAndDurableVolatile2PCParticipant(final CoordinationContextType coordinationContext)
+    {
+        this.coordinationContext = coordinationContext ;
+    }
+    
+    /**
+     * Vote to prepare.
+     */
+    public Vote prepare()
+        throws WrongStateException, SystemException
+    {
+        try
+        {
+            ATInteropUtil.registerDurable2PC(coordinationContext, new VolatileAndDurableDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SystemException(th.getMessage()) ;
+        }
+        return new ReadOnly() ;
+    }    
+}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag.  All rights reserved. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.txinterop.webservices.atinterop.processors;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.base.processors.Callback;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The callback for the initiator client.
- * @author kevin
- */
-public abstract class ATInitiatorCallback extends Callback
-{
-    /**
-     * A response.
-     * @param addressingProperties The current addressing context.
-     */
-    public abstract void response(final AddressingProperties addressingProperties) ;
-
-    /**
-     * A SOAP fault response.
-     * @param soapFault The SOAP fault response.
-     * @param addressingProperties The current addressing context.
-     */
-    public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties) ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag.  All rights reserved. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.processors;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.base.processors.Callback;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The callback for the initiator client.
+ * @author kevin
+ */
+public abstract class ATInitiatorCallback extends Callback
+{
+    /**
+     * A response.
+     * @param addressingProperties The current addressing context.
+     */
+    public abstract void response(final AddressingProperties addressingProperties) ;
+
+    /**
+     * A SOAP fault response.
+     * @param soapFault The SOAP fault response.
+     * @param addressingProperties The current addressing context.
+     */
+    public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties) ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag.  All rights reserved. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.txinterop.webservices.atinterop.processors;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.base.processors.Callback;
-import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The Initiator processor.
- * @author kevin
- */
-public class ATInitiatorProcessor extends BaseWSAddrResponseProcessor
-{
-    /**
-     * The initiator singleton.
-     */
-    private static final ATInitiatorProcessor INITIATOR = new ATInitiatorProcessor() ;
-    
-    /**
-     * Get the initiator singleton.
-     * @return The singleton.
-     */
-    public static ATInitiatorProcessor getInitiator()
-    {
-        return INITIATOR ;
-    }
-
-    /**
-     * Handle a response response.
-     * @param addressingProperties The current addressing context.
-     */
-    public void handleResponse(final AddressingProperties addressingProperties)
-    {
-        handleCallbacks(new CallbackExecutorAdapter() {
-            public void execute(final Callback callback) {
-                ((ATInitiatorCallback)callback).response(addressingProperties) ;
-            }
-        }, getIDs(addressingProperties)) ;
-    }
-
-    /**
-     * Register a SOAP fault response.
-     * @param soapFault The SOAP fault response.
-     * @param addressingProperties The current addressing context.
-     */
-    public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
-    {
-        handleCallbacks(new CallbackExecutorAdapter() {
-            public void execute(final Callback callback) {
-                ((ATInitiatorCallback)callback).soapFault(soapFault, addressingProperties) ;
-            }
-        }, getIDs(addressingProperties)) ;
-    }
-
-    /**
-     * Register a callback for the specific message id.
-     * @param messageID The message ID.
-     * @param callback The callback for the response.
-     */
-    public void registerCallback(final String messageID, final ATInitiatorCallback callback)
-    {
-        register(messageID, callback) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag.  All rights reserved. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.processors;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.base.processors.Callback;
+import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The Initiator processor.
+ * @author kevin
+ */
+public class ATInitiatorProcessor extends BaseWSAddrResponseProcessor
+{
+    /**
+     * The initiator singleton.
+     */
+    private static final ATInitiatorProcessor INITIATOR = new ATInitiatorProcessor() ;
+    
+    /**
+     * Get the initiator singleton.
+     * @return The singleton.
+     */
+    public static ATInitiatorProcessor getInitiator()
+    {
+        return INITIATOR ;
+    }
+
+    /**
+     * Handle a response response.
+     * @param addressingProperties The current addressing context.
+     */
+    public void handleResponse(final AddressingProperties addressingProperties)
+    {
+        handleCallbacks(new CallbackExecutorAdapter() {
+            public void execute(final Callback callback) {
+                ((ATInitiatorCallback)callback).response(addressingProperties) ;
+            }
+        }, getIDs(addressingProperties)) ;
+    }
+
+    /**
+     * Register a SOAP fault response.
+     * @param soapFault The SOAP fault response.
+     * @param addressingProperties The current addressing context.
+     */
+    public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+    {
+        handleCallbacks(new CallbackExecutorAdapter() {
+            public void execute(final Callback callback) {
+                ((ATInitiatorCallback)callback).soapFault(soapFault, addressingProperties) ;
+            }
+        }, getIDs(addressingProperties)) ;
+    }
+
+    /**
+     * Register a callback for the specific message id.
+     * @param messageID The message ID.
+     * @param callback The callback for the response.
+     */
+    public void registerCallback(final String messageID, final ATInitiatorCallback callback)
+    {
+        register(messageID, callback) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,359 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag.  All rights reserved. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.txinterop.webservices.atinterop.processors;
-
-import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wst.CompletionCoordinatorParticipant;
-import com.arjuna.wst11.messaging.engines.ParticipantEngine;
-import com.arjuna.webservices11.SoapFault11;
-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;
-import com.jboss.transaction.txinterop.webservices.atinterop.participant.CommitFailureRecoveryDurable2PCParticipant;
-import com.jboss.transaction.txinterop.webservices.atinterop.participant.CommitVolatile2PCParticipant;
-import com.jboss.transaction.txinterop.webservices.atinterop.participant.ReadonlyDurable2PCParticipant;
-import com.jboss.transaction.txinterop.webservices.atinterop.participant.RollbackDurable2PCParticipant;
-import com.jboss.transaction.txinterop.webservices.atinterop.participant.VolatileAndDurableVolatile2PCParticipant;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The Participant processor.
- * @author kevin
- */
-public class ATParticipantProcessor
-{
-    /**
-     * The participant.
-     */
-    private static ATParticipantProcessor PARTICIPANT = new ATParticipantProcessor() ;
-    
-    /**
-     * Get the participant.
-     * @return The participant.
-     */
-    public static ATParticipantProcessor getParticipant()
-    {
-        return PARTICIPANT ;
-    }
-    
-    /**
-     * Execute the CompletionCommit
-     * @param coordinatorURI The address of the coordinator to employ
-     * @param addressingProperties The current addressing context.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void completionCommit(final String coordinatorURI, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(coordinatorURI) ;
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.commit() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the CompletionRollback
-     * @param coordinatorURI The address of the coordinator to employ.
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void completionRollback(final String coordinatorURI, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(coordinatorURI) ;
-            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
-            participant.rollback() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Commit
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void commit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Rollback
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            ATInteropUtil.registerDurable2PC(coordinationContext, new RollbackDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Phase2Rollback
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void phase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            ATInteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
-            ATInteropUtil.registerDurable2PC(coordinationContext, new RollbackDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Readonly
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void readonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            ATInteropUtil.registerDurable2PC(coordinationContext, new ReadonlyDurable2PCParticipant(), new Uid().toString()) ;
-            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the VolatileAndDurable
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void volatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            ATInteropUtil.registerVolatile2PC(coordinationContext, new VolatileAndDurableVolatile2PCParticipant(coordinationContext), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the EarlyReadonly
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void earlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final ParticipantEngine engine = ATInteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
-            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-            engine.earlyReadonly() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the EarlyAborted
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void earlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final ParticipantEngine engine = ATInteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
-            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-            engine.earlyRollback() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the ReplayCommit
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void replayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CommitFailureRecoveryDurable2PCParticipant participant = new CommitFailureRecoveryDurable2PCParticipant() ;
-            final ParticipantEngine engine = ATInteropUtil.registerDurable2PC(coordinationContext, participant, new Uid().toString()) ;
-            participant.setEngine(engine) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the RetryPreparedCommit
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void retryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the RetryPreparedAbort
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void retryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the RetryCommit
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void retryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitFailureDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the PreparedAfterTimeout
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void preparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            ATInteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
-            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the LostCommitted
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void lostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitFailureDurable2PCParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,359 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag.  All rights reserved. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.processors;
+
+import com.arjuna.ats.arjuna.common.Uid;
+import com.arjuna.webservices.SoapFault;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wst.CompletionCoordinatorParticipant;
+import com.arjuna.wst11.messaging.engines.ParticipantEngine;
+import com.arjuna.webservices11.SoapFault11;
+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;
+import com.jboss.transaction.txinterop.webservices.atinterop.participant.CommitFailureRecoveryDurable2PCParticipant;
+import com.jboss.transaction.txinterop.webservices.atinterop.participant.CommitVolatile2PCParticipant;
+import com.jboss.transaction.txinterop.webservices.atinterop.participant.ReadonlyDurable2PCParticipant;
+import com.jboss.transaction.txinterop.webservices.atinterop.participant.RollbackDurable2PCParticipant;
+import com.jboss.transaction.txinterop.webservices.atinterop.participant.VolatileAndDurableVolatile2PCParticipant;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The Participant processor.
+ * @author kevin
+ */
+public class ATParticipantProcessor
+{
+    /**
+     * The participant.
+     */
+    private static ATParticipantProcessor PARTICIPANT = new ATParticipantProcessor() ;
+    
+    /**
+     * Get the participant.
+     * @return The participant.
+     */
+    public static ATParticipantProcessor getParticipant()
+    {
+        return PARTICIPANT ;
+    }
+    
+    /**
+     * Execute the CompletionCommit
+     * @param coordinatorURI The address of the coordinator to employ
+     * @param addressingProperties The current addressing context.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void completionCommit(final String coordinatorURI, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(coordinatorURI) ;
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.commit() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the CompletionRollback
+     * @param coordinatorURI The address of the coordinator to employ.
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void completionRollback(final String coordinatorURI, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CoordinationContextType context = ATInteropUtil.createCoordinationContext(coordinatorURI) ;
+            final CompletionCoordinatorParticipant participant = ATInteropUtil.registerCompletion(context, context.getIdentifier().getValue()) ;
+            participant.rollback() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Commit
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void commit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Rollback
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            ATInteropUtil.registerDurable2PC(coordinationContext, new RollbackDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Phase2Rollback
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void phase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            ATInteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
+            ATInteropUtil.registerDurable2PC(coordinationContext, new RollbackDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Readonly
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void readonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            ATInteropUtil.registerDurable2PC(coordinationContext, new ReadonlyDurable2PCParticipant(), new Uid().toString()) ;
+            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the VolatileAndDurable
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void volatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            ATInteropUtil.registerVolatile2PC(coordinationContext, new VolatileAndDurableVolatile2PCParticipant(coordinationContext), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the EarlyReadonly
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void earlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final ParticipantEngine engine = ATInteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
+            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+            engine.earlyReadonly() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the EarlyAborted
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void earlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final ParticipantEngine engine = ATInteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
+            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+            engine.earlyRollback() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the ReplayCommit
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void replayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CommitFailureRecoveryDurable2PCParticipant participant = new CommitFailureRecoveryDurable2PCParticipant() ;
+            final ParticipantEngine engine = ATInteropUtil.registerDurable2PC(coordinationContext, participant, new Uid().toString()) ;
+            participant.setEngine(engine) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the RetryPreparedCommit
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void retryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the RetryPreparedAbort
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void retryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the RetryCommit
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void retryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitFailureDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the PreparedAfterTimeout
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void preparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            ATInteropUtil.registerVolatile2PC(coordinationContext, new CommitVolatile2PCParticipant(), new Uid().toString()) ;
+            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the LostCommitted
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void lostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            ATInteropUtil.registerDurable2PC(coordinationContext, new CommitFailureDurable2PCParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,80 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.sei;
-
-import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.SoapFaultType;
-import com.arjuna.webservices11.SoapFault11;
-
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
-import javax.xml.ws.handler.MessageContext;
-import javax.annotation.Resource;
-
-/**
- * Implementor class for OASIS WS-Interop 1.1 Initiator Service
- */
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.WebParam;
-import javax.jws.*;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-import org.jboss.jbossts.xts.soapfault.Fault;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-
-/**
- * Implementation class for WSTX 1.1 AT Interop Test Initiator service
- */
- at WebService(name = "InitiatorPortType",
-        targetNamespace = "http://fabrikam123.com",
-        portName = "InitiatorPortType",
-        wsdlLocation="/WEB-INF/wsdl/interopat-initiator-binding.wsdl",
-        serviceName="InitiatorService")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="initiatorhandlers.xml")
-public class InitiatorPortTypeImpl {
-
-    /**
-     * injected resource providing access to WSA addressing properties
-     */
-    @Resource
-    private WebServiceContext webServiceCtx;
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Response", action = "http://fabrikam123.com/Response")
-    @Oneway
-    @RequestWrapper(localName = "Response", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void response()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-
-        ATInitiatorProcessor.getInitiator().handleResponse(inboundAddressProperties) ;
-    }
-
-    @WebMethod(operationName = "SoapFault", action = "http://fabrikam123.com/SoapFault")
-    @Oneway
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public void soapFault(
-            @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
-            Fault fault)
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-
-        SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
-        ATInitiatorProcessor.getInitiator().handleSoapFault(soapFaultInternal, inboundAddressProperties) ;
-    }
-
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.sei;
+
+import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.SoapFaultType;
+import com.arjuna.webservices11.SoapFault11;
+
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.handler.MessageContext;
+import javax.annotation.Resource;
+
+/**
+ * Implementor class for OASIS WS-Interop 1.1 Initiator Service
+ */
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.WebParam;
+import javax.jws.*;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+import org.jboss.jbossts.xts.soapfault.Fault;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+
+/**
+ * Implementation class for WSTX 1.1 AT Interop Test Initiator service
+ */
+ at WebService(name = "InitiatorPortType",
+        targetNamespace = "http://fabrikam123.com",
+        portName = "InitiatorPortType",
+        wsdlLocation="/WEB-INF/wsdl/interopat-initiator-binding.wsdl",
+        serviceName="InitiatorService")
+// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
+ at HandlerChain(file="initiatorhandlers.xml")
+public class InitiatorPortTypeImpl {
+
+    /**
+     * injected resource providing access to WSA addressing properties
+     */
+    @Resource
+    private WebServiceContext webServiceCtx;
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Response", action = "http://fabrikam123.com/Response")
+    @Oneway
+    @RequestWrapper(localName = "Response", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void response()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+
+        ATInitiatorProcessor.getInitiator().handleResponse(inboundAddressProperties) ;
+    }
+
+    @WebMethod(operationName = "SoapFault", action = "http://fabrikam123.com/SoapFault")
+    @Oneway
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void soapFault(
+            @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
+            Fault fault)
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+
+        SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
+        ATInitiatorProcessor.getInitiator().handleSoapFault(soapFaultInternal, inboundAddressProperties) ;
+    }
+
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,383 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.sei;
-
-import com.jboss.transaction.txinterop.webservices.atinterop.generated.ObjectFactory;
-import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATParticipantProcessor;
-import com.jboss.transaction.txinterop.webservices.atinterop.client.InitiatorClient;
-import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.wsc11.messaging.MessageId;
-
-import javax.jws.*;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.ProtocolException;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
-import javax.xml.ws.handler.MessageContext;
-import javax.annotation.Resource;
-
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContext;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-
-import java.net.URI;
-
-
-/**
- * Implementation class for WSTX 1.1 AT Interop Test Initiator service
- */
- at WebService(name = "ParticipantPortType",
-        targetNamespace = "http://fabrikam123.com",
-        portName="ParticipantPortType",
-        wsdlLocation="/WEB-INF/wsdl/interopat-participant-binding.wsdl",
-        serviceName="ParticipantService")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="participanthandlers.xml")
-public class ParticipantPortTypeImpl {
-
-    /**
-     * injected resource providing access to WSA addressing properties
-     */
-    @Resource
-    private WebServiceContext webServiceCtx;
-
-    /**
-     *
-     * @param parameters
-     */
-    @WebMethod(operationName = "CompletionCommit", action = "http://fabrikam123.com/CompletionCommit")
-    @Oneway
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public void completionCommit(
-            @WebParam(name = "CompletionCommit", targetNamespace = "http://fabrikam123.com", partName = "parameters")
-            String parameters)
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        try {
-            ATParticipantProcessor.getParticipant().completionCommit(parameters, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     * @param parameters
-     */
-    @WebMethod(operationName = "CompletionRollback", action = "http://fabrikam123.com/CompletionRollback")
-    @Oneway
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public void completionRollback(
-        @WebParam(name = "CompletionRollback", targetNamespace = "http://fabrikam123.com", partName = "parameters")
-        String parameters)
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        try {
-            ATParticipantProcessor.getParticipant().completionRollback(parameters, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Commit", action = "http://fabrikam123.com/Commit")
-    @Oneway
-    @RequestWrapper(localName = "Commit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void commit()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().commit(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Rollback", action = "http://fabrikam123.com/Rollback")
-    @Oneway
-    @RequestWrapper(localName = "Rollback", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void rollback()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().rollback(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Phase2Rollback", action = "http://fabrikam123.com/Phase2Rollback")
-    @Oneway
-    @RequestWrapper(localName = "Phase2Rollback", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void phase2Rollback()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().phase2Rollback(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Readonly", action = "http://fabrikam123.com/Readonly")
-    @Oneway
-    @RequestWrapper(localName = "Readonly", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void readonly()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().readonly(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "VolatileAndDurable", action = "http://fabrikam123.com/VolatileAndDurable")
-    @Oneway
-    @RequestWrapper(localName = "VolatileAndDurable", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void volatileAndDurable()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().volatileAndDurable(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "EarlyReadonly", action = "http://fabrikam123.com/EarlyReadonly")
-    @Oneway
-    @RequestWrapper(localName = "EarlyReadonly", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void earlyReadonly()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().earlyReadonly(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "EarlyAborted", action = "http://fabrikam123.com/EarlyAborted")
-    @Oneway
-    @RequestWrapper(localName = "EarlyAborted", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void earlyAborted()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().earlyAborted(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "ReplayCommit", action = "http://fabrikam123.com/ReplayCommit")
-    @Oneway
-    @RequestWrapper(localName = "ReplayCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void replayCommit()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().replayCommit(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "RetryPreparedCommit", action = "http://fabrikam123.com/RetryPreparedCommit")
-    @Oneway
-    @RequestWrapper(localName = "RetryPreparedCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void retryPreparedCommit()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().retryPreparedCommit(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "RetryPreparedAbort", action = "http://fabrikam123.com/RetryPreparedAbort")
-    @Oneway
-    @RequestWrapper(localName = "RetryPreparedAbort", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void retryPreparedAbort()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().retryPreparedAbort(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "RetryCommit", action = "http://fabrikam123.com/RetryCommit")
-    @Oneway
-    @RequestWrapper(localName = "RetryCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void retryCommit()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().retryCommit(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "PreparedAfterTimeout", action = "http://fabrikam123.com/PreparedAfterTimeout")
-    @Oneway
-    @RequestWrapper(localName = "PreparedAfterTimeout", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void preparedAfterTimeout()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().preparedAfterTimeout(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "LostCommitted", action = "http://fabrikam123.com/LostCommitted")
-    @Oneway
-    @RequestWrapper(localName = "LostCommitted", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
-    public void lostCommitted()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            ATParticipantProcessor.getParticipant().lostCommitted(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     * send an acknowledgement notifying a successfuly processed request
-     *
-     * @param inboundAddressProperties identifes who to reply to and what message id the response should relate to
-     */
-    private void sendResponse(AddressingProperties inboundAddressProperties)
-    {
-        AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
-
-        try {
-            InitiatorClient.getClient().sendResponse(outboundAddressProperties);
-        } catch (Throwable th) {
-            URI uri = outboundAddressProperties.getTo().getURI();
-            System.out.println("com.jboss.transaction.txinterop.webservices.atinterop.sei.ParticipantPortTypeImpl_1: unable to send response to " + uri);
-            throw new ProtocolException(th);
-        }
-    }
-
-    /**
-     * send a soap fault notifying an unsuccessfuly processed request
-     *
-     * @param inboundAddressProperties identifes who to reply to and what message id the fault message should relate to
-     */
-    private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
-    {
-        try {
-            InitiatorClient.getClient().sendSoapFault(inboundAddressProperties, sf);
-        } catch (Throwable th) {
-            System.out.println("com.jboss.transaction.txinterop.webservices.atinterop.sei.ParticipantPortTypeImpl_2: unable to log soap fault " + sf);
-            throw new ProtocolException(th);
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,403 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.sei;
+
+import com.jboss.transaction.txinterop.webservices.atinterop.generated.ObjectFactory;
+import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATParticipantProcessor;
+import com.jboss.transaction.txinterop.webservices.atinterop.client.InitiatorClient;
+import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.wsc11.messaging.MessageId;
+
+import javax.jws.*;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.ProtocolException;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.handler.MessageContext;
+import javax.annotation.Resource;
+
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContext;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+
+import java.net.URI;
+
+
+/**
+ * Implementation class for WSTX 1.1 AT Interop Test Initiator service
+ */
+ at WebService(name = "ParticipantPortType",
+        targetNamespace = "http://fabrikam123.com",
+        portName="ParticipantPortType",
+        wsdlLocation="/WEB-INF/wsdl/interopat-participant-binding.wsdl",
+        serviceName="ParticipantService")
+// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
+ at HandlerChain(file="participanthandlers.xml")
+public class ParticipantPortTypeImpl {
+
+    /**
+     * injected resource providing access to WSA addressing properties
+     */
+    @Resource
+    private WebServiceContext webServiceCtx;
+
+    /**
+     *
+     * @param parameters
+     */
+    @WebMethod(operationName = "CompletionCommit", action = "http://fabrikam123.com/CompletionCommit")
+    @Oneway
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void completionCommit(
+            @WebParam(name = "CompletionCommit", targetNamespace = "http://fabrikam123.com", partName = "parameters")
+            String parameters)
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        try {
+            ATParticipantProcessor.getParticipant().completionCommit(parameters, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     * @param parameters
+     */
+    @WebMethod(operationName = "CompletionRollback", action = "http://fabrikam123.com/CompletionRollback")
+    @Oneway
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void completionRollback(
+        @WebParam(name = "CompletionRollback", targetNamespace = "http://fabrikam123.com", partName = "parameters")
+        String parameters)
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        try {
+            ATParticipantProcessor.getParticipant().completionRollback(parameters, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Commit", action = "http://fabrikam123.com/Commit")
+    @Oneway
+    @RequestWrapper(localName = "Commit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void commit()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().commit(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Rollback", action = "http://fabrikam123.com/Rollback")
+    @Oneway
+    @RequestWrapper(localName = "Rollback", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void rollback()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().rollback(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Phase2Rollback", action = "http://fabrikam123.com/Phase2Rollback")
+    @Oneway
+    @RequestWrapper(localName = "Phase2Rollback", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void phase2Rollback()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().phase2Rollback(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Readonly", action = "http://fabrikam123.com/Readonly")
+    @Oneway
+    @RequestWrapper(localName = "Readonly", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void readonly()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().readonly(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "VolatileAndDurable", action = "http://fabrikam123.com/VolatileAndDurable")
+    @Oneway
+    @RequestWrapper(localName = "VolatileAndDurable", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void volatileAndDurable()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().volatileAndDurable(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "EarlyReadonly", action = "http://fabrikam123.com/EarlyReadonly")
+    @Oneway
+    @RequestWrapper(localName = "EarlyReadonly", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void earlyReadonly()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().earlyReadonly(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "EarlyAborted", action = "http://fabrikam123.com/EarlyAborted")
+    @Oneway
+    @RequestWrapper(localName = "EarlyAborted", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void earlyAborted()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().earlyAborted(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "ReplayCommit", action = "http://fabrikam123.com/ReplayCommit")
+    @Oneway
+    @RequestWrapper(localName = "ReplayCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void replayCommit()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().replayCommit(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "RetryPreparedCommit", action = "http://fabrikam123.com/RetryPreparedCommit")
+    @Oneway
+    @RequestWrapper(localName = "RetryPreparedCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void retryPreparedCommit()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().retryPreparedCommit(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "RetryPreparedAbort", action = "http://fabrikam123.com/RetryPreparedAbort")
+    @Oneway
+    @RequestWrapper(localName = "RetryPreparedAbort", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void retryPreparedAbort()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().retryPreparedAbort(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "RetryCommit", action = "http://fabrikam123.com/RetryCommit")
+    @Oneway
+    @RequestWrapper(localName = "RetryCommit", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void retryCommit()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().retryCommit(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "PreparedAfterTimeout", action = "http://fabrikam123.com/PreparedAfterTimeout")
+    @Oneway
+    @RequestWrapper(localName = "PreparedAfterTimeout", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void preparedAfterTimeout()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().preparedAfterTimeout(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "LostCommitted", action = "http://fabrikam123.com/LostCommitted")
+    @Oneway
+    @RequestWrapper(localName = "LostCommitted", targetNamespace = "http://fabrikam123.com", className = "com.jboss.transaction.txinterop.webservices.atinterop.generated.TestMessageType")
+    public void lostCommitted()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            ATParticipantProcessor.getParticipant().lostCommitted(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     * send an acknowledgement notifying a successfuly processed request
+     *
+     * @param inboundAddressProperties identifes who to reply to and what message id the response should relate to
+     */
+    private void sendResponse(AddressingProperties inboundAddressProperties)
+    {
+        AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
+
+        try {
+            InitiatorClient.getClient().sendResponse(outboundAddressProperties);
+        } catch (Throwable th) {
+            URI uri = outboundAddressProperties.getTo().getURI();
+            System.out.println("com.jboss.transaction.txinterop.webservices.atinterop.sei.ParticipantPortTypeImpl_1: unable to send response to " + uri);
+            throw new ProtocolException(th);
+        }
+    }
+
+    /**
+     * send a soap fault notifying an unsuccessfuly processed request
+     *
+     * @param inboundAddressProperties identifes who to reply to and what message id the fault message should relate to
+     */
+    private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
+    {
+        try {
+            InitiatorClient.getClient().sendSoapFault(inboundAddressProperties, sf);
+        } catch (Throwable th) {
+            System.out.println("com.jboss.transaction.txinterop.webservices.atinterop.sei.ParticipantPortTypeImpl_2: unable to log soap fault " + sf);
+            throw new ProtocolException(th);
+        }
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATInitiatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATInitiatorInitialisation.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATInitiatorInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,39 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.server;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContext;
-
-import com.arjuna.webservices11.ServiceRegistry;
-import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
-
-/**
- * Initialise the interop initiator service.
- * @author kevin
- */
-public class ATInitiatorInitialisation implements ServletContextListener
-{
-    /**
-     * The context has been initialized.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextInitialized(final ServletContextEvent servletContextEvent)
-    {
-        ServletContext context = servletContextEvent.getServletContext();
-        String baseURI = context.getInitParameter("BaseURI");
-        final String uri = baseURI + "/ATInitiatorService";
-
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.registerServiceProvider(ATInteropConstants.SERVICE_INITIATOR, uri) ;
-    }
-
-    /**
-     * The context is about to be destroyed.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextDestroyed(final ServletContextEvent servletContextEvent)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.removeServiceProvider(ATInteropConstants.SERVICE_INITIATOR) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATInitiatorInitialisation.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATInitiatorInitialisation.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATInitiatorInitialisation.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATInitiatorInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.server;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContext;
+
+import com.arjuna.webservices11.ServiceRegistry;
+import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
+
+/**
+ * Initialise the interop initiator service.
+ * @author kevin
+ */
+public class ATInitiatorInitialisation implements ServletContextListener
+{
+    /**
+     * The context has been initialized.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextInitialized(final ServletContextEvent servletContextEvent)
+    {
+        ServletContext context = servletContextEvent.getServletContext();
+        String baseURI = context.getInitParameter("BaseURI");
+        final String uri = baseURI + "/ATInitiatorService";
+
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.registerServiceProvider(ATInteropConstants.SERVICE_INITIATOR, uri) ;
+    }
+
+    /**
+     * The context is about to be destroyed.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextDestroyed(final ServletContextEvent servletContextEvent)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.removeServiceProvider(ATInteropConstants.SERVICE_INITIATOR) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATParticipantInitialisation.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATParticipantInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,39 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.atinterop.server;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContext;
-
-import com.arjuna.webservices11.ServiceRegistry;
-import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
-
-/**
- * Initialise the interop initiator service.
- * @author kevin
- */
-public class ATParticipantInitialisation implements ServletContextListener
-{
-    /**
-     * The context has been initialized.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextInitialized(final ServletContextEvent servletContextEvent)
-    {
-        ServletContext context = servletContextEvent.getServletContext();
-        String baseURI = context.getInitParameter("BaseURI");
-        final String uri = baseURI + "/ATParticipantService";
-
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.registerServiceProvider(ATInteropConstants.SERVICE_PARTICIPANT, uri) ;
-    }
-
-    /**
-     * The context is about to be destroyed.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextDestroyed(final ServletContextEvent servletContextEvent)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.removeServiceProvider(ATInteropConstants.SERVICE_PARTICIPANT) ;
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATParticipantInitialisation.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATParticipantInitialisation.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATParticipantInitialisation.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/server/ATParticipantInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.atinterop.server;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContext;
+
+import com.arjuna.webservices11.ServiceRegistry;
+import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
+
+/**
+ * Initialise the interop initiator service.
+ * @author kevin
+ */
+public class ATParticipantInitialisation implements ServletContextListener
+{
+    /**
+     * The context has been initialized.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextInitialized(final ServletContextEvent servletContextEvent)
+    {
+        ServletContext context = servletContextEvent.getServletContext();
+        String baseURI = context.getInitParameter("BaseURI");
+        final String uri = baseURI + "/ATParticipantService";
+
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.registerServiceProvider(ATInteropConstants.SERVICE_PARTICIPANT, uri) ;
+    }
+
+    /**
+     * The context is about to be destroyed.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextDestroyed(final ServletContextEvent servletContextEvent)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.removeServiceProvider(ATInteropConstants.SERVICE_PARTICIPANT) ;
+    }
+}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,457 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop;
-
-import java.io.IOException;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.SoapFaultType;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-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;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The participant stub.
- */
-public class AsyncParticipantStub implements ParticipantStub
-{
-    /***
-     * The participant stub singletong.
-     */
-    private static final ParticipantStub PARTICIPANT_STUB = new AsyncParticipantStub() ;
-    
-    /**
-     * Get the participant stub singleton.
-     * @return The participant stub singleton.
-     */
-    public static ParticipantStub getParticipantStub()
-    {
-        return PARTICIPANT_STUB ;
-    }
-    
-    /**
-     * Send a cancel request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void cancel(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCancel(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a exit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void exit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendExit(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a fail request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void fail(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendFail(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a cannotComplete request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void cannotComplete(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCannotComplete(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a participantCompleteClose request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void participantCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendParticipantCompleteClose(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a coordinatorCompleteClose request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void coordinatorCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCoordinatorCompleteClose(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a unsolicitedComplete request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void unsolicitedComplete(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendUnsolicitedComplete(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a compensate request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void compensate(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCompensate(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a compensationFail request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void compensationFail(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendCompensationFail(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a participantCancelCompletedRace request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void participantCancelCompletedRace(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendParticipantCancelCompletedRace(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a messageLossAndRecovery request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void messageLossAndRecovery(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendMessageLossAndRecovery(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-    
-    /**
-     * Send a mixedOutcome request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void mixedOutcome(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        final RequestCallback callback = new RequestCallback() ;
-        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
-        initiator.registerCallback(messageId, callback) ;
-        try
-        {
-            AsyncParticipantClient.getClient().sendMixedOutcome(coordinationContext, addressingProperties) ;
-            callback.waitUntilTriggered(15000) ;
-        }
-        finally
-        {
-            initiator.removeCallback(messageId) ;
-        }
-        
-        handleCallback(callback) ;
-    }
-
-    /**
-     * Handle the callback.
-     * @param callback The callback.
-     * @throws SoapFault for errors.
-     */
-    private static void handleCallback(final RequestCallback callback)
-        throws SoapFault
-    {
-        if (callback.hasFailed())
-        {
-            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback execution failed") ;
-        }
-        else if (!callback.hasTriggered())
-        {
-            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback wasn't triggered") ;
-        }
-        else if (!callback.isResponse())
-        {
-            throw callback.getSoapFault() ;
-        }
-    }
-    
-    /**
-     * The request callback class.
-     */
-    private static final class RequestCallback extends BAInitiatorCallback
-    {
-        /**
-         * The response flag.
-         */
-        private boolean response ;
-        /**
-         * The SOAP fault response.
-         */
-        private SoapFault soapFault ;
-        
-        /**
-         * A response.
-         * @param addressingProperties The current addressing context.
-         */
-        public void response(final AddressingProperties addressingProperties)
-        {
-            this.response = true ;
-        }
-
-        /**
-         * A SOAP fault response.
-         * @param soapFault The SOAP fault response.
-         * @param addressingProperties The current addressing context.
-         */
-        public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
-        {
-            this.soapFault = soapFault ;
-        }
-        
-        /**
-         * Was a response received?
-         * @return true if a response was received, false otherwise.
-         */
-        boolean isResponse()
-        {
-            return response ;
-        }
-        
-        /**
-         * Get the SOAP fault.
-         * @return The SOAP fault or null.
-         */
-        SoapFault getSoapFault()
-        {
-            return soapFault ;
-        }
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,477 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop;
+
+import java.io.IOException;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.SoapFaultType;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+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;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The participant stub.
+ */
+public class AsyncParticipantStub implements ParticipantStub
+{
+    /***
+     * The participant stub singletong.
+     */
+    private static final ParticipantStub PARTICIPANT_STUB = new AsyncParticipantStub() ;
+    
+    /**
+     * Get the participant stub singleton.
+     * @return The participant stub singleton.
+     */
+    public static ParticipantStub getParticipantStub()
+    {
+        return PARTICIPANT_STUB ;
+    }
+    
+    /**
+     * Send a cancel request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void cancel(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCancel(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a exit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void exit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendExit(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a fail request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void fail(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendFail(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a cannotComplete request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void cannotComplete(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCannotComplete(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a participantCompleteClose request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void participantCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendParticipantCompleteClose(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a coordinatorCompleteClose request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void coordinatorCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCoordinatorCompleteClose(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a unsolicitedComplete request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void unsolicitedComplete(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendUnsolicitedComplete(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a compensate request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void compensate(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCompensate(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a compensationFail request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void compensationFail(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendCompensationFail(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a participantCancelCompletedRace request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void participantCancelCompletedRace(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendParticipantCancelCompletedRace(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a messageLossAndRecovery request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void messageLossAndRecovery(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendMessageLossAndRecovery(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+    
+    /**
+     * Send a mixedOutcome request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void mixedOutcome(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        final RequestCallback callback = new RequestCallback() ;
+        final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
+        initiator.registerCallback(messageId, callback) ;
+        try
+        {
+            AsyncParticipantClient.getClient().sendMixedOutcome(coordinationContext, addressingProperties) ;
+            callback.waitUntilTriggered(15000) ;
+        }
+        finally
+        {
+            initiator.removeCallback(messageId) ;
+        }
+        
+        handleCallback(callback) ;
+    }
+
+    /**
+     * Handle the callback.
+     * @param callback The callback.
+     * @throws SoapFault for errors.
+     */
+    private static void handleCallback(final RequestCallback callback)
+        throws SoapFault
+    {
+        if (callback.hasFailed())
+        {
+            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback execution failed") ;
+        }
+        else if (!callback.hasTriggered())
+        {
+            throw new SoapFault11(SoapFaultType.FAULT_RECEIVER, null, "Callback wasn't triggered") ;
+        }
+        else if (!callback.isResponse())
+        {
+            throw callback.getSoapFault() ;
+        }
+    }
+    
+    /**
+     * The request callback class.
+     */
+    private static final class RequestCallback extends BAInitiatorCallback
+    {
+        /**
+         * The response flag.
+         */
+        private boolean response ;
+        /**
+         * The SOAP fault response.
+         */
+        private SoapFault soapFault ;
+        
+        /**
+         * A response.
+         * @param addressingProperties The current addressing context.
+         */
+        public void response(final AddressingProperties addressingProperties)
+        {
+            this.response = true ;
+        }
+
+        /**
+         * A SOAP fault response.
+         * @param soapFault The SOAP fault response.
+         * @param addressingProperties The current addressing context.
+         */
+        public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+        {
+            this.soapFault = soapFault ;
+        }
+        
+        /**
+         * Was a response received?
+         * @return true if a response was received, false otherwise.
+         */
+        boolean isResponse()
+        {
+            return response ;
+        }
+        
+        /**
+         * Get the SOAP fault.
+         * @return The SOAP fault or null.
+         */
+        SoapFault getSoapFault()
+        {
+            return soapFault ;
+        }
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropConstants.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,206 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop;
-
-import javax.xml.namespace.QName;
-
-/**
- * Interface containing WS-TX BA Interop constants.
- */
-public interface BAInteropConstants
-{
-    /**
-     * The interop test initiator service name.
-     */
-    public String SERVICE_INITIATOR = "BAInitiatorService" ;
-
-    /**
-     * The interop test initiator service name.
-     */
-    public String SERVICE_PARTICIPANT = "BAParticipantService" ;
-
-    /**
-     * The interop Namespace.
-     */
-    public String INTEROP_NAMESPACE = "http://fabrikam123.com/wsba" ;
-    /**
-     * The interop namespace prefix.
-     */
-    public String INTEROP_PREFIX = "bainterop" ;
-    
-    /**
-     * The participant action prefix.
-     */
-    public String INTEROP_ACTION_PARTICIPANT_PREFIX = INTEROP_NAMESPACE + "/ParticipantPortType/" ;
-    /**
-     * The initiator action prefix.
-     */
-    public String INTEROP_ACTION_INITIATOR_PREFIX = INTEROP_NAMESPACE + "/InitiatorPortType/" ;
-
-    /**
-     * The Cancel element.
-     */
-    public String INTEROP_ELEMENT_CANCEL = "Cancel" ;
-    /**
-     * The Cancel QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_CANCEL = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_CANCEL, INTEROP_PREFIX) ;
-    /**
-     * The Cancel Action.
-     */
-    public String INTEROP_ACTION_CANCEL = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_CANCEL ;
-    
-    /**
-     * The Exit element.
-     */
-    public String INTEROP_ELEMENT_EXIT = "Exit" ;
-    /**
-     * The Exit QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_EXIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_EXIT, INTEROP_PREFIX) ;
-    /**
-     * The Exit Action.
-     */
-    public String INTEROP_ACTION_EXIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_EXIT ;
-    
-    /**
-     * The Fail element.
-     */
-    public String INTEROP_ELEMENT_FAIL = "Fail" ;
-    /**
-     * The Fail QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_FAIL = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_FAIL, INTEROP_PREFIX) ;
-    /**
-     * The Fail Action.
-     */
-    public String INTEROP_ACTION_FAIL = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_FAIL ;
-    
-    /**
-     * The Cannot Complete element.
-     */
-    public String INTEROP_ELEMENT_CANNOT_COMPLETE = "CannotComplete" ;
-    /**
-     * The Cannot Complete QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_CANNOT_COMPLETE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_CANNOT_COMPLETE, INTEROP_PREFIX) ;
-    /**
-     * The Cannot Complete Action.
-     */
-    public String INTEROP_ACTION_CANNOT_COMPLETE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_CANNOT_COMPLETE ;
-    
-    /**
-     * The Participant Complete Close element.
-     */
-    public String INTEROP_ELEMENT_PARTICIPANT_COMPLETE_CLOSE = "ParticipantCompleteClose" ;
-    /**
-     * The Participant Complete Close QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_PARTICIPANT_COMPLETE_CLOSE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PARTICIPANT_COMPLETE_CLOSE, INTEROP_PREFIX) ;
-    /**
-     * The Participant Complete Close Action.
-     */
-    public String INTEROP_ACTION_PARTICIPANT_COMPLETE_CLOSE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PARTICIPANT_COMPLETE_CLOSE ;
-    
-    /**
-     * The Coordinator Complete Close element.
-     */
-    public String INTEROP_ELEMENT_COORDINATOR_COMPLETE_CLOSE = "CoordinatorCompleteClose" ;
-    /**
-     * The Coordinator Complete Close QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_COORDINATOR_COMPLETE_CLOSE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COORDINATOR_COMPLETE_CLOSE, INTEROP_PREFIX) ;
-    /**
-     * The Coordinator Complete Close Action.
-     */
-    public String INTEROP_ACTION_COORDINATOR_COMPLETE_CLOSE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COORDINATOR_COMPLETE_CLOSE ;
-    
-    /**
-     * The Unsolicited Complete element.
-     */
-    public String INTEROP_ELEMENT_UNSOLICITED_COMPLETE = "UnsolicitedComplete" ;
-    /**
-     * The Unsolicited Complete QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_UNSOLICITED_COMPLETE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_UNSOLICITED_COMPLETE, INTEROP_PREFIX) ;
-    /**
-     * The Unsolicited Complete Action.
-     */
-    public String INTEROP_ACTION_UNSOLICITED_COMPLETE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_UNSOLICITED_COMPLETE ;
-    
-    /**
-     * The Compensate element.
-     */
-    public String INTEROP_ELEMENT_COMPENSATE = "Compensate" ;
-    /**
-     * The Compensate QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_COMPENSATE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPENSATE, INTEROP_PREFIX) ;
-    /**
-     * The Compensate Action.
-     */
-    public String INTEROP_ACTION_COMPENSATE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPENSATE ;
-    
-    /**
-     * The Compensation Fail element.
-     */
-    public String INTEROP_ELEMENT_COMPENSATION_FAIL = "CompensationFail" ;
-    /**
-     * The Compensation Fail QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_COMPENSATION_FAIL = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPENSATION_FAIL, INTEROP_PREFIX) ;
-    /**
-     * The Compensation Fail Action.
-     */
-    public String INTEROP_ACTION_COMPENSATION_FAIL = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPENSATION_FAIL ;
-    
-    /**
-     * The Participant Cancel Completed Race element.
-     */
-    public String INTEROP_ELEMENT_PARTICIPANT_CANCEL_COMPLETED_RACE = "ParticipantCancelCompletedRace" ;
-    /**
-     * The Participant Cancel Completed Race QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_PARTICIPANT_CANCEL_COMPLETED_RACE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PARTICIPANT_CANCEL_COMPLETED_RACE, INTEROP_PREFIX) ;
-    /**
-     * The Participant Cancel Completed Race Action.
-     */
-    public String INTEROP_ACTION_PARTICIPANT_CANCEL_COMPLETED_RACE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PARTICIPANT_CANCEL_COMPLETED_RACE ;
-    
-    /**
-     * The Message Loss And Recovery element.
-     */
-    public String INTEROP_ELEMENT_MESSAGE_LOSS_AND_RECOVERY = "MessageLossAndRecovery" ;
-    /**
-     * The Message Loss And Recovery QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_MESSAGE_LOSS_AND_RECOVERY = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_MESSAGE_LOSS_AND_RECOVERY, INTEROP_PREFIX) ;
-    /**
-     * The Message Loss And Recovery Action.
-     */
-    public String INTEROP_ACTION_MESSAGE_LOSS_AND_RECOVERY = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_MESSAGE_LOSS_AND_RECOVERY ;
-    
-    /**
-     * The Mixed Outcome element.
-     */
-    public String INTEROP_ELEMENT_MIXED_OUTCOME = "MixedOutcome" ;
-    /**
-     * The Mixed Outcome QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_MIXED_OUTCOME = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_MIXED_OUTCOME, INTEROP_PREFIX) ;
-    /**
-     * The Mixed Outcome Action.
-     */
-    public String INTEROP_ACTION_MIXED_OUTCOME = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_MIXED_OUTCOME ;
-    
-    /**
-     * The response element.
-     */
-    public String INTEROP_ELEMENT_RESPONSE = "Response" ;
-    /**
-     * The response QName.
-     */
-    public QName INTEROP_ELEMENT_QNAME_RESPONSE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RESPONSE, INTEROP_PREFIX) ;
-    /**
-     * The response Action.
-     */
-    public String INTEROP_ACTION_RESPONSE = INTEROP_ACTION_INITIATOR_PREFIX + INTEROP_ELEMENT_RESPONSE ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropConstants.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropConstants.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropConstants.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropConstants.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,226 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Interface containing WS-TX BA Interop constants.
+ */
+public interface BAInteropConstants
+{
+    /**
+     * The interop test initiator service name.
+     */
+    public String SERVICE_INITIATOR = "BAInitiatorService" ;
+
+    /**
+     * The interop test initiator service name.
+     */
+    public String SERVICE_PARTICIPANT = "BAParticipantService" ;
+
+    /**
+     * The interop Namespace.
+     */
+    public String INTEROP_NAMESPACE = "http://fabrikam123.com/wsba" ;
+    /**
+     * The interop namespace prefix.
+     */
+    public String INTEROP_PREFIX = "bainterop" ;
+    
+    /**
+     * The participant action prefix.
+     */
+    public String INTEROP_ACTION_PARTICIPANT_PREFIX = INTEROP_NAMESPACE + "/ParticipantPortType/" ;
+    /**
+     * The initiator action prefix.
+     */
+    public String INTEROP_ACTION_INITIATOR_PREFIX = INTEROP_NAMESPACE + "/InitiatorPortType/" ;
+
+    /**
+     * The Cancel element.
+     */
+    public String INTEROP_ELEMENT_CANCEL = "Cancel" ;
+    /**
+     * The Cancel QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_CANCEL = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_CANCEL, INTEROP_PREFIX) ;
+    /**
+     * The Cancel Action.
+     */
+    public String INTEROP_ACTION_CANCEL = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_CANCEL ;
+    
+    /**
+     * The Exit element.
+     */
+    public String INTEROP_ELEMENT_EXIT = "Exit" ;
+    /**
+     * The Exit QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_EXIT = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_EXIT, INTEROP_PREFIX) ;
+    /**
+     * The Exit Action.
+     */
+    public String INTEROP_ACTION_EXIT = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_EXIT ;
+    
+    /**
+     * The Fail element.
+     */
+    public String INTEROP_ELEMENT_FAIL = "Fail" ;
+    /**
+     * The Fail QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_FAIL = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_FAIL, INTEROP_PREFIX) ;
+    /**
+     * The Fail Action.
+     */
+    public String INTEROP_ACTION_FAIL = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_FAIL ;
+    
+    /**
+     * The Cannot Complete element.
+     */
+    public String INTEROP_ELEMENT_CANNOT_COMPLETE = "CannotComplete" ;
+    /**
+     * The Cannot Complete QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_CANNOT_COMPLETE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_CANNOT_COMPLETE, INTEROP_PREFIX) ;
+    /**
+     * The Cannot Complete Action.
+     */
+    public String INTEROP_ACTION_CANNOT_COMPLETE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_CANNOT_COMPLETE ;
+    
+    /**
+     * The Participant Complete Close element.
+     */
+    public String INTEROP_ELEMENT_PARTICIPANT_COMPLETE_CLOSE = "ParticipantCompleteClose" ;
+    /**
+     * The Participant Complete Close QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_PARTICIPANT_COMPLETE_CLOSE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PARTICIPANT_COMPLETE_CLOSE, INTEROP_PREFIX) ;
+    /**
+     * The Participant Complete Close Action.
+     */
+    public String INTEROP_ACTION_PARTICIPANT_COMPLETE_CLOSE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PARTICIPANT_COMPLETE_CLOSE ;
+    
+    /**
+     * The Coordinator Complete Close element.
+     */
+    public String INTEROP_ELEMENT_COORDINATOR_COMPLETE_CLOSE = "CoordinatorCompleteClose" ;
+    /**
+     * The Coordinator Complete Close QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_COORDINATOR_COMPLETE_CLOSE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COORDINATOR_COMPLETE_CLOSE, INTEROP_PREFIX) ;
+    /**
+     * The Coordinator Complete Close Action.
+     */
+    public String INTEROP_ACTION_COORDINATOR_COMPLETE_CLOSE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COORDINATOR_COMPLETE_CLOSE ;
+    
+    /**
+     * The Unsolicited Complete element.
+     */
+    public String INTEROP_ELEMENT_UNSOLICITED_COMPLETE = "UnsolicitedComplete" ;
+    /**
+     * The Unsolicited Complete QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_UNSOLICITED_COMPLETE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_UNSOLICITED_COMPLETE, INTEROP_PREFIX) ;
+    /**
+     * The Unsolicited Complete Action.
+     */
+    public String INTEROP_ACTION_UNSOLICITED_COMPLETE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_UNSOLICITED_COMPLETE ;
+    
+    /**
+     * The Compensate element.
+     */
+    public String INTEROP_ELEMENT_COMPENSATE = "Compensate" ;
+    /**
+     * The Compensate QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_COMPENSATE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPENSATE, INTEROP_PREFIX) ;
+    /**
+     * The Compensate Action.
+     */
+    public String INTEROP_ACTION_COMPENSATE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPENSATE ;
+    
+    /**
+     * The Compensation Fail element.
+     */
+    public String INTEROP_ELEMENT_COMPENSATION_FAIL = "CompensationFail" ;
+    /**
+     * The Compensation Fail QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_COMPENSATION_FAIL = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_COMPENSATION_FAIL, INTEROP_PREFIX) ;
+    /**
+     * The Compensation Fail Action.
+     */
+    public String INTEROP_ACTION_COMPENSATION_FAIL = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_COMPENSATION_FAIL ;
+    
+    /**
+     * The Participant Cancel Completed Race element.
+     */
+    public String INTEROP_ELEMENT_PARTICIPANT_CANCEL_COMPLETED_RACE = "ParticipantCancelCompletedRace" ;
+    /**
+     * The Participant Cancel Completed Race QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_PARTICIPANT_CANCEL_COMPLETED_RACE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_PARTICIPANT_CANCEL_COMPLETED_RACE, INTEROP_PREFIX) ;
+    /**
+     * The Participant Cancel Completed Race Action.
+     */
+    public String INTEROP_ACTION_PARTICIPANT_CANCEL_COMPLETED_RACE = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_PARTICIPANT_CANCEL_COMPLETED_RACE ;
+    
+    /**
+     * The Message Loss And Recovery element.
+     */
+    public String INTEROP_ELEMENT_MESSAGE_LOSS_AND_RECOVERY = "MessageLossAndRecovery" ;
+    /**
+     * The Message Loss And Recovery QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_MESSAGE_LOSS_AND_RECOVERY = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_MESSAGE_LOSS_AND_RECOVERY, INTEROP_PREFIX) ;
+    /**
+     * The Message Loss And Recovery Action.
+     */
+    public String INTEROP_ACTION_MESSAGE_LOSS_AND_RECOVERY = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_MESSAGE_LOSS_AND_RECOVERY ;
+    
+    /**
+     * The Mixed Outcome element.
+     */
+    public String INTEROP_ELEMENT_MIXED_OUTCOME = "MixedOutcome" ;
+    /**
+     * The Mixed Outcome QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_MIXED_OUTCOME = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_MIXED_OUTCOME, INTEROP_PREFIX) ;
+    /**
+     * The Mixed Outcome Action.
+     */
+    public String INTEROP_ACTION_MIXED_OUTCOME = INTEROP_ACTION_PARTICIPANT_PREFIX + INTEROP_ELEMENT_MIXED_OUTCOME ;
+    
+    /**
+     * The response element.
+     */
+    public String INTEROP_ELEMENT_RESPONSE = "Response" ;
+    /**
+     * The response QName.
+     */
+    public QName INTEROP_ELEMENT_QNAME_RESPONSE = new QName(INTEROP_NAMESPACE, INTEROP_ELEMENT_RESPONSE, INTEROP_PREFIX) ;
+    /**
+     * The response Action.
+     */
+    public String INTEROP_ACTION_RESPONSE = INTEROP_ACTION_INITIATOR_PREFIX + INTEROP_ELEMENT_RESPONSE ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropUtil.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropUtil.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropUtil.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,182 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop;
-
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
-import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionParticipantProcessor;
-import com.arjuna.webservices11.wsba.processors.ParticipantCompletionParticipantProcessor;
-import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.webservices11.wsarj.InstanceIdentifier;
-import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
-import com.arjuna.wsc11.ActivationCoordinator;
-import com.arjuna.wsc11.RegistrationCoordinator;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.arjuna.wst.BusinessActivityTerminator;
-import com.arjuna.wst.BusinessAgreementWithCoordinatorCompletionParticipant;
-import com.arjuna.wst.BusinessAgreementWithParticipantCompletionParticipant;
-import com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine;
-import com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine;
-import com.arjuna.wst11.stub.BusinessActivityTerminatorStub;
-
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
-
-/**
- * Utility methods
- */
-public class BAInteropUtil
-{
-    /**
-     * Get an atomic outcome coordination context.
-     * @param coordinatorURI The coordinator URI.
-     * @return The coordination context.
-     * @throws Exception for errors.
-     */
-    public static CoordinationContextType createAtomicOutcomeCoordinationContext(final String coordinatorURI)
-        throws Exception
-    {
-        return createCoordinationContext(coordinatorURI, BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME) ;
-    }
-    
-    /**
-     * Get a mixed outcome coordination context.
-     * @param coordinatorURI The coordinator URI.
-     * @return The coordination context.
-     * @throws Exception for errors.
-     */
-    public static CoordinationContextType createMixedOutcomeCoordinationContext(final String coordinatorURI)
-        throws Exception
-    {
-        return createCoordinationContext(coordinatorURI, BusinessActivityConstants.WSBA_PROTOCOL_MIXED_OUTCOME) ;
-    }
-    
-    /**
-     * Get a coordination context for the specified protocol.
-     * @param coordinatorURI The coordinator URI.
-     * @param protocol The coordination protocol.
-     * @return The coordination context.
-     * @throws Exception for errors.
-     */
-    private static CoordinationContextType createCoordinationContext(final String coordinatorURI, final String protocol)
-    	throws Exception
-    {
-        return ActivationCoordinator.createCoordinationContext(coordinatorURI, MessageId.getMessageId(), protocol, null, null) ;
-    }
-
-    /**
-     * Register terminator.
-     * @param context The coordination context.
-     * @param id The id of the terminator.
-     * @return The endpoint for communicating with the coordinator.
-     * @throws Exception for errors.
-     */
-    public static BusinessActivityTerminator registerTerminator(final CoordinationContextType context, final String id)
-        throws Exception
-    {
-        final W3CEndpointReference completionCoordinator = register(context, getTerminatorParticipant(id), ArjunaTXConstants.WSARJTX_PROTOCOL_TERMINATION) ;
-        return new BusinessActivityTerminatorStub(id, completionCoordinator);
-    }
-    
-    /**
-     * Register a participant completion participant in the specified coordination context.
-     * @param context The coordination context.
-     * @param participant The durable 2PC participant
-     * @param id The participant id.
-     * @return The participant engine.
-     * @throws Exception for errors.
-     */
-    public static ParticipantCompletionParticipantEngine registerParticipantCompletion(final CoordinationContextType context,
-	final BusinessAgreementWithParticipantCompletionParticipant participant, final String id)
-        throws Exception
-    {
-	final W3CEndpointReference coordinator = RegistrationCoordinator.register(context, MessageId.getMessageId(),
-            getParticipantCompletionParticipant(id), BusinessActivityConstants.WSBA_SUB_PROTOCOL_PARTICIPANT_COMPLETION) ;
-        final ParticipantCompletionParticipantEngine engine = new ParticipantCompletionParticipantEngine(id, coordinator, participant) ;
-        ParticipantCompletionParticipantProcessor.getProcessor().activateParticipant(engine, id) ;
-        return engine ;
-    }
-    
-    /**
-     * Register a coordinator completion participant in the specified coordination context.
-     * @param context The coordination context.
-     * @param participant The durable 2PC participant
-     * @param id The participant id.
-     * @return The participant engine.
-     * @throws Exception for errors.
-     */
-    public static CoordinatorCompletionParticipantEngine registerCoordinatorCompletion(final CoordinationContextType context,
-	final BusinessAgreementWithCoordinatorCompletionParticipant participant, final String id)
-        throws Exception
-    {
-	final W3CEndpointReference coordinator = RegistrationCoordinator.register(context, MessageId.getMessageId(),
-            getCoordinatorCompletionParticipant(id), BusinessActivityConstants.WSBA_SUB_PROTOCOL_COORDINATOR_COMPLETION) ;
-        final CoordinatorCompletionParticipantEngine engine = new CoordinatorCompletionParticipantEngine(id, coordinator, participant) ;
-        CoordinatorCompletionParticipantProcessor.getProcessor().activateParticipant(engine, id) ;
-        return engine ;
-    }
-    
-    /**
-     * Register for a sub protocol.
-     * @param context The coordination context.
-     * @param participant The participant EPR.
-     * @param protocol The protocol.
-     * @return The coordinator endpoint.
-     * @throws Exception for errors.
-     */
-    private static W3CEndpointReference register(final CoordinationContextType context, final W3CEndpointReference participant, final String protocol)
-        throws Exception
-    {
-        return RegistrationCoordinator.register(context, MessageId.getMessageId(), participant, protocol) ;
-    }
-    
-    /**
-     * Get the endpoint reference for a terminator participant.
-     * @param id The participant id.
-     * @return The endpoint reference.
-     */
-    private static W3CEndpointReference getTerminatorParticipant(final String id)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        final String serviceURI = serviceRegistry.getServiceURI(ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME) ;
-        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
-        builder.serviceName(ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_QNAME);
-        builder.endpointName(ArjunaTX11Constants.TERMINATION_PARTICIPANT_PORT_QNAME);
-        builder.address(serviceURI);
-        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
-        return builder.build();
-    }
-    
-    /**
-     * Get the endpoint reference for a participant completion participant.
-     * @param id The participant id.
-     * @return The endpoint reference.
-     */
-    private static W3CEndpointReference getParticipantCompletionParticipant(final String id)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        final String serviceURI = serviceRegistry.getServiceURI(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME) ;
-        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
-        builder.serviceName(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_QNAME);
-        builder.endpointName(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_PORT_QNAME);
-        builder.address(serviceURI);
-        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
-        return builder.build();
-    }
-    
-    /**
-     * Get the endpoint reference for a coordinator completion participant.
-     * @param id The participant id.
-     * @return The endpoint reference.
-     */
-    private static W3CEndpointReference getCoordinatorCompletionParticipant(final String id)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        final String serviceURI = serviceRegistry.getServiceURI(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME) ;
-        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
-        builder.serviceName(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_QNAME);
-        builder.endpointName(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_PORT_QNAME);
-        builder.address(serviceURI);
-        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
-        return builder.build();
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropUtil.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropUtil.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropUtil.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/BAInteropUtil.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,202 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop;
+
+import com.arjuna.webservices11.wsba.BusinessActivityConstants;
+import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionParticipantProcessor;
+import com.arjuna.webservices11.wsba.processors.ParticipantCompletionParticipantProcessor;
+import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.webservices11.wsarj.InstanceIdentifier;
+import com.arjuna.webservices11.ServiceRegistry;
+import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
+import com.arjuna.wsc11.ActivationCoordinator;
+import com.arjuna.wsc11.RegistrationCoordinator;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.arjuna.wst.BusinessActivityTerminator;
+import com.arjuna.wst.BusinessAgreementWithCoordinatorCompletionParticipant;
+import com.arjuna.wst.BusinessAgreementWithParticipantCompletionParticipant;
+import com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine;
+import com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine;
+import com.arjuna.wst11.stub.BusinessActivityTerminatorStub;
+
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
+
+/**
+ * Utility methods
+ */
+public class BAInteropUtil
+{
+    /**
+     * Get an atomic outcome coordination context.
+     * @param coordinatorURI The coordinator URI.
+     * @return The coordination context.
+     * @throws Exception for errors.
+     */
+    public static CoordinationContextType createAtomicOutcomeCoordinationContext(final String coordinatorURI)
+        throws Exception
+    {
+        return createCoordinationContext(coordinatorURI, BusinessActivityConstants.WSBA_PROTOCOL_ATOMIC_OUTCOME) ;
+    }
+    
+    /**
+     * Get a mixed outcome coordination context.
+     * @param coordinatorURI The coordinator URI.
+     * @return The coordination context.
+     * @throws Exception for errors.
+     */
+    public static CoordinationContextType createMixedOutcomeCoordinationContext(final String coordinatorURI)
+        throws Exception
+    {
+        return createCoordinationContext(coordinatorURI, BusinessActivityConstants.WSBA_PROTOCOL_MIXED_OUTCOME) ;
+    }
+    
+    /**
+     * Get a coordination context for the specified protocol.
+     * @param coordinatorURI The coordinator URI.
+     * @param protocol The coordination protocol.
+     * @return The coordination context.
+     * @throws Exception for errors.
+     */
+    private static CoordinationContextType createCoordinationContext(final String coordinatorURI, final String protocol)
+    	throws Exception
+    {
+        return ActivationCoordinator.createCoordinationContext(coordinatorURI, MessageId.getMessageId(), protocol, null, null) ;
+    }
+
+    /**
+     * Register terminator.
+     * @param context The coordination context.
+     * @param id The id of the terminator.
+     * @return The endpoint for communicating with the coordinator.
+     * @throws Exception for errors.
+     */
+    public static BusinessActivityTerminator registerTerminator(final CoordinationContextType context, final String id)
+        throws Exception
+    {
+        final W3CEndpointReference completionCoordinator = register(context, getTerminatorParticipant(id), ArjunaTXConstants.WSARJTX_PROTOCOL_TERMINATION) ;
+        return new BusinessActivityTerminatorStub(id, completionCoordinator);
+    }
+    
+    /**
+     * Register a participant completion participant in the specified coordination context.
+     * @param context The coordination context.
+     * @param participant The durable 2PC participant
+     * @param id The participant id.
+     * @return The participant engine.
+     * @throws Exception for errors.
+     */
+    public static ParticipantCompletionParticipantEngine registerParticipantCompletion(final CoordinationContextType context,
+	final BusinessAgreementWithParticipantCompletionParticipant participant, final String id)
+        throws Exception
+    {
+	final W3CEndpointReference coordinator = RegistrationCoordinator.register(context, MessageId.getMessageId(),
+            getParticipantCompletionParticipant(id), BusinessActivityConstants.WSBA_SUB_PROTOCOL_PARTICIPANT_COMPLETION) ;
+        final ParticipantCompletionParticipantEngine engine = new ParticipantCompletionParticipantEngine(id, coordinator, participant) ;
+        ParticipantCompletionParticipantProcessor.getProcessor().activateParticipant(engine, id) ;
+        return engine ;
+    }
+    
+    /**
+     * Register a coordinator completion participant in the specified coordination context.
+     * @param context The coordination context.
+     * @param participant The durable 2PC participant
+     * @param id The participant id.
+     * @return The participant engine.
+     * @throws Exception for errors.
+     */
+    public static CoordinatorCompletionParticipantEngine registerCoordinatorCompletion(final CoordinationContextType context,
+	final BusinessAgreementWithCoordinatorCompletionParticipant participant, final String id)
+        throws Exception
+    {
+	final W3CEndpointReference coordinator = RegistrationCoordinator.register(context, MessageId.getMessageId(),
+            getCoordinatorCompletionParticipant(id), BusinessActivityConstants.WSBA_SUB_PROTOCOL_COORDINATOR_COMPLETION) ;
+        final CoordinatorCompletionParticipantEngine engine = new CoordinatorCompletionParticipantEngine(id, coordinator, participant) ;
+        CoordinatorCompletionParticipantProcessor.getProcessor().activateParticipant(engine, id) ;
+        return engine ;
+    }
+    
+    /**
+     * Register for a sub protocol.
+     * @param context The coordination context.
+     * @param participant The participant EPR.
+     * @param protocol The protocol.
+     * @return The coordinator endpoint.
+     * @throws Exception for errors.
+     */
+    private static W3CEndpointReference register(final CoordinationContextType context, final W3CEndpointReference participant, final String protocol)
+        throws Exception
+    {
+        return RegistrationCoordinator.register(context, MessageId.getMessageId(), participant, protocol) ;
+    }
+    
+    /**
+     * Get the endpoint reference for a terminator participant.
+     * @param id The participant id.
+     * @return The endpoint reference.
+     */
+    private static W3CEndpointReference getTerminatorParticipant(final String id)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        final String serviceURI = serviceRegistry.getServiceURI(ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME) ;
+        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
+        builder.serviceName(ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_QNAME);
+        builder.endpointName(ArjunaTX11Constants.TERMINATION_PARTICIPANT_PORT_QNAME);
+        builder.address(serviceURI);
+        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
+        return builder.build();
+    }
+    
+    /**
+     * Get the endpoint reference for a participant completion participant.
+     * @param id The participant id.
+     * @return The endpoint reference.
+     */
+    private static W3CEndpointReference getParticipantCompletionParticipant(final String id)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        final String serviceURI = serviceRegistry.getServiceURI(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME) ;
+        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
+        builder.serviceName(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_QNAME);
+        builder.endpointName(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_PORT_QNAME);
+        builder.address(serviceURI);
+        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
+        return builder.build();
+    }
+    
+    /**
+     * Get the endpoint reference for a coordinator completion participant.
+     * @param id The participant id.
+     * @return The endpoint reference.
+     */
+    private static W3CEndpointReference getCoordinatorCompletionParticipant(final String id)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        final String serviceURI = serviceRegistry.getServiceURI(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME) ;
+        final W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
+        builder.serviceName(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_QNAME);
+        builder.endpointName(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_PORT_QNAME);
+        builder.address(serviceURI);
+        InstanceIdentifier.setEndpointInstanceIdentifier(builder, id) ;
+        return builder.build();
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/ParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/ParticipantStub.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/ParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,132 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop;
-
-import java.io.IOException;
-
-import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-
-/**
- * The interface for the participant stub.
- */
-public interface ParticipantStub
-{
-    /**
-     * Send a cancel request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void cancel(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a exit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void exit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a fail request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void fail(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a cannotComplete request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void cannotComplete(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a participantCompleteClose request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void participantCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a coordinatorCompleteClose request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void coordinatorCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a unsolicitedComplete request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void unsolicitedComplete(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a compensate request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void compensate(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a compensationFail request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void compensationFail(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a participantCancelCompletedRace request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void participantCancelCompletedRace(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a messageLossAndRecovery request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void messageLossAndRecovery(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-    
-    /**
-     * Send a mixedOutcome request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void mixedOutcome(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/ParticipantStub.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/ParticipantStub.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/ParticipantStub.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/ParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,152 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop;
+
+import java.io.IOException;
+
+import com.arjuna.webservices.SoapFault;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+
+/**
+ * The interface for the participant stub.
+ */
+public interface ParticipantStub
+{
+    /**
+     * Send a cancel request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void cancel(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a exit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void exit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a fail request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void fail(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a cannotComplete request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void cannotComplete(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a participantCompleteClose request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void participantCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a coordinatorCompleteClose request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void coordinatorCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a unsolicitedComplete request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void unsolicitedComplete(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a compensate request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void compensate(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a compensationFail request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void compensationFail(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a participantCancelCompletedRace request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void participantCancelCompletedRace(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a messageLossAndRecovery request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void messageLossAndRecovery(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+    
+    /**
+     * Send a mixedOutcome request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void mixedOutcome(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,223 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop;
-
-import java.io.IOException;
-
-import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wsc11.messaging.MessageId;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.jboss.transaction.txinterop.webservices.bainterop.client.SyncParticipantClient;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The participant stub.
- */
-public class SyncParticipantStub implements ParticipantStub
-{
-    /***
-     * The participant stub singletong.
-     */
-    private static final ParticipantStub PARTICIPANT_STUB = new SyncParticipantStub() ;
-    
-    /**
-     * Get the participant stub singleton.
-     * @return The participant stub singleton.
-     */
-    public static ParticipantStub getParticipantStub()
-    {
-        return PARTICIPANT_STUB ;
-    }
-    
-    /**
-     * Send a cancel request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void cancel(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendCancel(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a exit request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void exit(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendExit(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a fail request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void fail(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendFail(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a cannotComplete request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void cannotComplete(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendCannotComplete(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a participantCompleteClose request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void participantCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendParticipantCompleteClose(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a coordinatorCompleteClose request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void coordinatorCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendCoordinatorCompleteClose(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a unsolicitedComplete request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void unsolicitedComplete(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendUnsolicitedComplete(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a compensate request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void compensate(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendCompensate(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a compensationFail request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void compensationFail(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendCompensationFail(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a participantCancelCompletedRace request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void participantCancelCompletedRace(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendParticipantCancelCompletedRace(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a messageLossAndRecovery request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void messageLossAndRecovery(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendMessageLossAndRecovery(coordinationContext, addressingProperties) ;
-    }
-    
-    /**
-     * Send a mixedOutcome request.
-     * @param serviceURI The target service URI.
-     * @param coordinationContext The coordination context.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void mixedOutcome(final String serviceURI, final CoordinationContextType coordinationContext)
-        throws SoapFault, IOException
-    {
-        final String messageId = MessageId.getMessageId() ;
-        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
-        
-        SyncParticipantClient.getClient().sendMixedOutcome(coordinationContext, addressingProperties) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,243 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop;
+
+import java.io.IOException;
+
+import com.arjuna.webservices.SoapFault;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wsc11.messaging.MessageId;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.jboss.transaction.txinterop.webservices.bainterop.client.SyncParticipantClient;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The participant stub.
+ */
+public class SyncParticipantStub implements ParticipantStub
+{
+    /***
+     * The participant stub singletong.
+     */
+    private static final ParticipantStub PARTICIPANT_STUB = new SyncParticipantStub() ;
+    
+    /**
+     * Get the participant stub singleton.
+     * @return The participant stub singleton.
+     */
+    public static ParticipantStub getParticipantStub()
+    {
+        return PARTICIPANT_STUB ;
+    }
+    
+    /**
+     * Send a cancel request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void cancel(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendCancel(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a exit request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void exit(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendExit(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a fail request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void fail(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendFail(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a cannotComplete request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void cannotComplete(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendCannotComplete(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a participantCompleteClose request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void participantCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendParticipantCompleteClose(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a coordinatorCompleteClose request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void coordinatorCompleteClose(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendCoordinatorCompleteClose(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a unsolicitedComplete request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void unsolicitedComplete(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendUnsolicitedComplete(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a compensate request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void compensate(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendCompensate(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a compensationFail request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void compensationFail(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendCompensationFail(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a participantCancelCompletedRace request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void participantCancelCompletedRace(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendParticipantCancelCompletedRace(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a messageLossAndRecovery request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void messageLossAndRecovery(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendMessageLossAndRecovery(coordinationContext, addressingProperties) ;
+    }
+    
+    /**
+     * Send a mixedOutcome request.
+     * @param serviceURI The target service URI.
+     * @param coordinationContext The coordination context.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void mixedOutcome(final String serviceURI, final CoordinationContextType coordinationContext)
+        throws SoapFault, IOException
+    {
+        final String messageId = MessageId.getMessageId() ;
+        final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+        
+        SyncParticipantClient.getClient().sendMixedOutcome(coordinationContext, addressingProperties) ;
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,357 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.client;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.ServiceRegistry;
-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;
-import com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantPortType;
-
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.EndpointReference;
-import javax.xml.ws.addressing.AddressingBuilder;
-
-/**
- * The participant client.
- * @author kevin
- */
-public class AsyncParticipantClient
-{
-    /**
-     * The client singleton.
-     */
-    private static final AsyncParticipantClient CLIENT = new AsyncParticipantClient() ;
-    
-    /**
-     * The cancel action.
-     */
-    private static final String cancelAction = BAInteropConstants.INTEROP_ACTION_CANCEL ;
-    /**
-     * The exit action.
-     */
-    private static final String exitAction = BAInteropConstants.INTEROP_ACTION_EXIT ;
-    /**
-     * The fail action.
-     */
-    private static final String failAction = BAInteropConstants.INTEROP_ACTION_FAIL ;
-    /**
-     * The cannot complete action.
-     */
-    private static final String cannotCompleteAction = BAInteropConstants.INTEROP_ACTION_CANNOT_COMPLETE ;
-    /**
-     * The participant complete close action.
-     */
-    private static final String participantCompleteCloseAction = BAInteropConstants.INTEROP_ACTION_PARTICIPANT_COMPLETE_CLOSE ;
-    /**
-     * The coordinator complete close action.
-     */
-    private static final String coordinatorCompleteCloseAction = BAInteropConstants.INTEROP_ACTION_COORDINATOR_COMPLETE_CLOSE ;
-    /**
-     * The unsolicited complete action.
-     */
-    private static final String unsolicitedCompleteAction = BAInteropConstants.INTEROP_ACTION_UNSOLICITED_COMPLETE ;
-    /**
-     * The compensate action.
-     */
-    private static final String compensateAction = BAInteropConstants.INTEROP_ACTION_COMPENSATE ;
-    /**
-     * The compensation fail action.
-     */
-    private static final String participantCompensationFailAction = BAInteropConstants.INTEROP_ACTION_COMPENSATION_FAIL ;
-    /**
-     * The participant cancel completed race action.
-     */
-    private static final String participantCancelCompletedRaceAction = BAInteropConstants.INTEROP_ACTION_PARTICIPANT_CANCEL_COMPLETED_RACE ;
-    /**
-     * The message loss and recovery action.
-     */
-    private static final String messageLossAndRecoveryAction = BAInteropConstants.INTEROP_ACTION_MESSAGE_LOSS_AND_RECOVERY ;
-    /**
-     * The mixed outcome action.
-     */
-    private static final String mixedOutcomeAction = BAInteropConstants.INTEROP_ACTION_MIXED_OUTCOME ;
-    
-    /**
-     * The initiator URI for replies.
-     */
-    private EndpointReference initiator = null;
-    
-    /**
-     * Construct the interop synch client.
-     */
-    private AsyncParticipantClient()
-    {
-        // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
-        
-        // Add WS-Addressing
-        // AddressingPolicy.register(handlerRegistry) ;
-        // Add coordination context
-        // CoordinationContextPolicy.register(handlerRegistry) ;
-        // Add client policies
-        // ClientPolicy.register(handlerRegistry) ;
-        
-        // soapService = new SoapService(handlerRegistry) ;
-        final String initiatorURIString = ServiceRegistry.getRegistry().getServiceURI(BAInteropConstants.SERVICE_INITIATOR) ;
-        AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-        URI uri = null;
-        try {
-            uri = new URI(initiatorURIString);
-            initiator = builder.newEndpointReference(uri);
-        } catch (URISyntaxException e) {
-            // TODO log error here
-        }
-    }
-    
-    /**
-     * Send a cancel request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCancel(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, cancelAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.cancel();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a exit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendExit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, exitAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.exit();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a fail request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, failAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.fail();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a cannot complete request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCannotComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, cannotCompleteAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.cannotComplete();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a participant complete close request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendParticipantCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, participantCompleteCloseAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.participantCompleteClose();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a coordinator complete close request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCoordinatorCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, coordinatorCompleteCloseAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.coordinatorCompleteClose();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a unsolicited complete request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendUnsolicitedComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, unsolicitedCompleteAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.unsolicitedComplete();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a compensate request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompensate(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, compensateAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.compensate();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a compensation fail request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompensationFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, participantCompensationFailAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.compensationFail();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a participant cancel completed race request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendParticipantCancelCompletedRace(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, participantCancelCompletedRaceAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.participantCancelCompletedRace();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a message loss and recovery request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendMessageLossAndRecovery(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, messageLossAndRecoveryAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.messageLossAndRecovery();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Send a mixed outcome request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendMixedOutcome(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        addressingProperties.setReplyTo(initiator) ;
-        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, mixedOutcomeAction);
-        CoordinationContextManager.setThreadContext(coordinationContext) ;
-        try {
-            port.mixedOutcome();
-        } finally {
-            CoordinationContextManager.setThreadContext(null) ;
-        }
-    }
-    
-    /**
-     * Get the Interop client singleton.
-     * @return The Interop client singleton.
-     */
-    public static AsyncParticipantClient getClient()
-    {
-        return CLIENT ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,377 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.client;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices11.ServiceRegistry;
+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;
+import com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantPortType;
+
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.EndpointReference;
+import javax.xml.ws.addressing.AddressingBuilder;
+
+/**
+ * The participant client.
+ * @author kevin
+ */
+public class AsyncParticipantClient
+{
+    /**
+     * The client singleton.
+     */
+    private static final AsyncParticipantClient CLIENT = new AsyncParticipantClient() ;
+    
+    /**
+     * The cancel action.
+     */
+    private static final String cancelAction = BAInteropConstants.INTEROP_ACTION_CANCEL ;
+    /**
+     * The exit action.
+     */
+    private static final String exitAction = BAInteropConstants.INTEROP_ACTION_EXIT ;
+    /**
+     * The fail action.
+     */
+    private static final String failAction = BAInteropConstants.INTEROP_ACTION_FAIL ;
+    /**
+     * The cannot complete action.
+     */
+    private static final String cannotCompleteAction = BAInteropConstants.INTEROP_ACTION_CANNOT_COMPLETE ;
+    /**
+     * The participant complete close action.
+     */
+    private static final String participantCompleteCloseAction = BAInteropConstants.INTEROP_ACTION_PARTICIPANT_COMPLETE_CLOSE ;
+    /**
+     * The coordinator complete close action.
+     */
+    private static final String coordinatorCompleteCloseAction = BAInteropConstants.INTEROP_ACTION_COORDINATOR_COMPLETE_CLOSE ;
+    /**
+     * The unsolicited complete action.
+     */
+    private static final String unsolicitedCompleteAction = BAInteropConstants.INTEROP_ACTION_UNSOLICITED_COMPLETE ;
+    /**
+     * The compensate action.
+     */
+    private static final String compensateAction = BAInteropConstants.INTEROP_ACTION_COMPENSATE ;
+    /**
+     * The compensation fail action.
+     */
+    private static final String participantCompensationFailAction = BAInteropConstants.INTEROP_ACTION_COMPENSATION_FAIL ;
+    /**
+     * The participant cancel completed race action.
+     */
+    private static final String participantCancelCompletedRaceAction = BAInteropConstants.INTEROP_ACTION_PARTICIPANT_CANCEL_COMPLETED_RACE ;
+    /**
+     * The message loss and recovery action.
+     */
+    private static final String messageLossAndRecoveryAction = BAInteropConstants.INTEROP_ACTION_MESSAGE_LOSS_AND_RECOVERY ;
+    /**
+     * The mixed outcome action.
+     */
+    private static final String mixedOutcomeAction = BAInteropConstants.INTEROP_ACTION_MIXED_OUTCOME ;
+    
+    /**
+     * The initiator URI for replies.
+     */
+    private EndpointReference initiator = null;
+    
+    /**
+     * Construct the interop synch client.
+     */
+    private AsyncParticipantClient()
+    {
+        // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+        
+        // Add WS-Addressing
+        // AddressingPolicy.register(handlerRegistry) ;
+        // Add coordination context
+        // CoordinationContextPolicy.register(handlerRegistry) ;
+        // Add client policies
+        // ClientPolicy.register(handlerRegistry) ;
+        
+        // soapService = new SoapService(handlerRegistry) ;
+        final String initiatorURIString = ServiceRegistry.getRegistry().getServiceURI(BAInteropConstants.SERVICE_INITIATOR) ;
+        AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+        URI uri = null;
+        try {
+            uri = new URI(initiatorURIString);
+            initiator = builder.newEndpointReference(uri);
+        } catch (URISyntaxException e) {
+            // TODO log error here
+        }
+    }
+    
+    /**
+     * Send a cancel request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCancel(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, cancelAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.cancel();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a exit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendExit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, exitAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.exit();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a fail request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, failAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.fail();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a cannot complete request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCannotComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, cannotCompleteAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.cannotComplete();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a participant complete close request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendParticipantCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, participantCompleteCloseAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.participantCompleteClose();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a coordinator complete close request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCoordinatorCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, coordinatorCompleteCloseAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.coordinatorCompleteClose();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a unsolicited complete request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendUnsolicitedComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, unsolicitedCompleteAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.unsolicitedComplete();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a compensate request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompensate(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, compensateAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.compensate();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a compensation fail request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompensationFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, participantCompensationFailAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.compensationFail();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a participant cancel completed race request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendParticipantCancelCompletedRace(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, participantCancelCompletedRaceAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.participantCancelCompletedRace();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a message loss and recovery request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendMessageLossAndRecovery(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, messageLossAndRecoveryAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.messageLossAndRecovery();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Send a mixed outcome request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendMixedOutcome(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        addressingProperties.setReplyTo(initiator) ;
+        ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, mixedOutcomeAction);
+        CoordinationContextManager.setThreadContext(coordinationContext) ;
+        try {
+            port.mixedOutcome();
+        } finally {
+            CoordinationContextManager.setThreadContext(null) ;
+        }
+    }
+    
+    /**
+     * Get the Interop client singleton.
+     * @return The Interop client singleton.
+     */
+    public static AsyncParticipantClient getClient()
+    {
+        return CLIENT ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,133 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.client;
-
-import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
-
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.JAXWSAConstants;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.handler.Handler;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.net.URISyntaxException;
-
-import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorService;
-import com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantService;
-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;
-
-/**
- * Created by IntelliJ IDEA.
- * User: adinn
- * Date: Apr 17, 2008
- * Time: 4:18:34 PM
- * To change this template use File | Settings | File Templates.
- */
-public class BAInteropClient {
-    // TODO -- do we really need a thread local here or can we just use one service?
-    /**
-     *  thread local which maintains a per thread activation service instance
-     */
-    private static ThreadLocal<InitiatorService> initiatorService = new ThreadLocal<InitiatorService>();
-
-    /**
-     *  thread local which maintains a per thread activation service instance
-     */
-    private static ThreadLocal<ParticipantService> participantService = new ThreadLocal<ParticipantService>();
-
-    /**
-     *  builder used to construct addressing info for calls
-     */
-    private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-
-    /**
-     * fetch a coordinator activation service unique to the current thread
-     * @return
-     */
-    private static synchronized InitiatorService getInitiatorService()
-    {
-        if (initiatorService.get() == null) {
-            initiatorService.set(new InitiatorService());
-        }
-        return initiatorService.get();
-    }
-
-    /**
-     * fetch a coordinator registration service unique to the current thread
-     * @return
-     */
-    private static synchronized ParticipantService getParticipantService()
-    {
-        if (participantService.get() == null) {
-            participantService.set(new ParticipantService());
-        }
-        return participantService.get();
-    }
-
-    public static InitiatorPortType getInitiatorPort(AddressingProperties addressingProperties,
-                                                       String action)
-    {
-        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
-        InitiatorService service = getInitiatorService();
-        InitiatorPortType port = service.getPort(InitiatorPortType.class);
-        BindingProvider bindingProvider = (BindingProvider)port;
-        AttributedURI toUri = addressingProperties.getTo();
-        List<Handler> customHandlerChain = new ArrayList<Handler>();
-        /*
-         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
-         */
-		customHandlerChain.add(new WSAddressingClientHandler());
-		bindingProvider.getBinding().setHandlerChain(customHandlerChain);
-
-        Map<String, Object> requestContext = bindingProvider.getRequestContext();
-        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
-	    // jbossws should do this for us . . .
-	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
-        try {
-            addressingProperties.setAction(builder.newURI(action));
-        } catch (URISyntaxException use) {
-            // TODO log this error
-        }
-
-        return port;
-    }
-
-    // don't think we ever need this as we get a registration port from the endpoint ref returned by
-    // the activation port request
-    public static ParticipantPortType getParticipantPort(AddressingProperties addressingProperties, String action)
-    {
-        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
-        ParticipantService service = getParticipantService();
-        ParticipantPortType port = service.getPort(ParticipantPortType.class);
-        BindingProvider bindingProvider = (BindingProvider)port;
-        AttributedURI toUri = addressingProperties.getTo();
-        List<Handler> customHandlerChain = new ArrayList<Handler>();
-        /*
-         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
-         */
-		customHandlerChain.add(new WSAddressingClientHandler());
-        /*
-         * we need to add the coordination context handler in the case where we are passing a
-         * coordination context via a header element
-         */
-        customHandlerChain.add(new CoordinationContextHandler());
-		bindingProvider.getBinding().setHandlerChain(customHandlerChain);
-
-        Map<String, Object> requestContext = bindingProvider.getRequestContext();
-        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
-	    // jbossws should do this for us . . .
-	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
-        try {
-            addressingProperties.setAction(builder.newURI(action));
-        } catch (URISyntaxException use) {
-            // TODO log this error
-        }
-
-        return port;
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,153 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.client;
+
+import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
+
+import javax.xml.ws.addressing.AddressingBuilder;
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.AttributedURI;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.handler.Handler;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.net.URISyntaxException;
+
+import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorService;
+import com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantService;
+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;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: adinn
+ * Date: Apr 17, 2008
+ * Time: 4:18:34 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class BAInteropClient {
+    // TODO -- do we really need a thread local here or can we just use one service?
+    /**
+     *  thread local which maintains a per thread activation service instance
+     */
+    private static ThreadLocal<InitiatorService> initiatorService = new ThreadLocal<InitiatorService>();
+
+    /**
+     *  thread local which maintains a per thread activation service instance
+     */
+    private static ThreadLocal<ParticipantService> participantService = new ThreadLocal<ParticipantService>();
+
+    /**
+     *  builder used to construct addressing info for calls
+     */
+    private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+
+    /**
+     * fetch a coordinator activation service unique to the current thread
+     * @return
+     */
+    private static synchronized InitiatorService getInitiatorService()
+    {
+        if (initiatorService.get() == null) {
+            initiatorService.set(new InitiatorService());
+        }
+        return initiatorService.get();
+    }
+
+    /**
+     * fetch a coordinator registration service unique to the current thread
+     * @return
+     */
+    private static synchronized ParticipantService getParticipantService()
+    {
+        if (participantService.get() == null) {
+            participantService.set(new ParticipantService());
+        }
+        return participantService.get();
+    }
+
+    public static InitiatorPortType getInitiatorPort(AddressingProperties addressingProperties,
+                                                       String action)
+    {
+        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
+        InitiatorService service = getInitiatorService();
+        InitiatorPortType port = service.getPort(InitiatorPortType.class);
+        BindingProvider bindingProvider = (BindingProvider)port;
+        AttributedURI toUri = addressingProperties.getTo();
+        List<Handler> customHandlerChain = new ArrayList<Handler>();
+        /*
+         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
+         */
+		customHandlerChain.add(new WSAddressingClientHandler());
+		bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+
+        Map<String, Object> requestContext = bindingProvider.getRequestContext();
+        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
+	    // jbossws should do this for us . . .
+	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
+        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
+        try {
+            addressingProperties.setAction(builder.newURI(action));
+        } catch (URISyntaxException use) {
+            // TODO log this error
+        }
+
+        return port;
+    }
+
+    // don't think we ever need this as we get a registration port from the endpoint ref returned by
+    // the activation port request
+    public static ParticipantPortType getParticipantPort(AddressingProperties addressingProperties, String action)
+    {
+        // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
+        ParticipantService service = getParticipantService();
+        ParticipantPortType port = service.getPort(ParticipantPortType.class);
+        BindingProvider bindingProvider = (BindingProvider)port;
+        AttributedURI toUri = addressingProperties.getTo();
+        List<Handler> customHandlerChain = new ArrayList<Handler>();
+        /*
+         * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
+         */
+		customHandlerChain.add(new WSAddressingClientHandler());
+        /*
+         * we need to add the coordination context handler in the case where we are passing a
+         * coordination context via a header element
+         */
+        customHandlerChain.add(new CoordinationContextHandler());
+		bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+
+        Map<String, Object> requestContext = bindingProvider.getRequestContext();
+        requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
+	    // jbossws should do this for us . . .
+	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
+        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
+        try {
+            addressingProperties.setAction(builder.newURI(action));
+        } catch (URISyntaxException use) {
+            // TODO log this error
+        }
+
+        return port;
+    }
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,98 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.client;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.SoapFault11;
-import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
-import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorPortType;
-
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.AddressingBuilder;
-
-/**
- * The initiator client.
- * @author kevin
- */
-public class InitiatorClient
-{
-    /**
-     * The client singleton.
-     */
-    private static final InitiatorClient CLIENT = new InitiatorClient() ;
-    
-    /**
-     * The response action.
-     */
-    private static final String responseAction = BAInteropConstants.INTEROP_ACTION_RESPONSE ;
-    
-    /**
-     * Construct the interop synch client.
-     */
-    private InitiatorClient()
-    {
-        // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
-        
-        // Add WS-Addressing
-        // AddressingPolicy.register(handlerRegistry) ;
-        // Add client policies
-        // ClientPolicy.register(handlerRegistry) ;
-        
-        // soapService = new SoapService(handlerRegistry) ;
-    }
-
-    /**
-     * Send a response.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendResponse(final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-        InitiatorPortType port = BAInteropClient.getInitiatorPort(addressingProperties, responseAction);
-        port.response();
-    }
-
-    /**
-     * Send a fault.
-     * @param addressingProperties The addressing context.
-     * @param soapFault The SOAP fault.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault11 soapFault)
-        throws SoapFault, IOException
-    {
-        String soapFaultAction = soapFault.getAction() ;
-        AttributedURI actionURI = null;
-        if (soapFaultAction == null)
-        {
-            soapFaultAction = faultAction;
-        }
-        try {
-            actionURI = builder.newURI(soapFaultAction);
-        } catch (URISyntaxException e) {
-            // TODO log error here
-        }
-
-        AddressingHelper.installNoneReplyTo(addressingProperties);
-        SoapFaultClient.sendSoapFault(soapFault, addressingProperties, actionURI);
-    }
-
-    /**
-     * Get the Interop client singleton.
-     * @return The Interop client singleton.
-     */
-    public static InitiatorClient getClient()
-    {
-        return CLIENT ;
-    }
-
-    private static final String faultAction = "http://fabrikam123.com/SoapFault";
-    private static final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.client;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.SoapFault11;
+import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
+import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorPortType;
+
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.AttributedURI;
+import javax.xml.ws.addressing.AddressingBuilder;
+
+/**
+ * The initiator client.
+ * @author kevin
+ */
+public class InitiatorClient
+{
+    /**
+     * The client singleton.
+     */
+    private static final InitiatorClient CLIENT = new InitiatorClient() ;
+    
+    /**
+     * The response action.
+     */
+    private static final String responseAction = BAInteropConstants.INTEROP_ACTION_RESPONSE ;
+    
+    /**
+     * Construct the interop synch client.
+     */
+    private InitiatorClient()
+    {
+        // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+        
+        // Add WS-Addressing
+        // AddressingPolicy.register(handlerRegistry) ;
+        // Add client policies
+        // ClientPolicy.register(handlerRegistry) ;
+        
+        // soapService = new SoapService(handlerRegistry) ;
+    }
+
+    /**
+     * Send a response.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendResponse(final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+        InitiatorPortType port = BAInteropClient.getInitiatorPort(addressingProperties, responseAction);
+        port.response();
+    }
+
+    /**
+     * Send a fault.
+     * @param addressingProperties The addressing context.
+     * @param soapFault The SOAP fault.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault11 soapFault)
+        throws SoapFault, IOException
+    {
+        String soapFaultAction = soapFault.getAction() ;
+        AttributedURI actionURI = null;
+        if (soapFaultAction == null)
+        {
+            soapFaultAction = faultAction;
+        }
+        try {
+            actionURI = builder.newURI(soapFaultAction);
+        } catch (URISyntaxException e) {
+            // TODO log error here
+        }
+
+        AddressingHelper.installNoneReplyTo(addressingProperties);
+        SoapFaultClient.sendSoapFault(soapFault, addressingProperties, actionURI);
+    }
+
+    /**
+     * Get the Interop client singleton.
+     * @return The Interop client singleton.
+     */
+    public static InitiatorClient getClient()
+    {
+        return CLIENT ;
+    }
+
+    private static final String faultAction = "http://fabrikam123.com/SoapFault";
+    private static final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,230 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.client;
-
-import java.io.IOException;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
-
-/**
- * The participant client.
- * @author kevin
- */
-public class SyncParticipantClient
-{
-    /**
-     * The client singleton.
-     */
-    private static final SyncParticipantClient CLIENT = new SyncParticipantClient() ;
-    
-    /**
-     * The cancel action.
-     */
-    private static final String cancelAction = BAInteropConstants.INTEROP_ACTION_CANCEL ;
-    /**
-     * The exit action.
-     */
-    private static final String exitAction = BAInteropConstants.INTEROP_ACTION_EXIT ;
-    /**
-     * The fail action.
-     */
-    private static final String failAction = BAInteropConstants.INTEROP_ACTION_FAIL ;
-    /**
-     * The cannot complete action.
-     */
-    private static final String cannotCompleteAction = BAInteropConstants.INTEROP_ACTION_CANNOT_COMPLETE ;
-    /**
-     * The participant complete close action.
-     */
-    private static final String participantCompleteCloseAction = BAInteropConstants.INTEROP_ACTION_PARTICIPANT_COMPLETE_CLOSE ;
-    /**
-     * The coordinator complete close action.
-     */
-    private static final String coordinatorCompleteCloseAction = BAInteropConstants.INTEROP_ACTION_COORDINATOR_COMPLETE_CLOSE ;
-    /**
-     * The unsolicited complete action.
-     */
-    private static final String unsolicitedCompleteAction = BAInteropConstants.INTEROP_ACTION_UNSOLICITED_COMPLETE ;
-    /**
-     * The compensate action.
-     */
-    private static final String compensateAction = BAInteropConstants.INTEROP_ACTION_COMPENSATE ;
-    /**
-     * The compensation fail action.
-     */
-    private static final String participantCompensationFailAction = BAInteropConstants.INTEROP_ACTION_COMPENSATION_FAIL ;
-    /**
-     * The participant cancel completed race action.
-     */
-    private static final String participantCancelCompletedRaceAction = BAInteropConstants.INTEROP_ACTION_PARTICIPANT_CANCEL_COMPLETED_RACE ;
-    /**
-     * The message loss and recovery action.
-     */
-    private static final String messageLossAndRecoveryAction = BAInteropConstants.INTEROP_ACTION_MESSAGE_LOSS_AND_RECOVERY ;
-    /**
-     * The mixed outcome action.
-     */
-    private static final String mixedOutcomeAction = BAInteropConstants.INTEROP_ACTION_MIXED_OUTCOME ;
-    
-    /**
-     * Construct the interop synch client.
-     */
-    private SyncParticipantClient()
-    {
-    }
-    
-    /**
-     * Send a cancel request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCancel(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a exit request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendExit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a fail request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a cannot complete request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCannotComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a participant complete close request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendParticipantCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a coordinator complete close request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCoordinatorCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a unsolicited complete request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendUnsolicitedComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a compensate request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompensate(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a compensation fail request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendCompensationFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a participant cancel completed race request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendParticipantCancelCompletedRace(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a message loss and recovery request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendMessageLossAndRecovery(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Send a mixed outcome request.
-     * @param coordinationContext The coordination context.
-     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
-     * @throws SoapFault For any errors.
-     * @throws IOException for any transport errors.
-     */
-    public void sendMixedOutcome(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault, IOException
-    {
-    }
-    
-    /**
-     * Get the Interop client singleton.
-     * @return The Interop client singleton.
-     */
-    public static SyncParticipantClient getClient()
-    {
-        return CLIENT ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,250 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.client;
+
+import java.io.IOException;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+import com.arjuna.webservices.SoapFault;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
+
+/**
+ * The participant client.
+ * @author kevin
+ */
+public class SyncParticipantClient
+{
+    /**
+     * The client singleton.
+     */
+    private static final SyncParticipantClient CLIENT = new SyncParticipantClient() ;
+    
+    /**
+     * The cancel action.
+     */
+    private static final String cancelAction = BAInteropConstants.INTEROP_ACTION_CANCEL ;
+    /**
+     * The exit action.
+     */
+    private static final String exitAction = BAInteropConstants.INTEROP_ACTION_EXIT ;
+    /**
+     * The fail action.
+     */
+    private static final String failAction = BAInteropConstants.INTEROP_ACTION_FAIL ;
+    /**
+     * The cannot complete action.
+     */
+    private static final String cannotCompleteAction = BAInteropConstants.INTEROP_ACTION_CANNOT_COMPLETE ;
+    /**
+     * The participant complete close action.
+     */
+    private static final String participantCompleteCloseAction = BAInteropConstants.INTEROP_ACTION_PARTICIPANT_COMPLETE_CLOSE ;
+    /**
+     * The coordinator complete close action.
+     */
+    private static final String coordinatorCompleteCloseAction = BAInteropConstants.INTEROP_ACTION_COORDINATOR_COMPLETE_CLOSE ;
+    /**
+     * The unsolicited complete action.
+     */
+    private static final String unsolicitedCompleteAction = BAInteropConstants.INTEROP_ACTION_UNSOLICITED_COMPLETE ;
+    /**
+     * The compensate action.
+     */
+    private static final String compensateAction = BAInteropConstants.INTEROP_ACTION_COMPENSATE ;
+    /**
+     * The compensation fail action.
+     */
+    private static final String participantCompensationFailAction = BAInteropConstants.INTEROP_ACTION_COMPENSATION_FAIL ;
+    /**
+     * The participant cancel completed race action.
+     */
+    private static final String participantCancelCompletedRaceAction = BAInteropConstants.INTEROP_ACTION_PARTICIPANT_CANCEL_COMPLETED_RACE ;
+    /**
+     * The message loss and recovery action.
+     */
+    private static final String messageLossAndRecoveryAction = BAInteropConstants.INTEROP_ACTION_MESSAGE_LOSS_AND_RECOVERY ;
+    /**
+     * The mixed outcome action.
+     */
+    private static final String mixedOutcomeAction = BAInteropConstants.INTEROP_ACTION_MIXED_OUTCOME ;
+    
+    /**
+     * Construct the interop synch client.
+     */
+    private SyncParticipantClient()
+    {
+    }
+    
+    /**
+     * Send a cancel request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCancel(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a exit request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendExit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a fail request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a cannot complete request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCannotComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a participant complete close request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendParticipantCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a coordinator complete close request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCoordinatorCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a unsolicited complete request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendUnsolicitedComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a compensate request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompensate(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a compensation fail request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendCompensationFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a participant cancel completed race request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendParticipantCancelCompletedRace(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a message loss and recovery request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendMessageLossAndRecovery(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Send a mixed outcome request.
+     * @param coordinationContext The coordination context.
+     * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+     * @throws SoapFault For any errors.
+     * @throws IOException for any transport errors.
+     */
+    public void sendMixedOutcome(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault, IOException
+    {
+    }
+    
+    /**
+     * Get the Interop client singleton.
+     * @return The Interop client singleton.
+     */
+    public static SyncParticipantClient getClient()
+    {
+        return CLIENT ;
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorPortType.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,28 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.bainterop.generated;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebService(name = "InitiatorPortType", targetNamespace = "http://fabrikam123.com/wsba")
-public interface InitiatorPortType {
-
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Response", action = "http://fabrikam123.com/wsba/Response")
-    @Oneway
-    @RequestWrapper(localName = "Response", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void response();
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorPortType.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorPortType.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorPortType.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.bainterop.generated;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebService(name = "InitiatorPortType", targetNamespace = "http://fabrikam123.com/wsba")
+public interface InitiatorPortType {
+
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Response", action = "http://fabrikam123.com/wsba/Response")
+    @Oneway
+    @RequestWrapper(localName = "Response", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void response();
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorService.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorService.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,58 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.bainterop.generated;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebServiceClient(name = "InitiatorService", targetNamespace = "http://fabrikam123.com/wsba", wsdlLocation = "wsdl/interopba-initiator-binding.wsdl")
-public class InitiatorService
-    extends Service
-{
-
-    private final static URL INITIATORSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorService.class.getResource(".");
-            url = new URL(baseUrl, "wsdl/interopba-initiator-binding.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'wsdl/interopba-initiator-binding.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        INITIATORSERVICE_WSDL_LOCATION = url;
-    }
-
-    public InitiatorService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public InitiatorService() {
-        super(INITIATORSERVICE_WSDL_LOCATION, new QName("http://fabrikam123.com/wsba", "InitiatorService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns InitiatorPortType
-     */
-    @WebEndpoint(name = "InitiatorPortType")
-    public InitiatorPortType getInitiatorPortType() {
-        return super.getPort(new QName("http://fabrikam123.com/wsba", "InitiatorPortType"), InitiatorPortType.class);
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorService.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorService.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorService.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/InitiatorService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.bainterop.generated;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebServiceClient(name = "InitiatorService", targetNamespace = "http://fabrikam123.com/wsba", wsdlLocation = "wsdl/interopba-initiator-binding.wsdl")
+public class InitiatorService
+    extends Service
+{
+
+    private final static URL INITIATORSERVICE_WSDL_LOCATION;
+    private final static Logger logger = Logger.getLogger(com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorService.class.getName());
+
+    static {
+        URL url = null;
+        try {
+            URL baseUrl;
+            baseUrl = com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorService.class.getResource(".");
+            url = new URL(baseUrl, "wsdl/interopba-initiator-binding.wsdl");
+        } catch (MalformedURLException e) {
+            logger.warning("Failed to create URL for the wsdl Location: 'wsdl/interopba-initiator-binding.wsdl', retrying as a local file");
+            logger.warning(e.getMessage());
+        }
+        INITIATORSERVICE_WSDL_LOCATION = url;
+    }
+
+    public InitiatorService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public InitiatorService() {
+        super(INITIATORSERVICE_WSDL_LOCATION, new QName("http://fabrikam123.com/wsba", "InitiatorService"));
+    }
+
+    /**
+     * 
+     * @return
+     *     returns InitiatorPortType
+     */
+    @WebEndpoint(name = "InitiatorPortType")
+    public InitiatorPortType getInitiatorPortType() {
+        return super.getPort(new QName("http://fabrikam123.com/wsba", "InitiatorPortType"), InitiatorPortType.class);
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ObjectFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ObjectFactory.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ObjectFactory.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,173 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.bainterop.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.jboss.transaction.txinterop.webservices.bainterop.generated package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
- at XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _ParticipantCompleteClose_QNAME = new QName("http://fabrikam123.com/wsba", "ParticipantCompleteClose");
-    private final static QName _MixedOutcome_QNAME = new QName("http://fabrikam123.com/wsba", "MixedOutcome");
-    private final static QName _Response_QNAME = new QName("http://fabrikam123.com/wsba", "Response");
-    private final static QName _Fail_QNAME = new QName("http://fabrikam123.com/wsba", "Fail");
-    private final static QName _UnsolicitedComplete_QNAME = new QName("http://fabrikam123.com/wsba", "UnsolicitedComplete");
-    private final static QName _CannotComplete_QNAME = new QName("http://fabrikam123.com/wsba", "CannotComplete");
-    private final static QName _Compensate_QNAME = new QName("http://fabrikam123.com/wsba", "Compensate");
-    private final static QName _Exit_QNAME = new QName("http://fabrikam123.com/wsba", "Exit");
-    private final static QName _CoordinatorCompleteClose_QNAME = new QName("http://fabrikam123.com/wsba", "CoordinatorCompleteClose");
-    private final static QName _MessageLossAndRecovery_QNAME = new QName("http://fabrikam123.com/wsba", "MessageLossAndRecovery");
-    private final static QName _ParticipantCancelCompletedRace_QNAME = new QName("http://fabrikam123.com/wsba", "ParticipantCancelCompletedRace");
-    private final static QName _Cancel_QNAME = new QName("http://fabrikam123.com/wsba", "Cancel");
-    private final static QName _CompensationFail_QNAME = new QName("http://fabrikam123.com/wsba", "CompensationFail");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.jboss.transaction.txinterop.webservices.bainterop.generated
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link TestMessageType }
-     * 
-     */
-    public TestMessageType createTestMessageType() {
-        return new TestMessageType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "ParticipantCompleteClose")
-    public JAXBElement<TestMessageType> createParticipantCompleteClose(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_ParticipantCompleteClose_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "MixedOutcome")
-    public JAXBElement<TestMessageType> createMixedOutcome(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_MixedOutcome_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "Response")
-    public JAXBElement<TestMessageType> createResponse(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Response_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "Fail")
-    public JAXBElement<TestMessageType> createFail(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Fail_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "UnsolicitedComplete")
-    public JAXBElement<TestMessageType> createUnsolicitedComplete(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_UnsolicitedComplete_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "CannotComplete")
-    public JAXBElement<TestMessageType> createCannotComplete(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_CannotComplete_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "Compensate")
-    public JAXBElement<TestMessageType> createCompensate(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Compensate_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "Exit")
-    public JAXBElement<TestMessageType> createExit(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Exit_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "CoordinatorCompleteClose")
-    public JAXBElement<TestMessageType> createCoordinatorCompleteClose(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_CoordinatorCompleteClose_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "MessageLossAndRecovery")
-    public JAXBElement<TestMessageType> createMessageLossAndRecovery(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_MessageLossAndRecovery_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "ParticipantCancelCompletedRace")
-    public JAXBElement<TestMessageType> createParticipantCancelCompletedRace(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_ParticipantCancelCompletedRace_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "Cancel")
-    public JAXBElement<TestMessageType> createCancel(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_Cancel_QNAME, TestMessageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "CompensationFail")
-    public JAXBElement<TestMessageType> createCompensationFail(TestMessageType value) {
-        return new JAXBElement<TestMessageType>(_CompensationFail_QNAME, TestMessageType.class, null, value);
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ObjectFactory.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ObjectFactory.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ObjectFactory.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ObjectFactory.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,193 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.bainterop.generated;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the com.jboss.transaction.txinterop.webservices.bainterop.generated package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+ at XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _ParticipantCompleteClose_QNAME = new QName("http://fabrikam123.com/wsba", "ParticipantCompleteClose");
+    private final static QName _MixedOutcome_QNAME = new QName("http://fabrikam123.com/wsba", "MixedOutcome");
+    private final static QName _Response_QNAME = new QName("http://fabrikam123.com/wsba", "Response");
+    private final static QName _Fail_QNAME = new QName("http://fabrikam123.com/wsba", "Fail");
+    private final static QName _UnsolicitedComplete_QNAME = new QName("http://fabrikam123.com/wsba", "UnsolicitedComplete");
+    private final static QName _CannotComplete_QNAME = new QName("http://fabrikam123.com/wsba", "CannotComplete");
+    private final static QName _Compensate_QNAME = new QName("http://fabrikam123.com/wsba", "Compensate");
+    private final static QName _Exit_QNAME = new QName("http://fabrikam123.com/wsba", "Exit");
+    private final static QName _CoordinatorCompleteClose_QNAME = new QName("http://fabrikam123.com/wsba", "CoordinatorCompleteClose");
+    private final static QName _MessageLossAndRecovery_QNAME = new QName("http://fabrikam123.com/wsba", "MessageLossAndRecovery");
+    private final static QName _ParticipantCancelCompletedRace_QNAME = new QName("http://fabrikam123.com/wsba", "ParticipantCancelCompletedRace");
+    private final static QName _Cancel_QNAME = new QName("http://fabrikam123.com/wsba", "Cancel");
+    private final static QName _CompensationFail_QNAME = new QName("http://fabrikam123.com/wsba", "CompensationFail");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.jboss.transaction.txinterop.webservices.bainterop.generated
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link TestMessageType }
+     * 
+     */
+    public TestMessageType createTestMessageType() {
+        return new TestMessageType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "ParticipantCompleteClose")
+    public JAXBElement<TestMessageType> createParticipantCompleteClose(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_ParticipantCompleteClose_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "MixedOutcome")
+    public JAXBElement<TestMessageType> createMixedOutcome(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_MixedOutcome_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "Response")
+    public JAXBElement<TestMessageType> createResponse(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Response_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "Fail")
+    public JAXBElement<TestMessageType> createFail(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Fail_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "UnsolicitedComplete")
+    public JAXBElement<TestMessageType> createUnsolicitedComplete(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_UnsolicitedComplete_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "CannotComplete")
+    public JAXBElement<TestMessageType> createCannotComplete(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_CannotComplete_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "Compensate")
+    public JAXBElement<TestMessageType> createCompensate(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Compensate_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "Exit")
+    public JAXBElement<TestMessageType> createExit(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Exit_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "CoordinatorCompleteClose")
+    public JAXBElement<TestMessageType> createCoordinatorCompleteClose(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_CoordinatorCompleteClose_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "MessageLossAndRecovery")
+    public JAXBElement<TestMessageType> createMessageLossAndRecovery(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_MessageLossAndRecovery_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "ParticipantCancelCompletedRace")
+    public JAXBElement<TestMessageType> createParticipantCancelCompletedRace(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_ParticipantCancelCompletedRace_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "Cancel")
+    public JAXBElement<TestMessageType> createCancel(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_Cancel_QNAME, TestMessageType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TestMessageType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://fabrikam123.com/wsba", name = "CompensationFail")
+    public JAXBElement<TestMessageType> createCompensationFail(TestMessageType value) {
+        return new JAXBElement<TestMessageType>(_CompensationFail_QNAME, TestMessageType.class, null, value);
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantPortType.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,116 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.bainterop.generated;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebService(name = "ParticipantPortType", targetNamespace = "http://fabrikam123.com/wsba")
-public interface ParticipantPortType {
-
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Cancel", action = "http://fabrikam123.com/wsba/Cancel")
-    @Oneway
-    @RequestWrapper(localName = "Cancel", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void cancel();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Exit", action = "http://fabrikam123.com/wsba/Exit")
-    @Oneway
-    @RequestWrapper(localName = "Exit", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void exit();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Fail", action = "http://fabrikam123.com/wsba/Fail")
-    @Oneway
-    @RequestWrapper(localName = "Fail", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void fail();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "CannotComplete", action = "http://fabrikam123.com/wsba/CannotComplete")
-    @Oneway
-    @RequestWrapper(localName = "CannotComplete", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void cannotComplete();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "ParticipantCompleteClose", action = "http://fabrikam123.com/wsba/ParticipantCompleteClose")
-    @Oneway
-    @RequestWrapper(localName = "ParticipantCompleteClose", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void participantCompleteClose();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "CoordinatorCompleteClose", action = "http://fabrikam123.com/wsba/CoordinatorCompleteClose")
-    @Oneway
-    @RequestWrapper(localName = "CoordinatorCompleteClose", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void coordinatorCompleteClose();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "UnsolicitedComplete", action = "http://fabrikam123.com/wsba/UnsolicitedComplete")
-    @Oneway
-    @RequestWrapper(localName = "UnsolicitedComplete", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void unsolicitedComplete();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "Compensate", action = "http://fabrikam123.com/wsba/Compensate")
-    @Oneway
-    @RequestWrapper(localName = "Compensate", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void compensate();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "CompensationFail", action = "http://fabrikam123.com/wsba/CompensationFail")
-    @Oneway
-    @RequestWrapper(localName = "CompensationFail", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void compensationFail();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "ParticipantCancelCompletedRace", action = "http://fabrikam123.com/wsba/ParticipantCancelCompletedRace")
-    @Oneway
-    @RequestWrapper(localName = "ParticipantCancelCompletedRace", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void participantCancelCompletedRace();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "MessageLossAndRecovery", action = "http://fabrikam123.com/wsba/MessageLossAndRecovery")
-    @Oneway
-    @RequestWrapper(localName = "MessageLossAndRecovery", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void messageLossAndRecovery();
-
-    /**
-     * 
-     */
-    @WebMethod(operationName = "MixedOutcome", action = "http://fabrikam123.com/wsba/MixedOutcome")
-    @Oneway
-    @RequestWrapper(localName = "MixedOutcome", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void mixedOutcome();
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantPortType.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantPortType.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantPortType.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantPortType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,136 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.bainterop.generated;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebService(name = "ParticipantPortType", targetNamespace = "http://fabrikam123.com/wsba")
+public interface ParticipantPortType {
+
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Cancel", action = "http://fabrikam123.com/wsba/Cancel")
+    @Oneway
+    @RequestWrapper(localName = "Cancel", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void cancel();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Exit", action = "http://fabrikam123.com/wsba/Exit")
+    @Oneway
+    @RequestWrapper(localName = "Exit", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void exit();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Fail", action = "http://fabrikam123.com/wsba/Fail")
+    @Oneway
+    @RequestWrapper(localName = "Fail", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void fail();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "CannotComplete", action = "http://fabrikam123.com/wsba/CannotComplete")
+    @Oneway
+    @RequestWrapper(localName = "CannotComplete", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void cannotComplete();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "ParticipantCompleteClose", action = "http://fabrikam123.com/wsba/ParticipantCompleteClose")
+    @Oneway
+    @RequestWrapper(localName = "ParticipantCompleteClose", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void participantCompleteClose();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "CoordinatorCompleteClose", action = "http://fabrikam123.com/wsba/CoordinatorCompleteClose")
+    @Oneway
+    @RequestWrapper(localName = "CoordinatorCompleteClose", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void coordinatorCompleteClose();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "UnsolicitedComplete", action = "http://fabrikam123.com/wsba/UnsolicitedComplete")
+    @Oneway
+    @RequestWrapper(localName = "UnsolicitedComplete", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void unsolicitedComplete();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "Compensate", action = "http://fabrikam123.com/wsba/Compensate")
+    @Oneway
+    @RequestWrapper(localName = "Compensate", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void compensate();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "CompensationFail", action = "http://fabrikam123.com/wsba/CompensationFail")
+    @Oneway
+    @RequestWrapper(localName = "CompensationFail", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void compensationFail();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "ParticipantCancelCompletedRace", action = "http://fabrikam123.com/wsba/ParticipantCancelCompletedRace")
+    @Oneway
+    @RequestWrapper(localName = "ParticipantCancelCompletedRace", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void participantCancelCompletedRace();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "MessageLossAndRecovery", action = "http://fabrikam123.com/wsba/MessageLossAndRecovery")
+    @Oneway
+    @RequestWrapper(localName = "MessageLossAndRecovery", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void messageLossAndRecovery();
+
+    /**
+     * 
+     */
+    @WebMethod(operationName = "MixedOutcome", action = "http://fabrikam123.com/wsba/MixedOutcome")
+    @Oneway
+    @RequestWrapper(localName = "MixedOutcome", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void mixedOutcome();
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantService.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantService.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,58 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.bainterop.generated;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
- * 
- */
- at WebServiceClient(name = "ParticipantService", targetNamespace = "http://fabrikam123.com/wsba", wsdlLocation = "wsdl/interopba-participant-binding.wsdl")
-public class ParticipantService
-    extends Service
-{
-
-    private final static URL PARTICIPANTSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantService.class.getResource(".");
-            url = new URL(baseUrl, "wsdl/interopba-participant-binding.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'wsdl/interopba-participant-binding.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        PARTICIPANTSERVICE_WSDL_LOCATION = url;
-    }
-
-    public ParticipantService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public ParticipantService() {
-        super(PARTICIPANTSERVICE_WSDL_LOCATION, new QName("http://fabrikam123.com/wsba", "ParticipantService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns ParticipantPortType
-     */
-    @WebEndpoint(name = "ParticipantPortType")
-    public ParticipantPortType getParticipantPortType() {
-        return super.getPort(new QName("http://fabrikam123.com/wsba", "ParticipantPortType"), ParticipantPortType.class);
-    }
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantService.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantService.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantService.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/ParticipantService.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.bainterop.generated;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.0
+ * 
+ */
+ at WebServiceClient(name = "ParticipantService", targetNamespace = "http://fabrikam123.com/wsba", wsdlLocation = "wsdl/interopba-participant-binding.wsdl")
+public class ParticipantService
+    extends Service
+{
+
+    private final static URL PARTICIPANTSERVICE_WSDL_LOCATION;
+    private final static Logger logger = Logger.getLogger(com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantService.class.getName());
+
+    static {
+        URL url = null;
+        try {
+            URL baseUrl;
+            baseUrl = com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantService.class.getResource(".");
+            url = new URL(baseUrl, "wsdl/interopba-participant-binding.wsdl");
+        } catch (MalformedURLException e) {
+            logger.warning("Failed to create URL for the wsdl Location: 'wsdl/interopba-participant-binding.wsdl', retrying as a local file");
+            logger.warning(e.getMessage());
+        }
+        PARTICIPANTSERVICE_WSDL_LOCATION = url;
+    }
+
+    public ParticipantService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ParticipantService() {
+        super(PARTICIPANTSERVICE_WSDL_LOCATION, new QName("http://fabrikam123.com/wsba", "ParticipantService"));
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ParticipantPortType
+     */
+    @WebEndpoint(name = "ParticipantPortType")
+    public ParticipantPortType getParticipantPortType() {
+        return super.getPort(new QName("http://fabrikam123.com/wsba", "ParticipantPortType"), ParticipantPortType.class);
+    }
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/TestMessageType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/TestMessageType.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/TestMessageType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,32 +0,0 @@
-
-package com.jboss.transaction.txinterop.webservices.bainterop.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TestMessageType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TestMessageType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "TestMessageType")
-public class TestMessageType {
-
-
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/TestMessageType.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/TestMessageType.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/TestMessageType.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/TestMessageType.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package com.jboss.transaction.txinterop.webservices.bainterop.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for TestMessageType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TestMessageType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "TestMessageType")
+public class TestMessageType {
+
+
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/package-info.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/package-info.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/package-info.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,2 +0,0 @@
- at javax.xml.bind.annotation.XmlSchema(namespace = "http://fabrikam123.com/wsba")
-package com.jboss.transaction.txinterop.webservices.bainterop.generated;

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/package-info.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/package-info.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/package-info.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/generated/package-info.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,22 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+ at javax.xml.bind.annotation.XmlSchema(namespace = "http://fabrikam123.com/wsba")
+package com.jboss.transaction.txinterop.webservices.bainterop.generated;

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CancelParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CancelParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CancelParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,9 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.participant;
-
-
-/**
- * The Cancel participant completion participant
- */
-public class CancelParticipant extends ParticipantCompletionParticipantAdapter
-{
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CancelParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CancelParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CancelParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CancelParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.participant;
+
+
+/**
+ * The Cancel participant completion participant
+ */
+public class CancelParticipant extends ParticipantCompletionParticipantAdapter
+{
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CannotCompleteParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CannotCompleteParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CannotCompleteParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,26 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.participant;
-
-import java.util.TimerTask;
-
-import com.arjuna.webservices.util.TransportTimer;
-import com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine;
-
-public class CannotCompleteParticipant extends CoordinatorCompletionParticipantAdapter
-{
-    private CoordinatorCompletionParticipantEngine engine ;
-    
-    public void setEngine(final CoordinatorCompletionParticipantEngine engine)
-    {
-	this.engine = engine ;
-    }
-    
-    public void initialiseTimeout()
-    {
-        final TimerTask timerTask = new TimerTask() {
-            public void run() {
-                engine.cannotComplete() ;
-            }
-        } ;
-        TransportTimer.getTimer().schedule(timerTask, 2000) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CannotCompleteParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CannotCompleteParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CannotCompleteParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CannotCompleteParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.participant;
+
+import java.util.TimerTask;
+
+import com.arjuna.webservices.util.TransportTimer;
+import com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine;
+
+public class CannotCompleteParticipant extends CoordinatorCompletionParticipantAdapter
+{
+    private CoordinatorCompletionParticipantEngine engine ;
+    
+    public void setEngine(final CoordinatorCompletionParticipantEngine engine)
+    {
+	this.engine = engine ;
+    }
+    
+    public void initialiseTimeout()
+    {
+        final TimerTask timerTask = new TimerTask() {
+            public void run() {
+                engine.cannotComplete() ;
+            }
+        } ;
+        TransportTimer.getTimer().schedule(timerTask, 2000) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CompletedParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CompletedParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CompletedParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,26 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.participant;
-
-import java.util.TimerTask;
-
-import com.arjuna.webservices.util.TransportTimer;
-import com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine;
-
-public class CompletedParticipant extends ParticipantCompletionParticipantAdapter
-{
-    private ParticipantCompletionParticipantEngine engine ;
-    
-    public void setEngine(final ParticipantCompletionParticipantEngine engine)
-    {
-	this.engine = engine ;
-    }
-    
-    public void initialiseTimeout()
-    {
-        final TimerTask timerTask = new TimerTask() {
-            public void run() {
-                engine.completed() ;
-            }
-        } ;
-        TransportTimer.getTimer().schedule(timerTask, 2000) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CompletedParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CompletedParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CompletedParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CompletedParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.participant;
+
+import java.util.TimerTask;
+
+import com.arjuna.webservices.util.TransportTimer;
+import com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine;
+
+public class CompletedParticipant extends ParticipantCompletionParticipantAdapter
+{
+    private ParticipantCompletionParticipantEngine engine ;
+    
+    public void setEngine(final ParticipantCompletionParticipantEngine engine)
+    {
+	this.engine = engine ;
+    }
+    
+    public void initialiseTimeout()
+    {
+        final TimerTask timerTask = new TimerTask() {
+            public void run() {
+                engine.completed() ;
+            }
+        } ;
+        TransportTimer.getTimer().schedule(timerTask, 2000) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompleteCloseParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompleteCloseParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompleteCloseParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,6 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.participant;
-
-
-public class CoordinatorCompleteCloseParticipant extends CoordinatorCompletionParticipantAdapter
-{
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompleteCloseParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompleteCloseParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompleteCloseParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompleteCloseParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.participant;
+
+
+public class CoordinatorCompleteCloseParticipant extends CoordinatorCompletionParticipantAdapter
+{
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompletionParticipantAdapter.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompletionParticipantAdapter.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompletionParticipantAdapter.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,13 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.participant;
-
-import com.arjuna.wst.BusinessAgreementWithCoordinatorCompletionParticipant;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.WrongStateException;
-
-class CoordinatorCompletionParticipantAdapter extends ParticipantCompletionParticipantAdapter implements BusinessAgreementWithCoordinatorCompletionParticipant
-{
-    public void complete()
-        throws WrongStateException, SystemException
-    {
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompletionParticipantAdapter.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompletionParticipantAdapter.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompletionParticipantAdapter.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/CoordinatorCompletionParticipantAdapter.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.participant;
+
+import com.arjuna.wst.BusinessAgreementWithCoordinatorCompletionParticipant;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.WrongStateException;
+
+class CoordinatorCompletionParticipantAdapter extends ParticipantCompletionParticipantAdapter implements BusinessAgreementWithCoordinatorCompletionParticipant
+{
+    public void complete()
+        throws WrongStateException, SystemException
+    {
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/DropFirstCompensateParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/DropFirstCompensateParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/DropFirstCompensateParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,20 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.participant;
-
-import com.arjuna.wst.FaultedException;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.WrongStateException;
-
-public class DropFirstCompensateParticipant extends CoordinatorCompletionParticipantAdapter
-{
-    private boolean dropped ;
-    
-    public synchronized void compensate()
-    	throws FaultedException, WrongStateException, SystemException
-    {
-	if (!dropped)
-	{
-	    dropped = true ;
-	    throw new SystemException("Dropping compensate") ;
-	}
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/DropFirstCompensateParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/DropFirstCompensateParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/DropFirstCompensateParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/DropFirstCompensateParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.participant;
+
+import com.arjuna.wst.FaultedException;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.WrongStateException;
+
+public class DropFirstCompensateParticipant extends CoordinatorCompletionParticipantAdapter
+{
+    private boolean dropped ;
+    
+    public synchronized void compensate()
+    	throws FaultedException, WrongStateException, SystemException
+    {
+	if (!dropped)
+	{
+	    dropped = true ;
+	    throw new SystemException("Dropping compensate") ;
+	}
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ExitParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ExitParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ExitParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,26 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.participant;
-
-import java.util.TimerTask;
-
-import com.arjuna.webservices.util.TransportTimer;
-import com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine;
-
-public class ExitParticipant extends CoordinatorCompletionParticipantAdapter
-{
-    private CoordinatorCompletionParticipantEngine engine ;
-    
-    public void setEngine(final CoordinatorCompletionParticipantEngine engine)
-    {
-	this.engine = engine ;
-    }
-    
-    public void initialiseTimeout()
-    {
-        final TimerTask timerTask = new TimerTask() {
-            public void run() {
-                engine.exit() ;
-            }
-        } ;
-        TransportTimer.getTimer().schedule(timerTask, 2000) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ExitParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ExitParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ExitParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ExitParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.participant;
+
+import java.util.TimerTask;
+
+import com.arjuna.webservices.util.TransportTimer;
+import com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine;
+
+public class ExitParticipant extends CoordinatorCompletionParticipantAdapter
+{
+    private CoordinatorCompletionParticipantEngine engine ;
+    
+    public void setEngine(final CoordinatorCompletionParticipantEngine engine)
+    {
+	this.engine = engine ;
+    }
+    
+    public void initialiseTimeout()
+    {
+        final TimerTask timerTask = new TimerTask() {
+            public void run() {
+                engine.exit() ;
+            }
+        } ;
+        TransportTimer.getTimer().schedule(timerTask, 2000) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,27 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.participant;
-
-import java.util.TimerTask;
-
-import com.arjuna.webservices.util.TransportTimer;
-import com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine;
-import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
-
-public class FailParticipant extends ParticipantCompletionParticipantAdapter
-{
-    private ParticipantCompletionParticipantEngine engine ;
-    
-    public void setEngine(final ParticipantCompletionParticipantEngine engine)
-    {
-	this.engine = engine ;
-    }
-    
-    public void initialiseTimeout()
-    {
-        final TimerTask timerTask = new TimerTask() {
-            public void run() {
-                engine.fail(BAInteropConstants.INTEROP_ELEMENT_QNAME_FAIL) ;
-            }
-        } ;
-        TransportTimer.getTimer().schedule(timerTask, 2000) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.participant;
+
+import java.util.TimerTask;
+
+import com.arjuna.webservices.util.TransportTimer;
+import com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine;
+import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
+
+public class FailParticipant extends ParticipantCompletionParticipantAdapter
+{
+    private ParticipantCompletionParticipantEngine engine ;
+    
+    public void setEngine(final ParticipantCompletionParticipantEngine engine)
+    {
+	this.engine = engine ;
+    }
+    
+    public void initialiseTimeout()
+    {
+        final TimerTask timerTask = new TimerTask() {
+            public void run() {
+                engine.fail(BAInteropConstants.INTEROP_ELEMENT_QNAME_FAIL) ;
+            }
+        } ;
+        TransportTimer.getTimer().schedule(timerTask, 2000) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailedCompensateParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailedCompensateParticipant.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailedCompensateParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,14 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.participant;
-
-import com.arjuna.wst.FaultedException;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.WrongStateException;
-
-public class FailedCompensateParticipant extends CompletedParticipant
-{
-    public void compensate()
-    	throws FaultedException, WrongStateException, SystemException
-    {
-	throw new FaultedException() ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailedCompensateParticipant.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailedCompensateParticipant.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailedCompensateParticipant.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/FailedCompensateParticipant.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.participant;
+
+import com.arjuna.wst.FaultedException;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.WrongStateException;
+
+public class FailedCompensateParticipant extends CompletedParticipant
+{
+    public void compensate()
+    	throws FaultedException, WrongStateException, SystemException
+    {
+	throw new FaultedException() ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ParticipantCompletionParticipantAdapter.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ParticipantCompletionParticipantAdapter.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ParticipantCompletionParticipantAdapter.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,40 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.participant;
-
-import com.arjuna.wst.BusinessAgreementWithParticipantCompletionParticipant;
-import com.arjuna.wst.FaultedException;
-import com.arjuna.wst.SystemException;
-import com.arjuna.wst.WrongStateException;
-
-class ParticipantCompletionParticipantAdapter implements BusinessAgreementWithParticipantCompletionParticipant
-{
-    public void cancel()
-    	throws WrongStateException, SystemException
-    {
-    }
-
-    public void close()
-    	throws WrongStateException, SystemException
-    {
-    }
-
-    public void compensate()
-    	throws FaultedException, WrongStateException, SystemException
-    {
-    }
-
-    public void error()
-    	throws SystemException
-    {
-    }
-
-    public String status()
-    	throws SystemException
-    {
-	return null ;
-    }
-
-    public void unknown()
-    	throws SystemException
-    {
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ParticipantCompletionParticipantAdapter.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ParticipantCompletionParticipantAdapter.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ParticipantCompletionParticipantAdapter.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/participant/ParticipantCompletionParticipantAdapter.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.participant;
+
+import com.arjuna.wst.BusinessAgreementWithParticipantCompletionParticipant;
+import com.arjuna.wst.FaultedException;
+import com.arjuna.wst.SystemException;
+import com.arjuna.wst.WrongStateException;
+
+class ParticipantCompletionParticipantAdapter implements BusinessAgreementWithParticipantCompletionParticipant
+{
+    public void cancel()
+    	throws WrongStateException, SystemException
+    {
+    }
+
+    public void close()
+    	throws WrongStateException, SystemException
+    {
+    }
+
+    public void compensate()
+    	throws FaultedException, WrongStateException, SystemException
+    {
+    }
+
+    public void error()
+    	throws SystemException
+    {
+    }
+
+    public String status()
+    	throws SystemException
+    {
+	return null ;
+    }
+
+    public void unknown()
+    	throws SystemException
+    {
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag.  All rights reserved. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.txinterop.webservices.bainterop.processors;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.base.processors.Callback;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The callback for the initiator client.
- * @author kevin
- */
-public abstract class BAInitiatorCallback extends Callback
-{
-    /**
-     * A response.
-     * @param addressingProperties The current addressing context.
-     */
-    public abstract void response(final AddressingProperties addressingProperties) ;
-
-    /**
-     * A SOAP fault response.
-     * @param soapFault The SOAP fault response.
-     * @param addressingProperties The current addressing context.
-     */
-    public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties) ;
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag.  All rights reserved. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.processors;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.base.processors.Callback;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The callback for the initiator client.
+ * @author kevin
+ */
+public abstract class BAInitiatorCallback extends Callback
+{
+    /**
+     * A response.
+     * @param addressingProperties The current addressing context.
+     */
+    public abstract void response(final AddressingProperties addressingProperties) ;
+
+    /**
+     * A SOAP fault response.
+     * @param soapFault The SOAP fault response.
+     * @param addressingProperties The current addressing context.
+     */
+    public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties) ;
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag.  All rights reserved. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.txinterop.webservices.bainterop.processors;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.base.processors.Callback;
-import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The Initiator processor.
- * @author kevin
- */
-public class BAInitiatorProcessor extends BaseWSAddrResponseProcessor
-{
-    /**
-     * The initiator singleton.
-     */
-    private static final BAInitiatorProcessor INITIATOR = new BAInitiatorProcessor() ;
-    
-    /**
-     * Get the initiator singleton.
-     * @return The singleton.
-     */
-    public static BAInitiatorProcessor getInitiator()
-    {
-        return INITIATOR ;
-    }
-
-    /**
-     * Handle a response response.
-     * @param addressingProperties The current addressing context.
-     */
-    public void handleResponse(final AddressingProperties addressingProperties)
-    {
-        handleCallbacks(new CallbackExecutorAdapter() {
-            public void execute(final Callback callback) {
-                ((BAInitiatorCallback)callback).response(addressingProperties) ;
-            }
-        }, getIDs(addressingProperties)) ;
-    }
-
-    /**
-     * Register a SOAP fault response.
-     * @param soapFault The SOAP fault response.
-     * @param addressingProperties The current addressing context.
-     */
-    public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
-    {
-        handleCallbacks(new CallbackExecutorAdapter() {
-            public void execute(final Callback callback) {
-                ((BAInitiatorCallback)callback).soapFault(soapFault, addressingProperties) ;
-            }
-        }, getIDs(addressingProperties)) ;
-    }
-
-    /**
-     * Register a callback for the specific message id.
-     * @param messageID The message ID.
-     * @param callback The callback for the response.
-     */
-    public void registerCallback(final String messageID, final BAInitiatorCallback callback)
-    {
-        register(messageID, callback) ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag.  All rights reserved. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.processors;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.base.processors.Callback;
+import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The Initiator processor.
+ * @author kevin
+ */
+public class BAInitiatorProcessor extends BaseWSAddrResponseProcessor
+{
+    /**
+     * The initiator singleton.
+     */
+    private static final BAInitiatorProcessor INITIATOR = new BAInitiatorProcessor() ;
+    
+    /**
+     * Get the initiator singleton.
+     * @return The singleton.
+     */
+    public static BAInitiatorProcessor getInitiator()
+    {
+        return INITIATOR ;
+    }
+
+    /**
+     * Handle a response response.
+     * @param addressingProperties The current addressing context.
+     */
+    public void handleResponse(final AddressingProperties addressingProperties)
+    {
+        handleCallbacks(new CallbackExecutorAdapter() {
+            public void execute(final Callback callback) {
+                ((BAInitiatorCallback)callback).response(addressingProperties) ;
+            }
+        }, getIDs(addressingProperties)) ;
+    }
+
+    /**
+     * Register a SOAP fault response.
+     * @param soapFault The SOAP fault response.
+     * @param addressingProperties The current addressing context.
+     */
+    public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+    {
+        handleCallbacks(new CallbackExecutorAdapter() {
+            public void execute(final Callback callback) {
+                ((BAInitiatorCallback)callback).soapFault(soapFault, addressingProperties) ;
+            }
+        }, getIDs(addressingProperties)) ;
+    }
+
+    /**
+     * Register a callback for the specific message id.
+     * @param messageID The message ID.
+     * @param callback The callback for the response.
+     */
+    public void registerCallback(final String messageID, final BAInitiatorCallback callback)
+    {
+        register(messageID, callback) ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,304 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag.  All rights reserved. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.jboss.transaction.txinterop.webservices.bainterop.processors;
-
-import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine;
-import com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine;
-import com.arjuna.webservices11.SoapFault11;
-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;
-import com.jboss.transaction.txinterop.webservices.bainterop.participant.DropFirstCompensateParticipant;
-import com.jboss.transaction.txinterop.webservices.bainterop.participant.ExitParticipant;
-import com.jboss.transaction.txinterop.webservices.bainterop.participant.FailParticipant;
-import com.jboss.transaction.txinterop.webservices.bainterop.participant.CannotCompleteParticipant;
-import com.jboss.transaction.txinterop.webservices.bainterop.participant.CompletedParticipant;
-import com.jboss.transaction.txinterop.webservices.bainterop.participant.FailedCompensateParticipant;
-
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
- * The Participant processor.
- * @author kevin
- */
-public class BAParticipantProcessor
-{
-    /**
-     * The participant.
-     */
-    private static BAParticipantProcessor PARTICIPANT = new BAParticipantProcessor() ;
-    
-    /**
-     * Get the participant.
-     * @return The participant.
-     */
-    public static BAParticipantProcessor getParticipant()
-    {
-        return PARTICIPANT ;
-    }
-    
-    /**
-     * Execute the Cancel
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void cancel(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            BAInteropUtil.registerParticipantCompletion(coordinationContext, new CancelParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Exit
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void exit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final ExitParticipant participant = new ExitParticipant() ;
-            final CoordinatorCompletionParticipantEngine engine = BAInteropUtil.registerCoordinatorCompletion(coordinationContext, participant, new Uid().toString()) ;
-            participant.setEngine(engine) ;
-            participant.initialiseTimeout() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Fail
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void fail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final FailParticipant participant = new FailParticipant() ;
-            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
-            participant.setEngine(engine) ;
-            participant.initialiseTimeout() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the CannotComplete
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void cannotComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CannotCompleteParticipant participant = new CannotCompleteParticipant() ;
-            final CoordinatorCompletionParticipantEngine engine = BAInteropUtil.registerCoordinatorCompletion(coordinationContext, participant, new Uid().toString()) ;
-            participant.setEngine(engine) ;
-            participant.initialiseTimeout() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the ParticipantCompleteClose
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void participantCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CompletedParticipant participant = new CompletedParticipant() ;
-            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
-            participant.setEngine(engine) ;
-            participant.initialiseTimeout() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the CoordinatorCompleteClose
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void coordinatorCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            BAInteropUtil.registerCoordinatorCompletion(coordinationContext, new CoordinatorCompleteCloseParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the UnsolicitedComplete
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void unsolicitedComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CompletedParticipant participant = new CompletedParticipant() ;
-            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
-            participant.setEngine(engine) ;
-            participant.initialiseTimeout() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the Compensate
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void compensate(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CompletedParticipant participant = new CompletedParticipant() ;
-            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
-            participant.setEngine(engine) ;
-            participant.initialiseTimeout() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the ParticipantCompensationFail
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void participantCompensationFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final FailedCompensateParticipant participant = new FailedCompensateParticipant() ;
-            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
-            participant.setEngine(engine) ;
-            participant.initialiseTimeout() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the ParticipantCancelCompletedRace
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void participantCancelCompletedRace(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            final CompletedParticipant participant = new CompletedParticipant() ;
-            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
-            participant.setEngine(engine) ;
-            participant.initialiseTimeout() ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the MessageLossAndRecovery
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void messageLossAndRecovery(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-        try
-        {
-            BAInteropUtil.registerCoordinatorCompletion(coordinationContext, new DropFirstCompensateParticipant(), new Uid().toString()) ;
-        }
-        catch (final Throwable th)
-        {
-            throw new SoapFault11(th) ;
-        }
-    }
-    
-    /**
-     * Execute the MixedOutcome
-     * @param addressingProperties The current addressing context.
-     * @return The response.
-     * @throws SoapFault11 for errors during processing
-     */
-    public void mixedOutcome(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
-        throws SoapFault11
-    {
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,304 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag.  All rights reserved. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.processors;
+
+import com.arjuna.ats.arjuna.common.Uid;
+import com.arjuna.webservices.SoapFault;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine;
+import com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine;
+import com.arjuna.webservices11.SoapFault11;
+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;
+import com.jboss.transaction.txinterop.webservices.bainterop.participant.DropFirstCompensateParticipant;
+import com.jboss.transaction.txinterop.webservices.bainterop.participant.ExitParticipant;
+import com.jboss.transaction.txinterop.webservices.bainterop.participant.FailParticipant;
+import com.jboss.transaction.txinterop.webservices.bainterop.participant.CannotCompleteParticipant;
+import com.jboss.transaction.txinterop.webservices.bainterop.participant.CompletedParticipant;
+import com.jboss.transaction.txinterop.webservices.bainterop.participant.FailedCompensateParticipant;
+
+import javax.xml.ws.addressing.AddressingProperties;
+
+/**
+ * The Participant processor.
+ * @author kevin
+ */
+public class BAParticipantProcessor
+{
+    /**
+     * The participant.
+     */
+    private static BAParticipantProcessor PARTICIPANT = new BAParticipantProcessor() ;
+    
+    /**
+     * Get the participant.
+     * @return The participant.
+     */
+    public static BAParticipantProcessor getParticipant()
+    {
+        return PARTICIPANT ;
+    }
+    
+    /**
+     * Execute the Cancel
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void cancel(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            BAInteropUtil.registerParticipantCompletion(coordinationContext, new CancelParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Exit
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void exit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final ExitParticipant participant = new ExitParticipant() ;
+            final CoordinatorCompletionParticipantEngine engine = BAInteropUtil.registerCoordinatorCompletion(coordinationContext, participant, new Uid().toString()) ;
+            participant.setEngine(engine) ;
+            participant.initialiseTimeout() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Fail
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void fail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final FailParticipant participant = new FailParticipant() ;
+            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
+            participant.setEngine(engine) ;
+            participant.initialiseTimeout() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the CannotComplete
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void cannotComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CannotCompleteParticipant participant = new CannotCompleteParticipant() ;
+            final CoordinatorCompletionParticipantEngine engine = BAInteropUtil.registerCoordinatorCompletion(coordinationContext, participant, new Uid().toString()) ;
+            participant.setEngine(engine) ;
+            participant.initialiseTimeout() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the ParticipantCompleteClose
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void participantCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CompletedParticipant participant = new CompletedParticipant() ;
+            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
+            participant.setEngine(engine) ;
+            participant.initialiseTimeout() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the CoordinatorCompleteClose
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void coordinatorCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            BAInteropUtil.registerCoordinatorCompletion(coordinationContext, new CoordinatorCompleteCloseParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the UnsolicitedComplete
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void unsolicitedComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CompletedParticipant participant = new CompletedParticipant() ;
+            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
+            participant.setEngine(engine) ;
+            participant.initialiseTimeout() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the Compensate
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void compensate(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CompletedParticipant participant = new CompletedParticipant() ;
+            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
+            participant.setEngine(engine) ;
+            participant.initialiseTimeout() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the ParticipantCompensationFail
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void participantCompensationFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final FailedCompensateParticipant participant = new FailedCompensateParticipant() ;
+            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
+            participant.setEngine(engine) ;
+            participant.initialiseTimeout() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the ParticipantCancelCompletedRace
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void participantCancelCompletedRace(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            final CompletedParticipant participant = new CompletedParticipant() ;
+            final ParticipantCompletionParticipantEngine engine = BAInteropUtil.registerParticipantCompletion(coordinationContext, participant, new Uid().toString()) ;
+            participant.setEngine(engine) ;
+            participant.initialiseTimeout() ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the MessageLossAndRecovery
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void messageLossAndRecovery(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+        try
+        {
+            BAInteropUtil.registerCoordinatorCompletion(coordinationContext, new DropFirstCompensateParticipant(), new Uid().toString()) ;
+        }
+        catch (final Throwable th)
+        {
+            throw new SoapFault11(th) ;
+        }
+    }
+    
+    /**
+     * Execute the MixedOutcome
+     * @param addressingProperties The current addressing context.
+     * @return The response.
+     * @throws SoapFault11 for errors during processing
+     */
+    public void mixedOutcome(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+        throws SoapFault11
+    {
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,57 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.sei;
-
-import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
-import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAInitiatorProcessor;
-
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
-import javax.xml.ws.handler.MessageContext;
-import javax.annotation.Resource;
-
-/**
- * Implementor class for OASIS WS-Interop 1.1 Initiator Service
- */
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.*;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-
-
-/**
- * Implementation class for WSTX 1.1 AT Interop Test Initiator service
- */
- at WebService(name = "InitiatorPortType",
-        targetNamespace = "http://fabrikam123.com/wsba",
-        portName = "InitiatorPortType",
-        wsdlLocation="/WEB-INF/wsdl/interopba-initiator-binding.wsdl",
-        serviceName="InitiatorService")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="initiatorhandlers.xml")
-public class InitiatorPortTypeImpl {
-
-    /**
-     * injected resource providing access to WSA addressing properties
-     */
-    @Resource
-    private WebServiceContext webServiceCtx;
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Response", action = "http://fabrikam123.com/wsba/Response")
-    @Oneway
-    @RequestWrapper(localName = "Response", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void response()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-
-        BAInitiatorProcessor.getInitiator().handleResponse(inboundAddressProperties) ;
-    }
-
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.sei;
+
+import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
+import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAInitiatorProcessor;
+
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.handler.MessageContext;
+import javax.annotation.Resource;
+
+/**
+ * Implementor class for OASIS WS-Interop 1.1 Initiator Service
+ */
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.*;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+
+
+/**
+ * Implementation class for WSTX 1.1 AT Interop Test Initiator service
+ */
+ at WebService(name = "InitiatorPortType",
+        targetNamespace = "http://fabrikam123.com/wsba",
+        portName = "InitiatorPortType",
+        wsdlLocation="/WEB-INF/wsdl/interopba-initiator-binding.wsdl",
+        serviceName="InitiatorService")
+// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
+ at HandlerChain(file="initiatorhandlers.xml")
+public class InitiatorPortTypeImpl {
+
+    /**
+     * injected resource providing access to WSA addressing properties
+     */
+    @Resource
+    private WebServiceContext webServiceCtx;
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Response", action = "http://fabrikam123.com/wsba/Response")
+    @Oneway
+    @RequestWrapper(localName = "Response", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void response()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+
+        BAInitiatorProcessor.getInitiator().handleResponse(inboundAddressProperties) ;
+    }
+
+}
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/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-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,319 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.sei;
-
-import com.jboss.transaction.txinterop.webservices.bainterop.client.InitiatorClient;
-import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAParticipantProcessor;
-import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.wsc11.messaging.MessageId;
-
-import javax.jws.*;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.ProtocolException;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
-import javax.xml.ws.handler.MessageContext;
-import javax.annotation.Resource;
-
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContext;
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-
-import java.net.URI;
-
-
-/**
- * Implementation class for WSTX 1.1 AT Interop Test Initiator service
- */
- at WebService(name = "ParticipantPortType",
-        targetNamespace = "http://fabrikam123.com/wsba",
-        portName="ParticipantPortType",
-        wsdlLocation="/WEB-INF/wsdl/interopba-participant-binding.wsdl",
-        serviceName="ParticipantService")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="participanthandlers.xml")
-public class ParticipantPortTypeImpl {
-
-    /**
-     * injected resource providing access to WSA addressing properties
-     */
-    @Resource
-    private WebServiceContext webServiceCtx;
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Cancel", action = "http://fabrikam123.com/wsba/Cancel")
-    @Oneway
-    @RequestWrapper(localName = "Cancel", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void cancel()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().cancel(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Exit", action = "http://fabrikam123.com/wsba/Exit")
-    @Oneway
-    @RequestWrapper(localName = "Exit", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void exit()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().exit(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Fail", action = "http://fabrikam123.com/wsba/Fail")
-    @Oneway
-    @RequestWrapper(localName = "Fail", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void fail()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().fail(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "CannotComplete", action = "http://fabrikam123.com/wsba/CannotComplete")
-    @Oneway
-    @RequestWrapper(localName = "CannotComplete", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void cannotComplete()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().cannotComplete(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "ParticipantCompleteClose", action = "http://fabrikam123.com/wsba/ParticipantCompleteClose")
-    @Oneway
-    @RequestWrapper(localName = "ParticipantCompleteClose", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void participantCompleteClose()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().participantCompleteClose(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "CoordinatorCompleteClose", action = "http://fabrikam123.com/wsba/CoordinatorCompleteClose")
-    @Oneway
-    @RequestWrapper(localName = "CoordinatorCompleteClose", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void coordinatorCompleteClose()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().coordinatorCompleteClose(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "UnsolicitedComplete", action = "http://fabrikam123.com/wsba/UnsolicitedComplete")
-    @Oneway
-    @RequestWrapper(localName = "UnsolicitedComplete", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void unsolicitedComplete()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().unsolicitedComplete(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "Compensate", action = "http://fabrikam123.com/wsba/Compensate")
-    @Oneway
-    @RequestWrapper(localName = "Compensate", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void compensate()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().compensate(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "CompensationFail", action = "http://fabrikam123.com/wsba/CompensationFail")
-    @Oneway
-    @RequestWrapper(localName = "CompensationFail", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void compensationFail()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().participantCompensationFail(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "ParticipantCancelCompletedRace", action = "http://fabrikam123.com/wsba/ParticipantCancelCompletedRace")
-    @Oneway
-    @RequestWrapper(localName = "ParticipantCancelCompletedRace", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void participantCancelCompletedRace()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().participantCancelCompletedRace(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "MessageLossAndRecovery", action = "http://fabrikam123.com/wsba/MessageLossAndRecovery")
-    @Oneway
-    @RequestWrapper(localName = "MessageLossAndRecovery", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void messageLossAndRecovery()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().messageLossAndRecovery(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     *
-     */
-    @WebMethod(operationName = "MixedOutcome", action = "http://fabrikam123.com/wsba/MixedOutcome")
-    @Oneway
-    @RequestWrapper(localName = "MixedOutcome", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
-    public void mixedOutcome()
-    {
-        MessageContext ctx = webServiceCtx.getMessageContext();
-        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
-        try {
-            BAParticipantProcessor.getParticipant().mixedOutcome(coordinationContext, inboundAddressProperties);
-        } catch (SoapFault11 sf) {
-            sendSoapFault(inboundAddressProperties, sf);
-            return;
-        }
-        sendResponse(inboundAddressProperties);
-    }
-
-    /**
-     * send an acknowledgement notifying a successfuly processed request
-     *
-     * @param inboundAddressProperties identifes who to reply to and what message id the response should relate to
-     */
-    private void sendResponse(AddressingProperties inboundAddressProperties)
-    {
-        AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
-
-        try {
-            InitiatorClient.getClient().sendResponse(outboundAddressProperties);
-        } catch (Throwable th) {
-            URI uri = outboundAddressProperties.getTo().getURI();
-            System.out.println("com.jboss.transaction.txinterop.webservices.bainterop.sei.ParticipantPortTypeImpl_1: unable to send response to " + uri);
-            throw new ProtocolException(th);
-        }
-    }
-
-    /**
-     * send a soap fault notifying an unsuccessfuly processed request
-     *
-     * @param inboundAddressProperties identifes who to reply to and what message id the fault message should relate to
-     */
-    private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
-    {
-        AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
-
-        try {
-            InitiatorClient.getClient().sendSoapFault(outboundAddressProperties, sf);
-        } catch (Throwable th) {
-            System.out.println("com.jboss.transaction.txinterop.webservices.bainterop.sei.ParticipantPortTypeImpl_2: unable to log soap fault " + sf);
-            throw new ProtocolException(th);
-        }
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,339 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.sei;
+
+import com.jboss.transaction.txinterop.webservices.bainterop.client.InitiatorClient;
+import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAParticipantProcessor;
+import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.wsc11.messaging.MessageId;
+
+import javax.jws.*;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.ProtocolException;
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.handler.MessageContext;
+import javax.annotation.Resource;
+
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContext;
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+
+import java.net.URI;
+
+
+/**
+ * Implementation class for WSTX 1.1 AT Interop Test Initiator service
+ */
+ at WebService(name = "ParticipantPortType",
+        targetNamespace = "http://fabrikam123.com/wsba",
+        portName="ParticipantPortType",
+        wsdlLocation="/WEB-INF/wsdl/interopba-participant-binding.wsdl",
+        serviceName="ParticipantService")
+// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
+ at HandlerChain(file="participanthandlers.xml")
+public class ParticipantPortTypeImpl {
+
+    /**
+     * injected resource providing access to WSA addressing properties
+     */
+    @Resource
+    private WebServiceContext webServiceCtx;
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Cancel", action = "http://fabrikam123.com/wsba/Cancel")
+    @Oneway
+    @RequestWrapper(localName = "Cancel", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void cancel()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().cancel(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Exit", action = "http://fabrikam123.com/wsba/Exit")
+    @Oneway
+    @RequestWrapper(localName = "Exit", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void exit()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().exit(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Fail", action = "http://fabrikam123.com/wsba/Fail")
+    @Oneway
+    @RequestWrapper(localName = "Fail", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void fail()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().fail(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "CannotComplete", action = "http://fabrikam123.com/wsba/CannotComplete")
+    @Oneway
+    @RequestWrapper(localName = "CannotComplete", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void cannotComplete()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().cannotComplete(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "ParticipantCompleteClose", action = "http://fabrikam123.com/wsba/ParticipantCompleteClose")
+    @Oneway
+    @RequestWrapper(localName = "ParticipantCompleteClose", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void participantCompleteClose()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().participantCompleteClose(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "CoordinatorCompleteClose", action = "http://fabrikam123.com/wsba/CoordinatorCompleteClose")
+    @Oneway
+    @RequestWrapper(localName = "CoordinatorCompleteClose", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void coordinatorCompleteClose()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().coordinatorCompleteClose(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "UnsolicitedComplete", action = "http://fabrikam123.com/wsba/UnsolicitedComplete")
+    @Oneway
+    @RequestWrapper(localName = "UnsolicitedComplete", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void unsolicitedComplete()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().unsolicitedComplete(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "Compensate", action = "http://fabrikam123.com/wsba/Compensate")
+    @Oneway
+    @RequestWrapper(localName = "Compensate", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void compensate()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().compensate(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "CompensationFail", action = "http://fabrikam123.com/wsba/CompensationFail")
+    @Oneway
+    @RequestWrapper(localName = "CompensationFail", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void compensationFail()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().participantCompensationFail(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "ParticipantCancelCompletedRace", action = "http://fabrikam123.com/wsba/ParticipantCancelCompletedRace")
+    @Oneway
+    @RequestWrapper(localName = "ParticipantCancelCompletedRace", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void participantCancelCompletedRace()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().participantCancelCompletedRace(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "MessageLossAndRecovery", action = "http://fabrikam123.com/wsba/MessageLossAndRecovery")
+    @Oneway
+    @RequestWrapper(localName = "MessageLossAndRecovery", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void messageLossAndRecovery()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().messageLossAndRecovery(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     *
+     */
+    @WebMethod(operationName = "MixedOutcome", action = "http://fabrikam123.com/wsba/MixedOutcome")
+    @Oneway
+    @RequestWrapper(localName = "MixedOutcome", targetNamespace = "http://fabrikam123.com/wsba", className = "com.jboss.transaction.txinterop.webservices.bainterop.generated.TestMessageType")
+    public void mixedOutcome()
+    {
+        MessageContext ctx = webServiceCtx.getMessageContext();
+        AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+        CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
+        try {
+            BAParticipantProcessor.getParticipant().mixedOutcome(coordinationContext, inboundAddressProperties);
+        } catch (SoapFault11 sf) {
+            sendSoapFault(inboundAddressProperties, sf);
+            return;
+        }
+        sendResponse(inboundAddressProperties);
+    }
+
+    /**
+     * send an acknowledgement notifying a successfuly processed request
+     *
+     * @param inboundAddressProperties identifes who to reply to and what message id the response should relate to
+     */
+    private void sendResponse(AddressingProperties inboundAddressProperties)
+    {
+        AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
+
+        try {
+            InitiatorClient.getClient().sendResponse(outboundAddressProperties);
+        } catch (Throwable th) {
+            URI uri = outboundAddressProperties.getTo().getURI();
+            System.out.println("com.jboss.transaction.txinterop.webservices.bainterop.sei.ParticipantPortTypeImpl_1: unable to send response to " + uri);
+            throw new ProtocolException(th);
+        }
+    }
+
+    /**
+     * send a soap fault notifying an unsuccessfuly processed request
+     *
+     * @param inboundAddressProperties identifes who to reply to and what message id the fault message should relate to
+     */
+    private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
+    {
+        AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
+
+        try {
+            InitiatorClient.getClient().sendSoapFault(outboundAddressProperties, sf);
+        } catch (Throwable th) {
+            System.out.println("com.jboss.transaction.txinterop.webservices.bainterop.sei.ParticipantPortTypeImpl_2: unable to log soap fault " + sf);
+            throw new ProtocolException(th);
+        }
+    }
+}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAInitiatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAInitiatorInitialisation.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAInitiatorInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,39 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.server;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContext;
-
-import com.arjuna.webservices11.ServiceRegistry;
-import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
-
-/**
- * Initialise the interop initiator service.
- * @author kevin
- */
-public class BAInitiatorInitialisation implements ServletContextListener
-{
-    /**
-     * The context has been initialized.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextInitialized(final ServletContextEvent servletContextEvent)
-    {
-        ServletContext context = servletContextEvent.getServletContext();
-        String baseURI = context.getInitParameter("BaseURI");
-        final String uri = baseURI + "/BAInitiatorService";
-
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.registerServiceProvider(BAInteropConstants.SERVICE_INITIATOR, uri) ;
-    }
-
-    /**
-     * The context is about to be destroyed.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextDestroyed(final ServletContextEvent servletContextEvent)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.removeServiceProvider(BAInteropConstants.SERVICE_INITIATOR); ;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAInitiatorInitialisation.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAInitiatorInitialisation.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAInitiatorInitialisation.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAInitiatorInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.server;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContext;
+
+import com.arjuna.webservices11.ServiceRegistry;
+import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
+
+/**
+ * Initialise the interop initiator service.
+ * @author kevin
+ */
+public class BAInitiatorInitialisation implements ServletContextListener
+{
+    /**
+     * The context has been initialized.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextInitialized(final ServletContextEvent servletContextEvent)
+    {
+        ServletContext context = servletContextEvent.getServletContext();
+        String baseURI = context.getInitParameter("BaseURI");
+        final String uri = baseURI + "/BAInitiatorService";
+
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.registerServiceProvider(BAInteropConstants.SERVICE_INITIATOR, uri) ;
+    }
+
+    /**
+     * The context is about to be destroyed.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextDestroyed(final ServletContextEvent servletContextEvent)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.removeServiceProvider(BAInteropConstants.SERVICE_INITIATOR); ;
+    }
+}

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAParticipantInitialisation.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAParticipantInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,40 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.bainterop.server;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContext;
-
-import com.arjuna.webservices11.ServiceRegistry;
-import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
-import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
-
-/**
- * Initialise the interop initiator service.
- * @author kevin
- */
-public class BAParticipantInitialisation implements ServletContextListener
-{
-    /**
-     * The context has been initialized.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextInitialized(final ServletContextEvent servletContextEvent)
-    {
-        ServletContext context = servletContextEvent.getServletContext();
-        String baseURI = context.getInitParameter("BaseURI");
-        final String uri = baseURI + "/BAParticipantService";
-
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.registerServiceProvider(BAInteropConstants.SERVICE_PARTICIPANT, uri) ;
-    }
-
-    /**
-     * The context is about to be destroyed.
-     * @param servletContextEvent The servlet context event.
-     */
-    public void contextDestroyed(final ServletContextEvent servletContextEvent)
-    {
-        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
-        serviceRegistry.removeServiceProvider(BAInteropConstants.SERVICE_PARTICIPANT) ;
-    }
-}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAParticipantInitialisation.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAParticipantInitialisation.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAParticipantInitialisation.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/server/BAParticipantInitialisation.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.bainterop.server;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContext;
+
+import com.arjuna.webservices11.ServiceRegistry;
+import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
+import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
+
+/**
+ * Initialise the interop initiator service.
+ * @author kevin
+ */
+public class BAParticipantInitialisation implements ServletContextListener
+{
+    /**
+     * The context has been initialized.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextInitialized(final ServletContextEvent servletContextEvent)
+    {
+        ServletContext context = servletContextEvent.getServletContext();
+        String baseURI = context.getInitParameter("BaseURI");
+        final String uri = baseURI + "/BAParticipantService";
+
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.registerServiceProvider(BAInteropConstants.SERVICE_PARTICIPANT, uri) ;
+    }
+
+    /**
+     * The context is about to be destroyed.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextDestroyed(final ServletContextEvent servletContextEvent)
+    {
+        final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
+        serviceRegistry.removeServiceProvider(BAInteropConstants.SERVICE_PARTICIPANT) ;
+    }
+}
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/CoordinationContextHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/CoordinationContextHandler.java	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/CoordinationContextHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,204 +0,0 @@
-package com.jboss.transaction.txinterop.webservices.handlers;
-
-import com.arjuna.webservices11.wscoor.CoordinationConstants;
-import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.ProtocolException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Marshaller;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Collections;
-import java.util.Map;
-
-import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
-import org.w3c.dom.Node;
-
-/**
- * Handler to serialise and deserialise a coordination context to/from a SOAP header.
- */
-public class CoordinationContextHandler implements SOAPHandler<SOAPMessageContext> {
-    /**
-     * Gets the header blocks that can be processed by this Handler
-     * instance.
-     *
-     * @return Set of QNames of header blocks processed by this
-     *         handler instance. <code>QName</code> is the qualified
-     *         name of the outermost element of the Header block.
-     */
-    public Set<QName> getHeaders()
-    {
-        return headers;
-    }
-
-    /**
-     * Handle an outgoing message by inserting any current arjuna context attached to the context into the message
-     * headers and handle an incoming message by retrieving the context from the headers and attaching it to the
-     * context,
-     *
-     * @param context the message context.
-     * @return Always return true
-     * @throws RuntimeException               Causes the JAX-WS runtime to cease
-     *                                        handler processing and generate a fault.
-     * @throws javax.xml.ws.ProtocolException Causes the JAX-WS runtime to switch to
-     *                                        fault message processing.
-     */
-    public boolean handleMessage(SOAPMessageContext context) throws ProtocolException
-    {
-        final boolean outbound = (Boolean)context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-        if (outbound) {
-            return handleMessageOutbound(context);
-        } else {
-            return handlemessageInbound(context);
-        }
-    }
-
-    /**
-     * check for an arjuna context attached to the message context and, if found, install its identifier as the value
-     * of a soap message header element
-     * @param context
-     * @return
-     * @throws ProtocolException
-     */
-    protected boolean handleMessageOutbound(SOAPMessageContext context) throws ProtocolException
-    {
-        try {
-            CoordinationContextType coordinationContext = CoordinationContextManager.getThreadContext();
-            if (coordinationContext != null) {
-                final JAXBContext jaxbCtx = getJaxbContext();
-
-                // insert a header into the current message containing the coordination context
-                final SOAPMessage soapMessage = context.getMessage();
-                final SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
-                SOAPHeader soapHeader = soapEnvelope.getHeader() ;
-                if (soapHeader == null)
-                {
-                    soapHeader = soapEnvelope.addHeader() ;
-                }
-                /*
-                 * this does not work but it is what we want!!
-                 *
-                 * The problem here is that the marshaller creates plain old elements and inserts them top
-                 * down as it goes along. but the soap header add child method checks its argument and
-                 * replaces plain elements with soap header elements before inserting them. it copies the
-                 * inserted element substructure into the rpelacement but since it does not exist at
-                 * copy time the chiuldren get lost
-                Marshaller marshaller = jaxbCtx.createMarshaller();
-                marshaller.marshal(coordinationContext, soapHeader);
-                 */
-                /*
-                 * ok, here's the workaround -- marshall the object as a child of a dummy header, detach it and
-                 * then insert it as a header element.
-                 */
-                SOAPHeaderElement headerElement = soapHeader.addHeaderElement(getDummyQName());
-                Marshaller marshaller = jaxbCtx.createMarshaller();
-                marshaller.marshal(coordinationContext, headerElement);
-                soapHeader.replaceChild(headerElement.getChildNodes().item(0), headerElement);
-                // ok, now we need to locate the inserted node and set the mustunderstand attribute
-                Iterator<SOAPHeaderElement> iterator = soapHeader.examineAllHeaderElements();
-                while (iterator.hasNext()) {
-                    headerElement = iterator.next();
-                    if (CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME.equals(headerElement.getElementQName())) {
-                        headerElement.setMustUnderstand(true);
-                        break;
-                    }
-                }
-            }
-        } catch (Exception se) {
-            throw new ProtocolException(se);
-        }
-
-        return true;
-    }
-
-    /**
-     * check for an arjuna instance identifier element embedded in the soap message headesr and, if found, use it to
-     * label an arjuna context attached to the message context
-     * @param context
-     * @return
-     * @throws ProtocolException
-     */
-    private boolean handlemessageInbound(SOAPMessageContext context)  throws ProtocolException
-    {
-        try {
-            final SOAPMessage soapMessage = context.getMessage();
-            final SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
-            Iterator<SOAPHeaderElement> iterator = soapEnvelope.getHeader().examineAllHeaderElements();
-            while (iterator.hasNext()) {
-                final SOAPHeaderElement headerElement = iterator.next();
-                if (CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME.equals(headerElement.getElementQName())) {
-                    // found it - clear the must understand flag, retrieve the value and store an arjuna
-                    // context in the message context
-                    headerElement.setMustUnderstand(false);
-                    final JAXBContext jaxbCtx = getJaxbContext();
-                    final JAXBElement<CoordinationContextType> elt = jaxbCtx.createUnmarshaller().unmarshal(headerElement, CoordinationContextType.class);
-                    final CoordinationContextType coordinationContext = elt.getValue();
-                    CoordinationContextManager.setContext(context, coordinationContext);
-                }
-            }
-        } catch (Exception se) {
-            throw new ProtocolException(se);
-        }
-
-        return true;
-    }
-
-    /**
-     * this handler ignores faults but allows other handlers to deal with them
-     *
-     * @param context the message context
-     * @return true to allow fault handling to continue
-     */
-
-    public boolean handleFault(SOAPMessageContext context)
-    {
-        return true;
-    }
-
-    /**
-     * this hanlder ignores close messages
-     *
-     * @param context the message context
-     */
-    public void close(javax.xml.ws.handler.MessageContext context)
-    {
-    }
-
-    /**
-     * a singleton set containing the only header this handler is interested in
-     */
-    private static Set<QName> headers = Collections.singleton(CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME);
-
-    private static JAXBContext jaxbContext;
-    private synchronized JAXBContext getJaxbContext()
-    {
-        if (jaxbContext == null) {
-            try {
-                jaxbContext = JAXBContext.newInstance("org.oasis_open.docs.ws_tx.wscoor._2006._06");
-            } catch (JAXBException e) {
-                // TODO log error here
-            }
-        }
-
-        return jaxbContext;
-    }
-    private static QName dummyQName = null;
-    private synchronized QName getDummyQName()
-    {
-        if (dummyQName == null) {
-            dummyQName = new QName("http://transactions.jboss.com/xts/dummy/", "DummyElement", "dummy");
-        }
-
-        return dummyQName;
-    }
-}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/CoordinationContextHandler.java (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/CoordinationContextHandler.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/CoordinationContextHandler.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/handlers/CoordinationContextHandler.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,224 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.handlers;
+
+import com.arjuna.webservices11.wscoor.CoordinationConstants;
+import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+import javax.xml.ws.handler.soap.SOAPHandler;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.ProtocolException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPHeaderElement;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Marshaller;
+import java.util.Set;
+import java.util.Iterator;
+import java.util.Collections;
+import java.util.Map;
+
+import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import org.w3c.dom.Node;
+
+/**
+ * Handler to serialise and deserialise a coordination context to/from a SOAP header.
+ */
+public class CoordinationContextHandler implements SOAPHandler<SOAPMessageContext> {
+    /**
+     * Gets the header blocks that can be processed by this Handler
+     * instance.
+     *
+     * @return Set of QNames of header blocks processed by this
+     *         handler instance. <code>QName</code> is the qualified
+     *         name of the outermost element of the Header block.
+     */
+    public Set<QName> getHeaders()
+    {
+        return headers;
+    }
+
+    /**
+     * Handle an outgoing message by inserting any current arjuna context attached to the context into the message
+     * headers and handle an incoming message by retrieving the context from the headers and attaching it to the
+     * context,
+     *
+     * @param context the message context.
+     * @return Always return true
+     * @throws RuntimeException               Causes the JAX-WS runtime to cease
+     *                                        handler processing and generate a fault.
+     * @throws javax.xml.ws.ProtocolException Causes the JAX-WS runtime to switch to
+     *                                        fault message processing.
+     */
+    public boolean handleMessage(SOAPMessageContext context) throws ProtocolException
+    {
+        final boolean outbound = (Boolean)context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
+        if (outbound) {
+            return handleMessageOutbound(context);
+        } else {
+            return handlemessageInbound(context);
+        }
+    }
+
+    /**
+     * check for an arjuna context attached to the message context and, if found, install its identifier as the value
+     * of a soap message header element
+     * @param context
+     * @return
+     * @throws ProtocolException
+     */
+    protected boolean handleMessageOutbound(SOAPMessageContext context) throws ProtocolException
+    {
+        try {
+            CoordinationContextType coordinationContext = CoordinationContextManager.getThreadContext();
+            if (coordinationContext != null) {
+                final JAXBContext jaxbCtx = getJaxbContext();
+
+                // insert a header into the current message containing the coordination context
+                final SOAPMessage soapMessage = context.getMessage();
+                final SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
+                SOAPHeader soapHeader = soapEnvelope.getHeader() ;
+                if (soapHeader == null)
+                {
+                    soapHeader = soapEnvelope.addHeader() ;
+                }
+                /*
+                 * this does not work but it is what we want!!
+                 *
+                 * The problem here is that the marshaller creates plain old elements and inserts them top
+                 * down as it goes along. but the soap header add child method checks its argument and
+                 * replaces plain elements with soap header elements before inserting them. it copies the
+                 * inserted element substructure into the rpelacement but since it does not exist at
+                 * copy time the chiuldren get lost
+                Marshaller marshaller = jaxbCtx.createMarshaller();
+                marshaller.marshal(coordinationContext, soapHeader);
+                 */
+                /*
+                 * ok, here's the workaround -- marshall the object as a child of a dummy header, detach it and
+                 * then insert it as a header element.
+                 */
+                SOAPHeaderElement headerElement = soapHeader.addHeaderElement(getDummyQName());
+                Marshaller marshaller = jaxbCtx.createMarshaller();
+                marshaller.marshal(coordinationContext, headerElement);
+                soapHeader.replaceChild(headerElement.getChildNodes().item(0), headerElement);
+                // ok, now we need to locate the inserted node and set the mustunderstand attribute
+                Iterator<SOAPHeaderElement> iterator = soapHeader.examineAllHeaderElements();
+                while (iterator.hasNext()) {
+                    headerElement = iterator.next();
+                    if (CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME.equals(headerElement.getElementQName())) {
+                        headerElement.setMustUnderstand(true);
+                        break;
+                    }
+                }
+            }
+        } catch (Exception se) {
+            throw new ProtocolException(se);
+        }
+
+        return true;
+    }
+
+    /**
+     * check for an arjuna instance identifier element embedded in the soap message headesr and, if found, use it to
+     * label an arjuna context attached to the message context
+     * @param context
+     * @return
+     * @throws ProtocolException
+     */
+    private boolean handlemessageInbound(SOAPMessageContext context)  throws ProtocolException
+    {
+        try {
+            final SOAPMessage soapMessage = context.getMessage();
+            final SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
+            Iterator<SOAPHeaderElement> iterator = soapEnvelope.getHeader().examineAllHeaderElements();
+            while (iterator.hasNext()) {
+                final SOAPHeaderElement headerElement = iterator.next();
+                if (CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME.equals(headerElement.getElementQName())) {
+                    // found it - clear the must understand flag, retrieve the value and store an arjuna
+                    // context in the message context
+                    headerElement.setMustUnderstand(false);
+                    final JAXBContext jaxbCtx = getJaxbContext();
+                    final JAXBElement<CoordinationContextType> elt = jaxbCtx.createUnmarshaller().unmarshal(headerElement, CoordinationContextType.class);
+                    final CoordinationContextType coordinationContext = elt.getValue();
+                    CoordinationContextManager.setContext(context, coordinationContext);
+                }
+            }
+        } catch (Exception se) {
+            throw new ProtocolException(se);
+        }
+
+        return true;
+    }
+
+    /**
+     * this handler ignores faults but allows other handlers to deal with them
+     *
+     * @param context the message context
+     * @return true to allow fault handling to continue
+     */
+
+    public boolean handleFault(SOAPMessageContext context)
+    {
+        return true;
+    }
+
+    /**
+     * this hanlder ignores close messages
+     *
+     * @param context the message context
+     */
+    public void close(javax.xml.ws.handler.MessageContext context)
+    {
+    }
+
+    /**
+     * a singleton set containing the only header this handler is interested in
+     */
+    private static Set<QName> headers = Collections.singleton(CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME);
+
+    private static JAXBContext jaxbContext;
+    private synchronized JAXBContext getJaxbContext()
+    {
+        if (jaxbContext == null) {
+            try {
+                jaxbContext = JAXBContext.newInstance("org.oasis_open.docs.ws_tx.wscoor._2006._06");
+            } catch (JAXBException e) {
+                // TODO log error here
+            }
+        }
+
+        return jaxbContext;
+    }
+    private static QName dummyQName = null;
+    private synchronized QName getDummyQName()
+    {
+        if (dummyQName == null) {
+            dummyQName = new QName("http://transactions.jboss.com/xts/dummy/", "DummyElement", "dummy");
+        }
+
+        return dummyQName;
+    }
+}

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/details.jsp
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web/details.jsp	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/details.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,90 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@page import="com.jboss.transaction.txinterop.test.TestConstants"%>
-<%@page import="java.util.Enumeration"%>
-<%@page import="junit.framework.TestResult"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@page import="junit.framework.TestFailure"%>
-<%@page import="junit.framework.TestCase"%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop detail page</title>
-</head>
-<body>
-<h1>Results</h1>
-<%
-	final TestResult testResult = (TestResult)session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT) ;
-	if (testResult == null)
-	{
-%>
-No JUnit test results generated.
-<%
-	}
-	else
-	{
-		final String type = request.getParameter("type") ;
-		
-		Enumeration detailEnum = null ;
-		if (type != null)
-		{
-		    if ("error".equals(type))
-		    {
-		        detailEnum = testResult.errors() ;
-		    }
-		    else if ("failure".equals(type))
-		    {
-		        detailEnum = testResult.failures() ;
-		    }
-		}
-		
-		Integer indexInt = null ;
-		if (detailEnum != null)
-		{
-			final String indexVal = request.getParameter("index") ;
-			try
-			{
-			    indexInt = Integer.valueOf(indexVal) ;
-			}
-			catch (final NumberFormatException nfe) {}
-		}
-		
-		TestFailure testFailure = null ;
-		if (indexInt != null)
-		{
-		    int index = indexInt.intValue() ;
-		    if (index > 0)
-		    {
-			    while(detailEnum.hasMoreElements())
-			    {
-		        		final Object current = detailEnum.nextElement() ;
-		        		if (--index == 0)
-		        		{
-		        		    testFailure = (TestFailure)current ;
-		        		    break ;
-		        		}
-			    }
-		    }
-		}
-		
-		if (testFailure == null)
-		{
-%>
-<p>Invalid request parameters</p>
-<%
-		}
-		else
-		{
-		    final TestCase failure = (TestCase)testFailure.failedTest() ;
-%>
-<p>Test: <%= failure.getName() %></p>
-<pre>
-<%= testFailure.trace() %>
-</pre>
-<%
-		}
-	}
-%>
-<p>Return to <a href="results.jsp">results page</a></p>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/details.jsp (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web/details.jsp)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/details.jsp	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/details.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,110 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@page import="com.jboss.transaction.txinterop.test.TestConstants"%>
+<%@page import="java.util.Enumeration"%>
+<%@page import="junit.framework.TestResult"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<%@page import="junit.framework.TestFailure"%>
+<%@page import="junit.framework.TestCase"%>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JBoss Transactions WS-TX Interop detail page</title>
+</head>
+<body>
+<h1>Results</h1>
+<%
+	final TestResult testResult = (TestResult)session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT) ;
+	if (testResult == null)
+	{
+%>
+No JUnit test results generated.
+<%
+	}
+	else
+	{
+		final String type = request.getParameter("type") ;
+		
+		Enumeration detailEnum = null ;
+		if (type != null)
+		{
+		    if ("error".equals(type))
+		    {
+		        detailEnum = testResult.errors() ;
+		    }
+		    else if ("failure".equals(type))
+		    {
+		        detailEnum = testResult.failures() ;
+		    }
+		}
+		
+		Integer indexInt = null ;
+		if (detailEnum != null)
+		{
+			final String indexVal = request.getParameter("index") ;
+			try
+			{
+			    indexInt = Integer.valueOf(indexVal) ;
+			}
+			catch (final NumberFormatException nfe) {}
+		}
+		
+		TestFailure testFailure = null ;
+		if (indexInt != null)
+		{
+		    int index = indexInt.intValue() ;
+		    if (index > 0)
+		    {
+			    while(detailEnum.hasMoreElements())
+			    {
+		        		final Object current = detailEnum.nextElement() ;
+		        		if (--index == 0)
+		        		{
+		        		    testFailure = (TestFailure)current ;
+		        		    break ;
+		        		}
+			    }
+		    }
+		}
+		
+		if (testFailure == null)
+		{
+%>
+<p>Invalid request parameters</p>
+<%
+		}
+		else
+		{
+		    final TestCase failure = (TestCase)testFailure.failedTest() ;
+%>
+<p>Test: <%= failure.getName() %></p>
+<pre>
+<%= testFailure.trace() %>
+</pre>
+<%
+		}
+	}
+%>
+<p>Return to <a href="results.jsp">results page</a></p>
+</body>
+</html>
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/index.jsp
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web/index.jsp	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/index.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,58 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@page import="java.util.Iterator"%>
-<%@page import="java.util.Map"%>
-<%@page import="com.arjuna.webservices11.ServiceRegistry"%>
-<%@page import="com.jboss.transaction.txinterop.test.TestConstants"%>
-<%@page import="com.jboss.transaction.txinterop.webservices.InteropConstants"%>
-
-<%!
-private final static String SERVICE_URI = ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_PARTICIPANT) ;%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop</title>
-</head>
-<body>
-<h1>JBoss Transactions WS-TX 1.1 Interop</h1>
-<h2>Introduction</h2>
-<p>This web application implements a set of interoperability tests specified by the <a href="http://www.oasis-open.org/apps/org/workgroup/ws-tx/">Oasis WS-TX Technical Committee</a> site.</p>
-<p>Please send any queries to the <a href="mailto:kevin.conner at jboss.com?subject=Interop%20query">interop test contact</a></p>
-<h2>Interop tests</h2>
-<form action="test" method="post">
-<p>Service URI: <input name="<%= TestConstants.PARAM_SERVICE_URI %>" maxlength="2000" size="100" value="<%= SERVICE_URI %>"/></p>
-<p>Test timeout: <input name="<%= TestConstants.PARAM_TEST_TIMEOUT %>" maxlength="10" size="10" value="120000"/></p>
-<!-- the current JaxWS based interop11 tests only runs synchronous tests for now
-<p>Asynchronous Test application: <input name="<%= TestConstants.PARAM_ASYNC_TEST %>" type="checkbox" checked="checked"/></p>
--->
-<select name="<%= TestConstants.PARAM_TEST %>">
-<!-- the JaxWS interop test code has two separate services, one for AT and one for BA. since we only have
-     one participant URL we have to assume it is either the AT server or the BA server and run either AT
-     tests or BA tests but not both
-<option value="<%= TestConstants.NAME_ALL_TESTS %>">All tests</option>
--->
-<option value="<%= TestConstants.NAME_ALL_AT_TESTS %>">All AT tests</option>
-<option value="<%= TestConstants.NAME_ALL_BA_TESTS %>">All BA tests</option>
-<%
-
-  final Map descriptions = TestConstants.DESCRIPTIONS ;
-  final Iterator entryIter = descriptions.entrySet().iterator() ;
-  while(entryIter.hasNext())
-  {
-      final Map.Entry entry = (Map.Entry)entryIter.next() ;
-      final String testName = (String)entry.getKey() ;
-      final String testDescription = (String)entry.getValue() ;
-%>
-<option value="<%= testName %>"><%=testName + " - " + testDescription%></option>
-<%
-
-}
-%>
-</select>
-<p>
-<input type="submit" value="Execute"/>
-</p>
-</form>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/index.jsp (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web/index.jsp)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/index.jsp	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/index.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,78 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@page import="java.util.Iterator"%>
+<%@page import="java.util.Map"%>
+<%@page import="com.arjuna.webservices11.ServiceRegistry"%>
+<%@page import="com.jboss.transaction.txinterop.test.TestConstants"%>
+<%@page import="com.jboss.transaction.txinterop.webservices.InteropConstants"%>
+
+<%!
+private final static String SERVICE_URI = ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_PARTICIPANT) ;%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JBoss Transactions WS-TX Interop</title>
+</head>
+<body>
+<h1>JBoss Transactions WS-TX 1.1 Interop</h1>
+<h2>Introduction</h2>
+<p>This web application implements a set of interoperability tests specified by the <a href="http://www.oasis-open.org/apps/org/workgroup/ws-tx/">Oasis WS-TX Technical Committee</a> site.</p>
+<p>Please send any queries to the <a href="mailto:kevin.conner at jboss.com?subject=Interop%20query">interop test contact</a></p>
+<h2>Interop tests</h2>
+<form action="test" method="post">
+<p>Service URI: <input name="<%= TestConstants.PARAM_SERVICE_URI %>" maxlength="2000" size="100" value="<%= SERVICE_URI %>"/></p>
+<p>Test timeout: <input name="<%= TestConstants.PARAM_TEST_TIMEOUT %>" maxlength="10" size="10" value="120000"/></p>
+<!-- the current JaxWS based interop11 tests only runs synchronous tests for now
+<p>Asynchronous Test application: <input name="<%= TestConstants.PARAM_ASYNC_TEST %>" type="checkbox" checked="checked"/></p>
+-->
+<select name="<%= TestConstants.PARAM_TEST %>">
+<!-- the JaxWS interop test code has two separate services, one for AT and one for BA. since we only have
+     one participant URL we have to assume it is either the AT server or the BA server and run either AT
+     tests or BA tests but not both
+<option value="<%= TestConstants.NAME_ALL_TESTS %>">All tests</option>
+-->
+<option value="<%= TestConstants.NAME_ALL_AT_TESTS %>">All AT tests</option>
+<option value="<%= TestConstants.NAME_ALL_BA_TESTS %>">All BA tests</option>
+<%
+
+  final Map descriptions = TestConstants.DESCRIPTIONS ;
+  final Iterator entryIter = descriptions.entrySet().iterator() ;
+  while(entryIter.hasNext())
+  {
+      final Map.Entry entry = (Map.Entry)entryIter.next() ;
+      final String testName = (String)entry.getKey() ;
+      final String testDescription = (String)entry.getValue() ;
+%>
+<option value="<%= testName %>"><%=testName + " - " + testDescription%></option>
+<%
+
+}
+%>
+</select>
+<p>
+<input type="submit" value="Execute"/>
+</p>
+</form>
+</body>
+</html>
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/invalidParameters.html
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web/invalidParameters.html	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/invalidParameters.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop invalid parameters page</title>
-</head>
-<body>
-Unfortunately the parameters specified are invalid, please resubmit the request. &nbsp;If the request repeatedly fails please contact the <a href="mailto:kevin.conner at jboss.com?subject=Interop%20invalid%20parameters">interop test contact</a>
-<p>Return to <a href="index.jsp">main page</a></p>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/invalidParameters.html (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web/invalidParameters.html)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/invalidParameters.html	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/invalidParameters.html	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,31 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JBoss Transactions WS-TX Interop invalid parameters page</title>
+</head>
+<body>
+Unfortunately the parameters specified are invalid, please resubmit the request. &nbsp;If the request repeatedly fails please contact the <a href="mailto:kevin.conner at jboss.com?subject=Interop%20invalid%20parameters">interop test contact</a>
+<p>Return to <a href="index.jsp">main page</a></p>
+</body>
+</html>
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/results.jsp
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web/results.jsp	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/results.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,90 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@page import="com.jboss.transaction.txinterop.test.TestConstants"%>
-<%@page import="java.util.Enumeration"%>
-<%@page import="junit.framework.TestCase"%>
-<%@page import="junit.framework.TestFailure"%>
-<%@page import="junit.framework.TestResult"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JBoss Transactions WS-TX Interop results page</title>
-</head>
-<body>
-<h1>Results</h1>
-<h2>Processed results</h2>
-<%
-	final String logName = (String)session.getAttribute(TestConstants.ATTRIBUTE_LOG_NAME) ;
-    if (logName != null)
-    {
-%>
-<p>View <a href="logs/<%= logName %>">log file</a></p>
-<%
-    }
-%>
-<h2>JUnit results</h2>
-<%
-	final TestResult testResult = (TestResult)session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT) ;
-	if (testResult == null)
-	{
-%>
-No JUnit test results generated.
-<%
-	}
-	else
-	{
-		final int runCount = testResult.runCount() ;
-		final int errorCount = testResult.errorCount() ;
-		final int failureCount = testResult.failureCount() ;
-%>
-<p>Run count: <%= runCount %></p>
-<p>Error count: <%= errorCount %></p>
-<p>Failure count: <%= failureCount %></p>
-<%
-		if ((errorCount > 0) || (failureCount > 0))
-		{
-			if (errorCount > 0)
-			{
-				final Enumeration enumeration = testResult.errors() ;
-%>
-<H3>Errors</H3>
-<%
-				int count = 0 ;
-				while(enumeration.hasMoreElements())
-				{
-				    final TestFailure testFailure = (TestFailure)enumeration.nextElement() ;
-				    count++ ;
-				    final TestCase failedTest = (TestCase)testFailure.failedTest() ;
-				    final String name = failedTest.getName() ;
-				    final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
-%>
-<p><a href="details.jsp?type=error&index=<%= count %>"><%= name %></a> <%= description %></p>
-<%
-				}
-			}
-			if (failureCount > 0)
-			{
-				final Enumeration enumeration = testResult.failures() ;
-%>
-<H3>Failures</H3>
-<%
-				int count = 0 ;
-				while(enumeration.hasMoreElements())
-				{
-				    final TestFailure testFailure = (TestFailure)enumeration.nextElement() ;
-				    count++ ;
-				    final TestCase failedTest = (TestCase)testFailure.failedTest() ;
-				    final String name = failedTest.getName() ;
-				    final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
-%>
-<p><a href="details.jsp?type=failure&index=<%= count %>"><%= name %></a> <%= description %></p>
-<%
-				}
-			}
-		}
-	}
-%>
-<p>Return to <a href="index.jsp">main page</a></p>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/results.jsp (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web/results.jsp)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/results.jsp	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web/results.jsp	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,110 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@page import="com.jboss.transaction.txinterop.test.TestConstants"%>
+<%@page import="java.util.Enumeration"%>
+<%@page import="junit.framework.TestCase"%>
+<%@page import="junit.framework.TestFailure"%>
+<%@page import="junit.framework.TestResult"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JBoss Transactions WS-TX Interop results page</title>
+</head>
+<body>
+<h1>Results</h1>
+<h2>Processed results</h2>
+<%
+	final String logName = (String)session.getAttribute(TestConstants.ATTRIBUTE_LOG_NAME) ;
+    if (logName != null)
+    {
+%>
+<p>View <a href="logs/<%= logName %>">log file</a></p>
+<%
+    }
+%>
+<h2>JUnit results</h2>
+<%
+	final TestResult testResult = (TestResult)session.getAttribute(TestConstants.ATTRIBUTE_TEST_RESULT) ;
+	if (testResult == null)
+	{
+%>
+No JUnit test results generated.
+<%
+	}
+	else
+	{
+		final int runCount = testResult.runCount() ;
+		final int errorCount = testResult.errorCount() ;
+		final int failureCount = testResult.failureCount() ;
+%>
+<p>Run count: <%= runCount %></p>
+<p>Error count: <%= errorCount %></p>
+<p>Failure count: <%= failureCount %></p>
+<%
+		if ((errorCount > 0) || (failureCount > 0))
+		{
+			if (errorCount > 0)
+			{
+				final Enumeration enumeration = testResult.errors() ;
+%>
+<H3>Errors</H3>
+<%
+				int count = 0 ;
+				while(enumeration.hasMoreElements())
+				{
+				    final TestFailure testFailure = (TestFailure)enumeration.nextElement() ;
+				    count++ ;
+				    final TestCase failedTest = (TestCase)testFailure.failedTest() ;
+				    final String name = failedTest.getName() ;
+				    final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
+%>
+<p><a href="details.jsp?type=error&index=<%= count %>"><%= name %></a> <%= description %></p>
+<%
+				}
+			}
+			if (failureCount > 0)
+			{
+				final Enumeration enumeration = testResult.failures() ;
+%>
+<H3>Failures</H3>
+<%
+				int count = 0 ;
+				while(enumeration.hasMoreElements())
+				{
+				    final TestFailure testFailure = (TestFailure)enumeration.nextElement() ;
+				    count++ ;
+				    final TestCase failedTest = (TestCase)testFailure.failedTest() ;
+				    final String name = failedTest.getName() ;
+				    final String description = (String)TestConstants.DESCRIPTIONS.get(name) ;
+%>
+<p><a href="details.jsp?type=failure&index=<%= count %>"><%= name %></a> <%= description %></p>
+<%
+				}
+			}
+		}
+	}
+%>
+<p>Return to <a href="index.jsp">main page</a></p>
+</body>
+</html>
\ No newline at end of file

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web.xml	2009-04-24 09:13:30 UTC (rev 26238)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	version="2.4">
-    <display-name>JBoss WSTX1.1 interop</display-name>
-
-    <description>JBoss WSTX1.1 interop</description>
-
-    <!-- hmm, how do we do this with the JaxWS services?
-    <filter>
-      	<filter-name>HTTP Content Type filter</filter-name>
-      	<filter-class>com.arjuna.webservices.transport.http.HttpContentTypeFilter</filter-class>
-    </filter>
-    
-    <filter-mapping>
-      	<filter-name>HTTP Content Type filter</filter-name>
-        <servlet-name>HTTP SOAP Service Multiplexor Servlet</servlet-name>
-    </filter-mapping>
-    -->
-
-    <!-- base URL for location of Interop 1.1 services -->
-    <context-param>
-        <param-name>BaseURI</param-name>
-        <param-value>http://@HOST@:@PORT@/interop11</param-value>
-    </context-param>
-
-    <!-- Initialise Interop 11 services -->
-    <listener>
-        <listener-class>com.jboss.transaction.txinterop.webservices.atinterop.server.ATParticipantInitialisation</listener-class>
-    </listener>
-    <listener>
-        <listener-class>com.jboss.transaction.txinterop.webservices.atinterop.server.ATInitiatorInitialisation</listener-class>
-    </listener>
-    <listener>
-        <listener-class>com.jboss.transaction.txinterop.webservices.bainterop.server.BAParticipantInitialisation</listener-class>
-    </listener>
-    <listener>
-        <listener-class>com.jboss.transaction.txinterop.webservices.bainterop.server.BAInitiatorInitialisation</listener-class>
-    </listener>
-
-    <!-- Define Interop 11 Server Endpoints -->
-    <servlet>
-      <servlet-name>Interop 11 AT Initiator Service</servlet-name>
-      <servlet-class>com.jboss.transaction.txinterop.webservices.atinterop.sei.InitiatorPortTypeImpl</servlet-class>
-      <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-      <servlet-name>Interop 11 AT Participant Service</servlet-name>
-      <servlet-class>com.jboss.transaction.txinterop.webservices.atinterop.sei.ParticipantPortTypeImpl</servlet-class>
-      <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-      <servlet-name>Interop 11 BA Initiator Service</servlet-name>
-      <servlet-class>com.jboss.transaction.txinterop.webservices.bainterop.sei.InitiatorPortTypeImpl</servlet-class>
-      <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-      <servlet-name>Interop 11 BA Participant Service</servlet-name>
-      <servlet-class>com.jboss.transaction.txinterop.webservices.bainterop.sei.ParticipantPortTypeImpl</servlet-class>
-      <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <!-- Define Interop 11 JaxWS Server Endpoint Mappings -->
-    <servlet-mapping>
-      <servlet-name>Interop 11 AT Initiator Service</servlet-name>
-      <url-pattern>/ATInitiatorService</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-      <servlet-name>Interop 11 AT Participant Service</servlet-name>
-      <url-pattern>/ATParticipantService</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>Interop 11 BA Initiator Service</servlet-name>
-      <url-pattern>/BAInitiatorService</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-      <servlet-name>Interop 11 BA Participant Service</servlet-name>
-      <url-pattern>/BAParticipantService</url-pattern>
-    </servlet-mapping>
-
-    <!-- define proxy, logging and junit test runner servlets -->
-    <servlet>
-        <servlet-name>HTTP Proxy Servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.txinterop.proxy.ProxyListenerService</servlet-class>
-        <!--
-          The base URI of the proxy servlet.
-         -->
-        <init-param>
-            <param-name>proxyServiceURI</param-name>
-            <param-value>http://@HOST@:@PORT@/interop11/proxy</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>JUnit test servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.txinterop.test.TestServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>XML results servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.txinterop.test.XMLResultsServlet</servlet-class>
-    </servlet>
-
-    <servlet>
-        <servlet-name>Log servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.txinterop.test.TestLogServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-	<!-- servlet mappings -->
-    <servlet-mapping>
-        <servlet-name>HTTP Proxy Servlet</servlet-name>
-        <url-pattern>/proxy/*</url-pattern>
-    </servlet-mapping>
-    
-    <servlet-mapping>
-        <servlet-name>JUnit test servlet</servlet-name>
-        <url-pattern>/test</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>XML results servlet</servlet-name>
-        <url-pattern>/xmlresults</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>Log servlet</servlet-name>
-        <url-pattern>/logs/*</url-pattern>
-    </servlet-mapping>
-    
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-    </welcome-file-list>
-</web-app>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web.xml (from rev 26238, labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web.xml)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web.xml	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/interop/WSTX11-interop/web.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ -->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	version="2.4">
+    <display-name>JBoss WSTX1.1 interop</display-name>
+
+    <description>JBoss WSTX1.1 interop</description>
+
+    <!-- hmm, how do we do this with the JaxWS services?
+    <filter>
+      	<filter-name>HTTP Content Type filter</filter-name>
+      	<filter-class>com.arjuna.webservices.transport.http.HttpContentTypeFilter</filter-class>
+    </filter>
+    
+    <filter-mapping>
+      	<filter-name>HTTP Content Type filter</filter-name>
+        <servlet-name>HTTP SOAP Service Multiplexor Servlet</servlet-name>
+    </filter-mapping>
+    -->
+
+    <!-- base URL for location of Interop 1.1 services -->
+    <context-param>
+        <param-name>BaseURI</param-name>
+        <param-value>http://@HOST@:@PORT@/interop11</param-value>
+    </context-param>
+
+    <!-- Initialise Interop 11 services -->
+    <listener>
+        <listener-class>com.jboss.transaction.txinterop.webservices.atinterop.server.ATParticipantInitialisation</listener-class>
+    </listener>
+    <listener>
+        <listener-class>com.jboss.transaction.txinterop.webservices.atinterop.server.ATInitiatorInitialisation</listener-class>
+    </listener>
+    <listener>
+        <listener-class>com.jboss.transaction.txinterop.webservices.bainterop.server.BAParticipantInitialisation</listener-class>
+    </listener>
+    <listener>
+        <listener-class>com.jboss.transaction.txinterop.webservices.bainterop.server.BAInitiatorInitialisation</listener-class>
+    </listener>
+
+    <!-- Define Interop 11 Server Endpoints -->
+    <servlet>
+      <servlet-name>Interop 11 AT Initiator Service</servlet-name>
+      <servlet-class>com.jboss.transaction.txinterop.webservices.atinterop.sei.InitiatorPortTypeImpl</servlet-class>
+      <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
+      <servlet-name>Interop 11 AT Participant Service</servlet-name>
+      <servlet-class>com.jboss.transaction.txinterop.webservices.atinterop.sei.ParticipantPortTypeImpl</servlet-class>
+      <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+      <servlet-name>Interop 11 BA Initiator Service</servlet-name>
+      <servlet-class>com.jboss.transaction.txinterop.webservices.bainterop.sei.InitiatorPortTypeImpl</servlet-class>
+      <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
+      <servlet-name>Interop 11 BA Participant Service</servlet-name>
+      <servlet-class>com.jboss.transaction.txinterop.webservices.bainterop.sei.ParticipantPortTypeImpl</servlet-class>
+      <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <!-- Define Interop 11 JaxWS Server Endpoint Mappings -->
+    <servlet-mapping>
+      <servlet-name>Interop 11 AT Initiator Service</servlet-name>
+      <url-pattern>/ATInitiatorService</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+      <servlet-name>Interop 11 AT Participant Service</servlet-name>
+      <url-pattern>/ATParticipantService</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+      <servlet-name>Interop 11 BA Initiator Service</servlet-name>
+      <url-pattern>/BAInitiatorService</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+      <servlet-name>Interop 11 BA Participant Service</servlet-name>
+      <url-pattern>/BAParticipantService</url-pattern>
+    </servlet-mapping>
+
+    <!-- define proxy, logging and junit test runner servlets -->
+    <servlet>
+        <servlet-name>HTTP Proxy Servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.txinterop.proxy.ProxyListenerService</servlet-class>
+        <!--
+          The base URI of the proxy servlet.
+         -->
+        <init-param>
+            <param-name>proxyServiceURI</param-name>
+            <param-value>http://@HOST@:@PORT@/interop11/proxy</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>JUnit test servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.txinterop.test.TestServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>XML results servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.txinterop.test.XMLResultsServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>Log servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.txinterop.test.TestLogServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+	<!-- servlet mappings -->
+    <servlet-mapping>
+        <servlet-name>HTTP Proxy Servlet</servlet-name>
+        <url-pattern>/proxy/*</url-pattern>
+    </servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>JUnit test servlet</servlet-name>
+        <url-pattern>/test</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>XML results servlet</servlet-name>
+        <url-pattern>/xmlresults</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>Log servlet</servlet-name>
+        <url-pattern>/logs/*</url-pattern>
+    </servlet-mapping>
+    
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+</web-app>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/run-interop-tests.xml (from rev 26067, labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/run-interop-tests.xml	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/run-interop-tests.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,76 @@
+<!--
+  JBoss, Home of Professional Open Source
+  Copyright 2008, Red Hat Middleware LLC, and individual contributors
+  as indicated by the @author tags.
+  See the copyright.txt in the distribution for a
+  full listing of individual contributors.
+  This copyrighted material is made available to anyone wishing to use,
+  modify, copy, or redistribute it subject to the terms and conditions
+  of the GNU Lesser General Public License, v. 2.1.
+  This program is distributed in the hope that it will be useful, but WITHOUT A
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public License,
+  v.2.1 along with this distribution; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+  MA  02110-1301, USA.
+
+  (C) 2008,
+  @author JBoss Inc.
+-->
+
+<project name="Local JUnit Test for basic XTS testsuite" default="interop-tests" basedir=".">
+
+    <property environment="env"/>
+    <property name="server.hostname" value="${env.MYTESTIP_1}"/>
+    <property name="base.url" value="http://${server.hostname}:8080"/>
+    <property name="reports.dir" value="reports"/>
+    <property name="localjunit.lib.dir" value="build" />
+    <property name="apache.httpclient.lib.dir" value="ext" />
+    <property name="apache.logging.lib.dir" value="ext" />
+    <property name="apache.codec.lib.dir" value="ext" />
+    <property name="junit.lib.dir" value="../ext" />
+    <property name="testtype" value="tests-both" />
+
+    <path id="tests.classpath">
+        <pathelement location="${localjunit.lib.dir}/localjunit.jar"/>
+        <pathelement location="${apache.httpclient.lib.dir}/commons-httpclient.jar"/>
+        <pathelement location="${apache.logging.lib.dir}/commons-logging.jar"/>
+        <pathelement location="${apache.codec.lib.dir}/commons-codec.jar"/>
+        <pathelement location="${junit.lib.dir}/junit.jar"/>
+    </path>
+
+    <target name="interop-tests" depends="wstf-interop-tests,wstx11-interop-tests"/>
+
+    <target name="wstf-interop-tests">
+        <run-localjunit-test serverUrl="${base.url}/sc007/test?serviceuri=${base.url}/sc007/ParticipantService&amp;testTimeout=120000&amp;test=allTests&amp;resultPage=/xmlresults" outfile="TEST-sc007-test.xml" />
+    </target>
+
+    <target name="wstx11-interop-tests">
+        <run-localjunit-test serverUrl="${base.url}/interop11/test?serviceuri=${base.url}/interop11/ATParticipantService&amp;testTimeout=120000&amp;test=allATTests&amp;resultPage=/xmlresults" outfile="TEST-interop11-AT-test.xml" />
+        <run-localjunit-test serverUrl="${base.url}/interop11/test?serviceuri=${base.url}/interop11/BAParticipantService&amp;testTimeout=120000&amp;test=allBATests&amp;resultPage=/xmlresults" outfile="TEST-interop11-BA-test.xml" />
+    </target>
+
+    <macrodef name="run-localjunit-test">
+        <attribute name="serverUrl" />
+        <attribute name="outfile" />
+        <sequential>
+            <junit printsummary="yes" haltonfailure="no" fork="true" dir="." maxmemory="256m" showoutput="yes">
+                <classpath>
+                    <path refid="tests.classpath"/>
+                </classpath>
+
+                <formatter type="xml"/>
+
+                <sysproperty key="serverUrl" value="@{serverUrl}" />
+                <sysproperty key="outfile" value="${reports.dir}/@{outfile}" />
+
+                <test name="com.arjuna.qa.junit.LocalJUnitInteropRunner" />
+
+                <!--jvmarg value="-Xdebug"/>
+                <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/-->
+            </junit>
+        </sequential>
+     </macrodef>
+
+</project>

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/run-tests.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/run-tests.xml	2009-06-19 09:49:54 UTC (rev 27021)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/run-tests.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -19,34 +19,44 @@
   @author JBoss Inc.
 -->
 
-<project name="Local JUnit Test for basic XTS testsuite" default="run" basedir=".">
+<project name="Local JUnit Test for basic XTS testsuite" default="tests-both" basedir=".">
 
     <property environment="env"/>
     <property name="server.hostname" value="${env.MYTESTIP_1}"/>
-    <!--property name="server.hostname" value="localhost"/-->
     <property name="base.url" value="http://${server.hostname}:8080"/>
     <property name="reports.dir" value="reports"/>
+    <property name="localjunit.lib.dir" value="build" />
+    <property name="apache.httpclient.lib.dir" value="ext" />
+    <property name="apache.logging.lib.dir" value="ext" />
+    <property name="apache.codec.lib.dir" value="ext" />
+    <property name="junit.lib.dir" value="../ext" />
 
     <path id="tests.classpath">
-        <pathelement location="build/localjunit.jar"/>
-        <pathelement location="ext/commons-httpclient.jar"/>
-        <pathelement location="ext/commons-logging.jar"/>
-        <pathelement location="ext/commons-codec.jar"/>
-        <pathelement location="../ext/junit.jar"/>
+        <pathelement location="${localjunit.lib.dir}/localjunit.jar"/>
+        <pathelement location="${apache.httpclient.lib.dir}/commons-httpclient.jar"/>
+        <pathelement location="${apache.logging.lib.dir}/commons-logging.jar"/>
+        <pathelement location="${apache.codec.lib.dir}/commons-codec.jar"/>
+        <pathelement location="${junit.lib.dir}/junit.jar"/>
     </path>
 
 
-    <target name="run">
+    <!-- target for 1.1 tests -->
+    <target name="tests-11">
         <run-localjunit-test serverUrl="${base.url}/wsas-tests/index.xml" outfile="TEST-wsas-test.xml" />
+        <run-localjunit-test serverUrl="${base.url}/ws-c11-tests/index.xml" outfile="TEST-ws-c11-test.xml" />
+        <run-localjunit-test serverUrl="${base.url}/ws-t11-tests/index.xml" outfile="TEST-ws-t11-test.xml" />
+        <run-localjunit-test serverUrl="${base.url}/wscf11-tests/index.xml" outfile="TEST-wscf11-test.xml" />
+        <run-localjunit-test serverUrl="${base.url}/wstx11-tests/index.xml" outfile="TEST-wstx11-test.xml" />
+    </target>
+
+    <!-- target for both 1.0 and 1.1 tests -->
+    <target name="tests-both" depends="tests-11">
         <run-localjunit-test serverUrl="${base.url}/wscf-tests/index.xml" outfile="TEST-wscf-test.xml" />
+        <run-localjunit-test serverUrl="${base.url}/wstx-tests/index.xml" outfile="TEST-wstx-test.xml" />
         <run-localjunit-test serverUrl="${base.url}/ws-c-tests/index.xml" outfile="TEST-ws-c-test.xml" />
-        <run-localjunit-test serverUrl="${base.url}/ws-c11-tests/index.xml" outfile="TEST-ws-c11-test.xml" />
         <run-localjunit-test serverUrl="${base.url}/ws-t-tests/index.xml" outfile="TEST-ws-t-test.xml" />
-        <run-localjunit-test serverUrl="${base.url}/ws-t11-tests/index.xml" outfile="TEST-ws-t11-test.xml" />
-        <run-localjunit-test serverUrl="${base.url}/wstx-tests/index.xml" outfile="TEST-wstx-test.xml" />
     </target>
-
-    
+ 
     <macrodef name="run-localjunit-test">
         <attribute name="serverUrl" />
         <attribute name="outfile" />

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java (from rev 26067, labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java)
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -0,0 +1,64 @@
+package com.arjuna.qa.junit;
+
+import junit.framework.TestCase;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.Header;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.io.FileWriter;
+import java.io.BufferedWriter;
+
+/**
+ * Runs XTS Interop Testsuite at a serveruURL and writes the test result into an outfile.
+ * @author <a href="mailto:istudens at redhat.com">Ivo Studensky</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class LocalJUnitInteropRunner extends TestCase
+{
+    private String serverUrl    = null;
+    private String outfile      = null;
+
+    protected void setUp() throws Exception
+    {
+        serverUrl   = System.getProperty("serverUrl");
+        outfile     = System.getProperty("outfile");
+        System.err.println("serverUrl=" + serverUrl);
+        System.err.println("outfile=" + outfile);
+    }
+
+    public void testCallServlet()
+    {
+        boolean result = true;
+        try
+        {
+            // run tests by calling a servlet
+            Header runParam = new Header("Execute", "run");
+            HttpMethodBase request = HttpUtils.accessURL(
+                    new URL(serverUrl), null,
+                    HttpURLConnection.HTTP_OK,
+                    new Header[] {runParam},
+                    HttpUtils.POST);
+
+           String response = request.getResponseBodyAsString();
+
+            System.err.println("======================================================");
+            System.err.println("====================   RESULT    =====================");
+            System.err.println("======================================================");
+            System.err.println(response);
+
+            // writes response to the outfile
+            BufferedWriter writer = new BufferedWriter(new FileWriter(outfile));
+            writer.write(response);
+            writer.close();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+            result = false;
+        }
+
+        assertTrue(result);
+    }
+
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitRunner.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitRunner.java	2009-06-19 09:49:54 UTC (rev 27021)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitRunner.java	2009-06-19 10:53:34 UTC (rev 27022)
@@ -10,11 +10,10 @@
 import java.io.BufferedWriter;
 
 /**
- * Created by IntelliJ IDEA.
- * User: studensky
- * Date: 30.1.2009
- * Time: 14:09:23
- * To change this template use File | Settings | File Templates.
+ * Runs XTS Testsuite at a serveruURL, waits until it finishes
+ * and writes the test result into an outfile.
+ * @author <a href="mailto:istudens at redhat.com">Ivo Studensky</a>
+ * @version <tt>$Revision$</tt>
  */
 public class LocalJUnitRunner extends TestCase
 {

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/build-release-pkgs.xml	2009-06-19 09:49:54 UTC (rev 27021)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/build-release-pkgs.xml	2009-06-19 10:53:34 UTC (rev 27022)
@@ -294,6 +294,18 @@
             <arg value="-DgeneratePom=true"/>
         </exec>
 
+        <exec executable="mvn" dir="${workdir}">
+            <arg value="deploy:deploy-file"/>
+            <arg value="-Dfile=${workdir}/build/${tag}/xts/tests/jbossxts-interop-tests.zip"/>
+            <arg value="-Dpackaging=zip"/>
+            <arg value="-Durl=${mvn.url}"/>
+            <arg value="-DrepositoryId=${mvn.repositoryId}"/>
+            <arg value="-DgroupId=jboss.jbossts"/>
+            <arg value="-DartifactId=jbossxts-interop-tests"/>
+            <arg value="-Dversion=${filename}"/>
+            <arg value="-DgeneratePom=true"/>
+        </exec>
+
     </target>
 
 </project>




More information about the jboss-svn-commits mailing list