[jboss-svn-commits] JBL Code SVN: r26470 - in labs/jbosstm/trunk/XTS: WS-C/dev/dd/soapfault and 69 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 12 10:36:47 EDT 2009
Author: adinn
Date: 2009-05-12 10:36:47 -0400 (Tue, 12 May 2009)
New Revision: 26470
Added:
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAP.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPBuilder.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPConstants.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPEndpoint.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPRelatesTo.java
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/client/
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCSubordinateHeaderContextProcessor.java
Removed:
labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxRPCSubordinateHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml
Modified:
labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/build.sh
labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml
labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c_handlers.xml
labs/jbosstm/trunk/XTS/WS-C/dev/dd/wscoor1.1/wsdl/wscoor.wsdl
labs/jbosstm/trunk/XTS/WS-C/dev/dd/wscoor1.1/wsdl/wscoor.xsd
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/processor/BaseWSAddrResponseProcessor.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/InstanceIdentifier.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/processor/BaseNotificationProcessor.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/ActivationCoordinatorClient.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/ActivationCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/RegistrationCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/ActivationCoordinator.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/ObjectFactory.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/SoapFaultService.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ActivationPortType.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ActivationService.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/CoordinationContextType.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ObjectFactory.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/RegistrationPortType.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/RegistrationService.java
labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c-tests_web-app.xml
labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_web-app.xml
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/ActivationTestCase.java
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationTestCase.java
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml
labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t_handlers.xml
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wsarjtx/build.sh
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/build.sh
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/ObjectFactory.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationCoordinatorPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationCoordinatorService.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationParticipantPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationParticipantService.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationParticipantClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantCallback.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/CoordinatorInboundEvents.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/ParticipantInboundEvents.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionCoordinatorClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorCallback.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/ParticipantProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionCoordinatorInboundEvents.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionParticipantInboundEvents.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionCoordinatorInboundEvents.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionParticipantInboundEvents.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionParticipantProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionParticipantProcessor.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/TerminationCoordinatorProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionParticipantEngine.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorEngine.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionParticipantEngine.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantEngine.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessAgreementWithCoordinatorCompletionStub.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessAgreementWithParticipantCompletionStub.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/CompletionStub.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/Durable2PCStub.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/ParticipantStub.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/Volatile2PCStub.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionCoordinatorPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionCoordinatorService.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorService.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorService.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ObjectFactory.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantService.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BAAtomicOutcomeAssertion.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BAMixedOutcomeAssertion.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorService.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantService.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorService.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantService.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/ExceptionType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/NotificationType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/ObjectFactory.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/StatusType.java
labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml
labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionCoordinatorTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionParticipantTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionCoordinatorTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionParticipantTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionParticipantTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionInitiatorCallback.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionParticipantProcessor.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionCoordinatorProcessor.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionParticipantProcessor.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantProcessor.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCCoordinatorTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java
labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_web-app.xml
labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf-tests_web-app.xml
labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_web-app.xml
labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_web-app.xml
labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_web-app.xml
labs/jbosstm/trunk/XTS/demo/ddrpc/jboss/webservices.xml
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web.xml
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web.xml
Log:
refactored addressing properties management code into a separate package as a preliminary step to porting to CXF - fixes towards JBTM-265
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/build.sh 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/build.sh 2009-05-12 14:36:47 UTC (rev 26470)
@@ -19,4 +19,4 @@
rm -rf tmp/classes/* tmp/src/*
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/soapfault.wsdl -d tmp/classes -s tmp/src -target 2.0 -p org.jboss.jbossts.xts.soapfault wsdl/soapfault.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/soapfault.wsdl -d tmp/classes -s tmp/src -target 2.1 -p org.jboss.jbossts.xts.soapfault wsdl/soapfault.wsdl
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -42,23 +42,23 @@
<!-- Define WSCOOR 1.1 JaxWS Server Endpoints -->
<servlet>
- <servlet-name>Activation Service</servlet-name>
+ <servlet-name>ActivationService</servlet-name>
<servlet-class>com.arjuna.webservices11.wscoor.sei.ActivationPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>Registration Service</servlet-name>
+ <servlet-name>RegistrationService</servlet-name>
<servlet-class>com.arjuna.webservices11.wscoor.sei.RegistrationPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- Define WSCOOR 1.1 JaxWS Server Endpoint Mappings -->
<servlet-mapping>
- <servlet-name>Activation Service</servlet-name>
+ <servlet-name>ActivationService</servlet-name>
<url-pattern>/ActivationService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Registration Service</servlet-name>
+ <servlet-name>RegistrationService</servlet-name>
<url-pattern>/RegistrationService</url-pattern>
</servlet-mapping>
</web-app>
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c_handlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c_handlers.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c_handlers.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -29,9 +29,11 @@
<handler-name>Instance Identifier Handler</handler-name>
<handler-class>com.arjuna.webservices11.wsarj.handler.InstanceIdentifierInHandler</handler-class>
</handler>
+ <!-- should not need this any more
<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>
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/wscoor1.1/wsdl/wscoor.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/wscoor1.1/wsdl/wscoor.wsdl 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/wscoor1.1/wsdl/wscoor.wsdl 2009-05-12 14:36:47 UTC (rev 26470)
@@ -10,9 +10,11 @@
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:wscoor="http://docs.oasis-open.org/ws-tx/wscoor/2006/06" targetNamespace="http://docs.oasis-open.org/ws-tx/wscoor/2006/06">
<wsdl:types>
<xs:schema>
+ <!--
<xs:import
namespace='http://www.w3.org/2005/08/addressing'
schemaLocation='ws-addr.xsd' />
+ -->
<xs:import
namespace='http://docs.oasis-open.org/ws-tx/wscoor/2006/06'
schemaLocation='wscoor.xsd' />
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/wscoor1.1/wsdl/wscoor.xsd
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/wscoor1.1/wsdl/wscoor.xsd 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/wscoor1.1/wsdl/wscoor.xsd 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,7 +8,10 @@
This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-->
<xsd:schema targetNamespace="http://docs.oasis-open.org/ws-tx/wscoor/2006/06" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:wscoor="http://docs.oasis-open.org/ws-tx/wscoor/2006/06" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
+ <!--
<xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
+ -->
+ <xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="ws-addr.xsd"/>
<xsd:element name="Expires">
<xsd:complexType>
<xsd:simpleContent>
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -2,16 +2,10 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
-import com.arjuna.webservices.util.InvalidEnumerationException;
import org.w3c.dom.Element;
import org.jboss.jbossts.xts.soapfault.Fault;
import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import java.io.StringWriter;
/**
* Created by IntelliJ IDEA.
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -2,20 +2,13 @@
import com.arjuna.wsc11.messaging.MessageId;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
-import com.arjuna.webservices.wsarj.ArjunaConstants;
+import com.arjuna.webservices11.wsaddr.map.*;
-import javax.xml.ws.addressing.*;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPException;
-import java.net.URISyntaxException;
-import java.net.URI;
-import java.util.List;
-import java.util.Iterator;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.namespace.QName;
+import java.util.Map;
-import org.w3c.dom.Element;
-
/**
* The complete addressing context.
* @author kevin
@@ -26,12 +19,12 @@
{
}
- public static AddressingProperties createOneWayResponseContext(final AddressingProperties addressingProperties, final String messageID)
+ public static MAP createOneWayResponseContext(final MAP map, final String messageID)
{
// create this each time so it uses the current thread classloader
// this allows the builder class to be redefined via a property
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- final AddressingProperties responseProperties = builder.newAddressingProperties();
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ final MAP responseMap = builder.newMap();
// ok just calling initializeAsDestination directly fails when the FaultTo/ReplyTo/From
// contains reference parameter elements. these get installed into the target element extensions
// list for insertion into the outgoing message. however, the insertion fails.
@@ -39,77 +32,64 @@
// elements but this ignores the fact that they have a DOM node attached. when the
// appendElement is called it barfs because the target and source belong to different
// documents. we patch this by copying the FaultTo or ReplyTo or from here if need be.
- EndpointReference epref = addressingProperties.getReplyTo();
+ MAPEndpoint epref = map.getReplyTo();
if (isNoneAddress(epref)) {
- epref = addressingProperties.getFrom();
+ epref = map.getFrom();
}
- if (!isNoneAddress(epref)) {
- epref = patchEndpointReference(epref);
- }
- responseProperties.initializeAsDestination(epref);
- responseProperties.setMessageID(makeURI(builder, messageID)) ;
+ responseMap.initializeAsDestination(epref);
+ responseMap.setMessageID(messageID) ;
- if (addressingProperties.getMessageID() != null)
+ if (map.getMessageID() != null)
{
- Relationship rel = builder.newRelationship(addressingProperties.getMessageID().getURI());
- responseProperties.setRelatesTo(new Relationship[] { rel });
+ MAPRelatesTo relatesTo = builder.newRelatesTo(map.getMessageID(), REPLY_RELATIONSHIP_TYPE_QNAME);
+ responseMap.setRelatesTo(relatesTo);
}
- return responseProperties ;
+ return responseMap ;
}
/**
* Create an addressing context that represents an inline reply to the specified addressing context.
- * @param addressingProperties The addressing context being replied to.
+ * @param map The addressing context being replied to.
* @param messageID The message id of the new message.
* @return The reply addressing context.
*/
- public static AddressingProperties createResponseContext(final AddressingProperties addressingProperties, final String messageID)
+ public static MAP createResponseContext(final MAP map, final String messageID)
{
// create this each time so it uses the current thread classloader
// this allows the builder class to be redefined via a property
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- final AddressingProperties responseProperties = builder.newAddressingProperties();
- // ok just calling initializeAsDestination directly fails when the FaultTo/ReplyTo/From
- // contains reference parameter elements. these get installed into the target element extensions
- // list for insertion into the outgoing message. however, the insertion fails.
- // JBossWS decides they can be inserted as is without copying because they are SOAP
- // elements but this ignores the fact that they have a DOM node attached. when the
- // appendElement is called it barfs because the target and source belong to different
- // documents. we patch this by copying the FaultTo or ReplyTo or from here if need be.
- EndpointReference epref = addressingProperties.getReplyTo();
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ final MAP responseMap = builder.newMap();
+ MAPEndpoint epref = map.getReplyTo();
if (isNoneAddress(epref)) {
- epref = addressingProperties.getFrom();
+ epref = map.getFrom();
}
- if (!isNoneAddress(epref)) {
- epref = patchEndpointReference(epref);
- }
- responseProperties.initializeAsDestination(epref);
- responseProperties.setMessageID(makeURI(builder, messageID)) ;
+ responseMap.initializeAsDestination(epref);
+ responseMap.setMessageID(messageID) ;
- if (addressingProperties.getMessageID() != null)
+ if (map.getMessageID() != null)
{
- Relationship rel = builder.newRelationship(addressingProperties.getMessageID().getURI());
- responseProperties.setRelatesTo(new Relationship[] { rel });
+ MAPRelatesTo relatesTo = builder.newRelatesTo(map.getMessageID(), REPLY_RELATIONSHIP_TYPE_QNAME);
+ responseMap.setRelatesTo(relatesTo);
}
- return responseProperties ;
+ return responseMap ;
}
/**
* Create an addressing context that represents a fault to the specified addressing context.
- * @param addressingProperties The addressing context being replied to.
+ * @param map The addressing context being replied to.
* @param messageID The message id of the new message.
* @return The fault addressing context.
*
* N.B. Still need to do From, Action, ReplyTo, FaultTo if needed.
*/
- public static AddressingProperties createFaultContext(final AddressingProperties addressingProperties, final String messageID)
+ public static MAP createFaultContext(final MAP map, final String messageID)
{
// create this each time so it uses the current thread classloader
// this allows the builder class to be redefined via a property
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- final AddressingProperties faultProperties = builder.newAddressingProperties();
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ final MAP faultMap = builder.newMap();
// ok just calling initializeAsDestination directly fails when the FaultTo/ReplyTo/From
// contains reference parameter elements. these get installed into the target element extensions
// list for insertion into the outgoing message. however, the insertion fails.
@@ -117,68 +97,25 @@
// elements but this ignores the fact that they have a DOM node attached. when the
// appendElement is called it barfs because the target and source belong to different
// documents. we patch this by copying the FaultTo or ReplyTo or from here if need be.
- EndpointReference epref= addressingProperties.getFaultTo();
+ MAPEndpoint epref= map.getFaultTo();
if (isNoneAddress(epref)) {
- epref = addressingProperties.getReplyTo();
+ epref = map.getReplyTo();
if (isNoneAddress(epref)) {
- epref = addressingProperties.getFrom();
+ epref = map.getFrom();
}
}
- if (!isNoneAddress(epref)) {
- epref = patchEndpointReference(epref);
- faultProperties.initializeAsDestination(epref);
- } else {
- faultProperties.initializeAsDestination(getNoneAddress());
- }
- faultProperties.setMessageID(makeURI(builder, messageID)) ;
+ faultMap.initializeAsDestination(epref);
+ faultMap.setMessageID(messageID) ;
- if (addressingProperties.getMessageID() != null)
+ if (map.getMessageID() != null)
{
- Relationship rel = builder.newRelationship(addressingProperties.getMessageID().getURI());
- faultProperties.setRelatesTo(new Relationship[] { rel });
+ MAPRelatesTo relatesTo = builder.newRelatesTo(map.getMessageID(), REPLY_RELATIONSHIP_TYPE_QNAME);
+ faultMap.setRelatesTo(relatesTo);
}
- return faultProperties ;
+ return faultMap ;
}
- // patch the case where we have an epref with a single reference parameter which is an
- // Arjuna TX InstanceIdentifier
- private static EndpointReference patchEndpointReference(EndpointReference epr)
- {
- ReferenceParameters refParams = epr.getReferenceParameters();
- List<Object> list = refParams.getElements();
- /*
- Object obj;
- if (list.size() == 1 && ((obj = list.get(0)) instanceof Element)) {
- Element element = (Element) obj;
- if (ArjunaConstants.WSARJ_NAMESPACE.equals(element.getNamespaceURI()) &&
- ArjunaConstants.WSARJ_ELEMENT_INSTANCE_IDENTIFIER.equals(element.getLocalName())) {
- String identifier = element.getFirstChild().getNodeValue();
- // ok, cerate a copy of the epref with a new reference parameter element
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- EndpointReference newEpr = builder.newEndpointReference(epr.getAddress().getURI());
- InstanceIdentifier.setEndpointInstanceIdentifier(newEpr, identifier);
- return newEpr;
- }
- }
- */
- if (list.size() > 0) {
- Iterator iterator = list.iterator();
- // ok, create a copy of the epref with a cloned reference parameter list
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- EndpointReference newEpr = builder.newEndpointReference(epr.getAddress().getURI());
- ReferenceParameters newRefParams = newEpr.getReferenceParameters();
- while (iterator.hasNext()) {
- SOAPElement element = (SOAPElement) iterator.next();
- SOAPElement newElement = cloneElement(element);
- newRefParams.addElement(newElement);
- }
- return newEpr;
- } else {
- return epr;
- }
- }
-
/**
* Create an addressing context that represents a request to the specified address.
* @param address TheendpointReference target address.
@@ -187,23 +124,23 @@
*
* N.B. Still need to do From, Action, ReplyTo, FaultTo if needed.
*/
- public static AddressingProperties createRequestContext(final String address, final String messageID)
+ public static MAP createRequestContext(final String address, final String messageID)
{
// create this each time so it uses the current thread classloader
// this allows the builder class to be redefined via a property
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- final AddressingProperties requestProperties = builder.newAddressingProperties();
- requestProperties.setTo(makeURI(builder, address));
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ final MAP requestMap = builder.newMap();
+ requestMap.setTo(address);
if (messageID != null) {
- requestProperties.setMessageID(makeURI(builder, messageID));
+ requestMap.setMessageID(messageID);
} else {
// client does not care about id but we have to set some id or WSA will complain
final String dummyID = MessageId.getMessageId();
- requestProperties.setMessageID(makeURI(builder, dummyID));
+ requestMap.setMessageID(dummyID);
}
- return requestProperties;
+ return requestMap;
}
/**
@@ -215,41 +152,41 @@
*
* N.B. Still need to do From, Action, ReplyTo, FaultTo if needed.
*/
- public static AddressingProperties createRequestContext(final String address, final String action, final String messageID)
+ public static MAP createRequestContext(final String address, final String action, final String messageID)
{
// create this each time so it uses the current thread classloader
// this allows the builder class to be redefined via a property
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- final AddressingProperties requestProperties = builder.newAddressingProperties();
- requestProperties.setTo(makeURI(builder, address));
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ final MAP requestMap = builder.newMap();
+ requestMap.setTo(address);
if (messageID != null) {
- requestProperties.setMessageID(makeURI(builder, messageID));
+ requestMap.setMessageID(messageID);
} else {
// client does not care about id but we have to set some id or WSA will complain
final String dummyID = MessageId.getMessageId();
- requestProperties.setMessageID(makeURI(builder, dummyID));
+ requestMap.setMessageID(dummyID);
}
- requestProperties.setAction(makeURI(builder, action));
+ requestMap.setAction(action);
- return requestProperties;
+ return requestMap;
}
/**
* Create an addressing context that represents a notification to the specified context.
- * @param addressingProperties The addressing properties used to derive the notification addressing context.
+ * @param map The addressing properties used to derive the notification addressing context.
* @param messageID The message id of the new message.
* @return The notification addressing context.
*
* N.B. Still need to do From, Action, ReplyTo, FaultTo if needed.
*/
- public static AddressingProperties createRequestContext(final AddressingProperties addressingProperties, final String messageID)
+ public static MAP createRequestContext(final MAP map, final String messageID)
{
// create this each time so it uses the current thread classloader
// this allows the builder class to be redefined via a property
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- final AddressingProperties requestProperties = builder.newAddressingProperties();
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ final MAP requestMap = builder.newMap();
// ok just calling initializeAsDestination directly fails when the FaultTo/ReplyTo/From
// contains reference parameter elements. these get installed into the target element extensions
// list for insertion into the outgoing message. however, the insertion fails.
@@ -257,26 +194,23 @@
// elements but this ignores the fact that they have a DOM node attached. when the
// appendElement is called it barfs because the target and source belong to different
// documents. we patch this by copying the FaultTo or ReplyTo or from here if need be.
- EndpointReference epref = addressingProperties.getReplyTo();
+ MAPEndpoint epref = map.getReplyTo();
if (isNoneAddress(epref)) {
- epref = addressingProperties.getFrom();
+ epref = map.getFrom();
}
- if (!isNoneAddress(epref)) {
- epref = patchEndpointReference(epref);
- }
- requestProperties.initializeAsDestination(epref);
+ requestMap.initializeAsDestination(epref);
if (messageID != null)
{
- requestProperties.setMessageID (makeURI(builder, messageID));
+ requestMap.setMessageID (messageID);
}
- if (addressingProperties.getMessageID() != null)
+ if (map.getMessageID() != null)
{
- Relationship rel = builder.newRelationship(addressingProperties.getMessageID().getURI());
- requestProperties.setRelatesTo(new Relationship[] { rel });
+ MAPRelatesTo relatesTo = builder.newRelatesTo(map.getMessageID(), REPLY_RELATIONSHIP_TYPE_QNAME);
+ requestMap.setRelatesTo(relatesTo);
}
- return requestProperties;
+ return requestMap;
}
/**
@@ -284,161 +218,179 @@
* @param messageID The message id of the new message.
* @return The notification addressing context.
*/
- public static AddressingProperties createNotificationContext(final String messageID)
+ public static MAP createNotificationContext(final String messageID)
{
// create this each time so it uses the current thread classloader
// this allows the builder class to be redefined via a property
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- final AddressingProperties requestProperties = builder.newAddressingProperties();
- requestProperties.setMessageID (makeURI(builder, messageID));
- requestProperties.setAction(makeURI(builder, ""));
- URI noneURI = URI.create(builder.newAddressingConstants().getNoneURI());
- requestProperties.setReplyTo(builder.newEndpointReference(noneURI));
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ final MAP requestMap = builder.newMap();
+ requestMap.setMessageID (messageID);
+ requestMap.setAction("");
+ String noneURI = builder.newConstants().getNoneURI();
+ requestMap.setReplyTo(builder.newEndpoint(noneURI));
- return requestProperties;
+ return requestMap;
}
- public static void installActionMessageID(AddressingProperties addressingProperties, final String action, final String messageID)
+ public static void installActionMessageID(MAP map, final String action, final String messageID)
{
// requestProperties has been derived from an endpoint so To and ReferenceParameters will be set. we
// need to install the action and messageID
// create this each time so it uses the current thread classloader
// this allows the builder class to be redefined via a property
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- addressingProperties.setMessageID(makeURI(builder, messageID));
- addressingProperties.setAction(makeURI(builder, action));
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ map.setMessageID(messageID);
+ map.setAction(action);
}
- public static void installCallerProperties(AddressingProperties addressingProperties, AddressingProperties requestProperties)
+ public static void installCallerProperties(MAP map, MAP requestMap)
{
- // requestProperties has been derived from an endpoint so To and ReferenceParameters will be set. we
- // need to install alll the other fields supplied in addressingProperties
+ // requestMap has been derived from an endpoint so To and ReferenceParameters will be set. we
+ // need to install alll the other fields supplied in map
- AttributedURI uri;
- Relationship[] relatesTo;
- EndpointReference epr;
- uri = addressingProperties.getAction();
+ String uri;
+ MAPRelatesTo relatesTo;
+ MAPEndpoint epr;
+ uri = map.getAction();
if (uri != null) {
- requestProperties.setAction(uri);
+ requestMap.setAction(uri);
}
- uri = addressingProperties.getMessageID();
+ uri = map.getMessageID();
if (uri != null) {
- requestProperties.setMessageID(uri);
+ requestMap.setMessageID(uri);
}
- epr = addressingProperties.getFrom();
+ epr = map.getFrom();
if (epr != null) {
- requestProperties.setFrom(epr);
+ requestMap.setFrom(epr);
}
- epr = addressingProperties.getFaultTo();
+ epr = map.getFaultTo();
if (epr != null) {
- requestProperties.setFaultTo(epr);
+ requestMap.setFaultTo(epr);
}
- epr = addressingProperties.getReplyTo();
+ epr = map.getReplyTo();
if (epr != null) {
- requestProperties.setReplyTo(epr);
+ requestMap.setReplyTo(epr);
}
- relatesTo = addressingProperties.getRelatesTo();
+ relatesTo = map.getRelatesTo();
if (relatesTo != null) {
- requestProperties.setRelatesTo(relatesTo);
+ requestMap.setRelatesTo(relatesTo);
}
}
- public static void installFaultTo(AddressingProperties addressingProperties, EndpointReference epReference, InstanceIdentifier identifier)
+ public static void installFaultTo(MAP map, MAPEndpoint epReference, InstanceIdentifier identifier)
{
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- EndpointReference from = builder.newEndpointReference(epReference.getAddress().getURI());
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ MAPEndpoint from = builder.newEndpoint(epReference.getAddress());
InstanceIdentifier.setEndpointInstanceIdentifier(from, identifier);
- addressingProperties.setFaultTo(from);
+ map.setFaultTo(from);
}
- public static void installFromFaultTo(AddressingProperties addressingProperties, EndpointReference epReference, InstanceIdentifier identifier)
+ public static void installFromFaultTo(MAP map, MAPEndpoint epReference, InstanceIdentifier identifier)
{
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- EndpointReference from = builder.newEndpointReference(epReference.getAddress().getURI());
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ MAPEndpoint from = builder.newEndpoint(epReference.getAddress());
InstanceIdentifier.setEndpointInstanceIdentifier(from, identifier);
- addressingProperties.setFrom(from);
- EndpointReference faultTo = builder.newEndpointReference(epReference.getAddress().getURI());
+ map.setFrom(from);
+ MAPEndpoint faultTo = builder.newEndpoint(epReference.getAddress());
InstanceIdentifier.setEndpointInstanceIdentifier(faultTo, identifier);
- addressingProperties.setFaultTo(faultTo);
+ map.setFaultTo(faultTo);
}
- private static EndpointReference noneAddress = null;
-
- private static synchronized EndpointReference getNoneAddress()
+ public static boolean isNoneReplyTo(MAP map)
{
- if (noneAddress == null) {
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- AddressingConstants addressingConstants = builder.newAddressingConstants();
- try {
- URI noneURI = new URI(addressingConstants.getNoneURI());
- noneAddress = builder.newEndpointReference(noneURI);
- } catch (URISyntaxException e) {
- // will not happen
- }
- }
-
- return noneAddress;
+ return isNoneAddress(map.getReplyTo());
}
- public static boolean isNoneReplyTo(AddressingProperties addressingProperties)
+ public static boolean isNoneAddress(MAPEndpoint epref)
{
- return isNoneAddress(addressingProperties.getReplyTo());
- }
-
- public static boolean isNoneAddress(EndpointReference epref)
- {
if (epref != null) {
- String noneAddress = getNoneAddress().getAddress().getURI().toString();
- String eprefAddress = epref.getAddress().getURI().toString();
+ String noneAddress = getNoneAddress().getAddress();
+ String eprefAddress = epref.getAddress();
return noneAddress.equals(eprefAddress);
} else {
return true;
}
}
- public static void installNoneReplyTo(AddressingProperties addressingProperties)
+
+ public static void installNoneReplyTo(MAP map)
{
- addressingProperties.setReplyTo(getNoneAddress());
+ map.setReplyTo(getNoneAddress());
}
- public static javax.xml.ws.addressing.AttributedURI makeURI(AddressingBuilder builder, String messageID)
+ /**
+ * JBossWS Native version to configure request context with MAP, to and action
+ * @param requestContext
+ * @param map
+ * @param to
+ * @param action
+ */
+ public static void configureRequestContext(Map<String, Object> requestContext, MAP map, String to, String action)
{
- try {
- return builder.newURI(messageID);
- } catch (URISyntaxException use) {
- return null;
- }
+ configureRequestContext(requestContext, map);
+ configureRequestContext(requestContext, to, action);
}
- private static SOAPFactory factory = createSoapFactory();
-
- private static SOAPFactory createSoapFactory()
+ /**
+ * JBossWS Native version to configure request context with MAP
+ * @param requestContext
+ */
+ public static void configureRequestContext(Map<String, Object> requestContext, MAP map)
{
- try {
- SOAPFactory factory = SOAPFactory.newInstance();
- return factory;
- } catch (SOAPException e) {
- // TODO log error here (should never happen)
+ map.installOutboundMap(requestContext, map);
+ }
+
+ /**
+ * JBossWS Native version to configure request context with to and action
+ * @param requestContext
+ * @param to
+ * @param action
+ */
+ public static void configureRequestContext(Map<String, Object> requestContext, String to, String action) {
+ requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, to);
+ if (action != null) {
+ // need to set soap action header based upon what the client asks for
+ requestContext.put(BindingProvider.SOAPACTION_URI_PROPERTY, action);
}
- return null;
}
+
+ /**
+ * retrieve the inbound server message address properties attached to a message context
+ * @param ctx the server message context
+ * @return
+ */
+ public static MAP inboundMap(MessageContext ctx)
+ {
+ return MAPBuilder.getBuilder().inboundMap(ctx);
+ }
/**
- * create a SOAPElement which is a deep copy of the supplied SOAPElement
- * @param element
+ * retrieve the outbound client message address properties attached to a message request map
+ * @param ctx the client request properties map
* @return
*/
- private static SOAPElement cloneElement(SOAPElement element)
+ public static MAP outboundMap(Map<String, Object> ctx) {
+ return MAPBuilder.getBuilder().outboundMap(ctx);
+ }
+
+ private static MAPEndpoint noneAddress = null;
+
+ private static synchronized MAPEndpoint getNoneAddress()
{
- try {
- Element copy = (Element)element.cloneNode(true);
- SOAPElement newElement = factory.createElement(copy);
- return newElement;
- } catch (SOAPException e) {
- return element;
+ if (noneAddress == null) {
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ MAPConstants mapConstants = builder.newConstants();
+ String noneURI = mapConstants.getNoneURI();
+ noneAddress = builder.newEndpoint(noneURI);
}
+
+ return noneAddress;
}
+
+ private static String REPLY_RELATIONSHIP_TYPE_NS = "org.jboss.jbossts.xts";
+ private static String REPLY_RELATIONSHIP_TYPE_STRING = "reply";
+ private static QName REPLY_RELATIONSHIP_TYPE_QNAME = new QName(REPLY_RELATIONSHIP_TYPE_NS, REPLY_RELATIONSHIP_TYPE_STRING);
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -24,23 +24,18 @@
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
-import java.net.URISyntaxException;
-import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.*;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.soap.AddressingFeature;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import javax.xml.ws.handler.Handler;
-import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsarj.InstanceIdentifier;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.jbossts.xts.soapfault.SoapFaultService;
-import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
-import org.w3c.dom.Element;
/**
* Base client.
@@ -51,22 +46,22 @@
/**
* Send a fault.
* @param soapFault The SOAP fault.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param action The action URI for the request.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
public static void sendSoapFault(final SoapFault11 soapFault,
- final AddressingProperties addressingProperties,
- final AttributedURI action)
+ final MAP map,
+ final String action)
throws SoapFault11, IOException
{
if (action != null)
{
- soapFault.setAction(action.getURI().toString()) ;
+ soapFault.setAction(action) ;
}
- final SoapFaultPortType faultPort = getSoapFaultPort(addressingProperties, action);
+ final SoapFaultPortType faultPort = getSoapFaultPort(map, action);
Fault fault = soapFault.toFault();
faultPort.soapFault(fault);
}
@@ -75,23 +70,23 @@
* Send a fault to a specific endpoint.
* @param soapFault The SOAP fault.
* @param endpoint an endpoint ot dispatch the fault to.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param action The action URI for the request.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
public static void sendSoapFault(final SoapFault11 soapFault,
W3CEndpointReference endpoint,
- final AddressingProperties addressingProperties,
- final AttributedURI action)
+ final MAP map,
+ final String action)
throws SoapFault11, IOException
{
if (action != null)
{
- soapFault.setAction(action.getURI().toString()) ;
+ soapFault.setAction(action) ;
}
- final SoapFaultPortType faultPort = getSoapFaultPort(endpoint, addressingProperties, action);
+ final SoapFaultPortType faultPort = getSoapFaultPort(endpoint, map, action);
Fault fault = soapFault.toFault();
faultPort.soapFault(fault);
}
@@ -108,57 +103,50 @@
return soapFaultService.get();
}
- private static SoapFaultPortType getSoapFaultPort(final AddressingProperties addressingProperties,
- final AttributedURI action)
+ private static SoapFaultPortType getSoapFaultPort(final MAP map,
+ final String action)
{
SoapFaultService service = getSoapFaultService();
- SoapFaultPortType port = service.getPort(SoapFaultPortType.class);
+ SoapFaultPortType port = service.getPort(SoapFaultPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- AttributedURI toUri = addressingProperties.getTo();
- List<Handler> customHandlerChain = new ArrayList<Handler>();
+ String to = map.getTo();
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
+ List<Handler> customHandlerChain = new ArrayList<Handler>();
customHandlerChain.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+ */
Map<String, Object> requestContext = bindingProvider.getRequestContext();
if (action != null) {
- addressingProperties.setAction(action);
+ map.setAction(action);
}
- 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());
- // need to set soap action header based upon what the client asks for
- requestContext.put(BindingProvider.SOAPACTION_URI_PROPERTY, action.getURI().toString());
+ AddressingHelper.configureRequestContext(requestContext, map, to, action);
return port;
}
private static SoapFaultPortType getSoapFaultPort(final W3CEndpointReference endpoint,
- final AddressingProperties addressingProperties,
- final AttributedURI action)
+ final MAP map,
+ final String action)
{
SoapFaultService service = getSoapFaultService();
- SoapFaultPortType port = service.getPort(endpoint, SoapFaultPortType.class);
+ SoapFaultPortType port = service.getPort(endpoint, SoapFaultPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
Map<String, Object> requestContext = bindingProvider.getRequestContext();
- AddressingProperties requestProperties = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
+ MAP requestMap = AddressingHelper.outboundMap(requestContext);
if (action != null) {
- addressingProperties.setAction(action);
+ map.setAction(action);
}
- AddressingHelper.installCallerProperties(addressingProperties, requestProperties);
- AttributedURI toUri = requestProperties.getTo();
- List<Handler> customHandlerChain = new ArrayList<Handler>();
+ AddressingHelper.installCallerProperties(map, requestMap);
+ String to = requestMap.getTo();
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
+ List<Handler> customHandlerChain = new ArrayList<Handler>();
customHandlerChain.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
- // need to set soap action header based upon what the client asks for
- requestContext.put(BindingProvider.SOAPACTION_URI_PROPERTY, action.getURI().toString());
+ */
+ AddressingHelper.configureRequestContext(requestContext, to, action);
return port;
}
Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAP.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAP.java (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAP.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -0,0 +1,186 @@
+package com.arjuna.webservices11.wsaddr.map;
+
+import org.w3c.dom.Element;
+
+import javax.xml.ws.addressing.*;
+import java.net.URISyntaxException;
+import java.net.URI;
+import java.util.Map;
+
+/**
+ * Message Addressing Properties is a wrapper class for the stack-specific addressing properties
+ * classes implemented by JBossWS Native and CXF. It is used to localize dependence upon the WS
+ * stack. This is the JBossWS Native specific implementation
+ */
+
+public class MAP
+{
+ /**
+ * JBossWS Native specific constructor
+ * @param implementation
+ */
+ MAP(AddressingProperties implementation)
+ {
+ this.implementation = implementation;
+ }
+
+ public String getTo() {
+ AttributedURI to = implementation.getTo();
+ return (to != null ? to.getURI().toString() : null);
+ }
+
+ public MAPEndpoint getFrom() {
+ EndpointReference from = implementation.getFrom();
+ return (from != null ? new MAPEndpoint(from) : null);
+ }
+
+ public String getMessageID() {
+ AttributedURI messageId = implementation.getMessageID();
+ return (messageId != null ? messageId.getURI().toString() : null);
+ }
+
+ public String getAction() {
+ AttributedURI action = implementation.getAction();
+ return (action != null ? action.getURI().toString() : null);
+ }
+
+ public MAPEndpoint getFaultTo() {
+ EndpointReference faultTo = implementation.getFaultTo();
+ return (faultTo != null ? new MAPEndpoint(faultTo) : null);
+ }
+
+ public MAPEndpoint getReplyTo()
+ {
+ EndpointReference replyTo = implementation.getReplyTo();
+ return (replyTo != null ? new MAPEndpoint(replyTo) : null);
+ }
+
+ public MAPRelatesTo getRelatesTo()
+ {
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ Relationship[] relationship = implementation.getRelatesTo();
+ if (relationship != null) {
+ Relationship relatesTo = relationship[0];
+ return builder.newRelatesTo(relatesTo.getID().toString(), relatesTo.getType());
+ } else {
+ return null;
+ }
+ }
+
+ public void setTo(String address)
+ {
+ if (address != null) {
+ try {
+ AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ AttributedURI uri = builder.newURI(address);
+ implementation.setTo(uri);
+ } catch (URISyntaxException e) {
+ // should not happen
+ }
+ } else {
+ implementation.setTo(null);
+ }
+ }
+
+ public void setFrom(MAPEndpoint epref)
+ {
+ if (epref != null) {
+ implementation.setFrom(epref.getImplementation());
+ } else {
+ implementation.setFrom(null);
+ }
+ }
+
+ public void setMessageID(String messageID)
+ {
+ if (messageID != null) {
+ try {
+ AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ AttributedURI uri = builder.newURI(messageID);
+ implementation.setMessageID(uri);
+ } catch (URISyntaxException e) {
+ // should not happen
+ }
+ } else {
+ implementation.setMessageID(null);
+ }
+ }
+
+ public void setAction(String action)
+ {
+ if (action != null) {
+ try {
+ AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ AttributedURI uri = builder.newURI(action);
+ implementation.setAction(uri);
+ } catch (URISyntaxException e) {
+ // should not happen
+ }
+ } else {
+ implementation.setAction(null);
+ }
+ }
+
+ public void setReplyTo(MAPEndpoint epref)
+ {
+ if (epref != null) {
+ implementation.setReplyTo(epref.getImplementation());
+ } else {
+ implementation.setReplyTo(null);
+ }
+ }
+
+ public void setFaultTo(MAPEndpoint epref)
+ {
+ if (epref != null) {
+ implementation.setFaultTo(epref.getImplementation());
+ } else {
+ implementation.setFaultTo(null);
+ }
+ }
+
+ public void setRelatesTo(MAPRelatesTo relatesTo)
+ {
+ if (relatesTo != null) {
+ try {
+ AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ Relationship[] relationships = new Relationship[1];
+ String relatesToId = relatesTo.getRelatesTo();
+ URI uri = new URI(relatesToId);
+ Relationship relationship = builder.newRelationship(uri);
+ relationship.setType(relatesTo.getType());
+ relationships[0] = relationship;
+ implementation.setRelatesTo(relationships);
+ } catch (URISyntaxException e) {
+ // should not happen
+ }
+ } else {
+ implementation.setRelatesTo(null);
+ }
+ }
+
+ public void addReferenceParameter(Element refParam)
+ {
+ implementation.getReferenceParameters().addElement(refParam);
+ // cxf needs to do
+ // implementtaion.getToEndpointReference().getReferenceParameters().getAny().add(refParam);
+ }
+
+ public void initializeAsDestination(MAPEndpoint epref)
+ {
+ implementation.initializeAsDestination(epref.getImplementation());
+ }
+
+
+ public void installOutboundMap(Map<String, Object> requestContext, MAP map)
+ {
+ AddressingProperties addressingProperties = map.implementation;
+
+ requestContext.put(MAPConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
+ requestContext.put(MAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
+ }
+ /**
+ * the wrapped instance which this class delegates to
+ */
+ private AddressingProperties implementation;
+}
Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPBuilder.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPBuilder.java (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPBuilder.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -0,0 +1,79 @@
+package com.arjuna.webservices11.wsaddr.map;
+
+import javax.xml.ws.addressing.*;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.namespace.QName;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+
+/**
+ * MAPBuilder is a helper class used to create objects used with class MAP. This is the JBossWS Native
+ * implementation
+ */
+public class MAPBuilder
+{
+ public static MAPBuilder getBuilder() {
+ return theBuilder;
+ }
+
+ public MAP newMap() {
+ AddressingProperties implementation = addressingBuilder.newAddressingProperties();
+ return new MAP(implementation);
+ }
+
+ /**
+ * retrieve the inbound server message address properties attached to a message context
+ * @param ctx the server message context
+ * @return
+ */
+ public MAP inboundMap(MessageContext ctx)
+ {
+ AddressingProperties implementation = (AddressingProperties)ctx.get(MAPConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ return newMap(implementation);
+ }
+
+ /**
+ * retrieve the outbound client message address properties attached to a message request map
+ * @param ctx the client request properties map
+ * @return
+ */
+ public MAP outboundMap(Map<String, Object> ctx) {
+ AddressingProperties implementation = (AddressingProperties)ctx.get(MAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
+ return newMap(implementation);
+ }
+
+ // n.b. this is package public only!
+ MAP newMap(AddressingProperties implementation) {
+ return new MAP(implementation);
+ }
+
+ public MAPConstants newConstants() {
+ AddressingConstants implementation = addressingBuilder.newAddressingConstants();
+ return new MAPConstants(implementation);
+ }
+
+ public MAPEndpoint newEndpoint(String address) {
+ try {
+ URI uri = new URI(address);
+ EndpointReference implementation = addressingBuilder.newEndpointReference(uri);
+ return new MAPEndpoint(implementation);
+ } catch (URISyntaxException e) {
+ return null;
+ }
+ }
+
+ public MAPRelatesTo newRelatesTo(String id, QName type) {
+ return new MAPRelatesTo(id, type);
+ }
+
+ private MAPBuilder()
+ {
+ AddressingBuilder implementation = AddressingBuilder.getAddressingBuilder();
+ this.addressingBuilder = implementation;
+ }
+
+ private AddressingBuilder addressingBuilder;
+
+ private static MAPBuilder theBuilder = new MAPBuilder();
+}
Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPConstants.java (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPConstants.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -0,0 +1,32 @@
+package com.arjuna.webservices11.wsaddr.map;
+
+import javax.xml.ws.addressing.AddressingConstants;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.namespace.QName;
+
+/**
+ * MAPConstants is a wrapper class which works with class MAP
+ */
+public class MAPConstants
+{
+ MAPConstants(AddressingConstants implementation)
+ {
+ this.implementation = implementation;
+ }
+
+ public String getNoneURI() {
+ return implementation.getNoneURI();
+ }
+
+ public static final String CLIENT_ADDRESSING_PROPERTIES = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES;
+
+ public static final String CLIENT_ADDRESSING_PROPERTIES_INBOUND = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND;
+
+ public static final String CLIENT_ADDRESSING_PROPERTIES_OUTBOUND = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND;
+
+ public static final String SERVER_ADDRESSING_PROPERTIES_INBOUND = JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND;
+
+ public static final String SERVER_ADDRESSING_PROPERTIES_OUTBOUND = JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND;
+
+ private AddressingConstants implementation;
+}
Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPEndpoint.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPEndpoint.java (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPEndpoint.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -0,0 +1,33 @@
+package com.arjuna.webservices11.wsaddr.map;
+
+import org.w3c.dom.Element;
+
+import javax.xml.ws.addressing.EndpointReference;
+
+/**
+ * MAPEndpoint is a wrapper class which works with class MAP. This is the JBossWS Native implementation.
+ */
+public class MAPEndpoint
+{
+ MAPEndpoint(EndpointReference implementation)
+ {
+ this.implementation = implementation;
+ }
+
+ public String getAddress()
+ {
+ return implementation.getAddress().getURI().toString();
+ }
+
+ public void addReferenceParameter(Element element)
+ {
+ implementation.getReferenceParameters().addElement(element);
+ }
+
+ EndpointReference getImplementation()
+ {
+ return implementation;
+ }
+
+ private EndpointReference implementation;
+}
Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPRelatesTo.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPRelatesTo.java (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/MAPRelatesTo.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -0,0 +1,34 @@
+package com.arjuna.webservices11.wsaddr.map;
+
+import javax.xml.ws.addressing.Relationship;
+import javax.xml.namespace.QName;
+
+/**
+ * MAPRelationship is a wrapper class which works with class MAP. This is the JBossWS Native implementation.
+ */
+public class MAPRelatesTo
+{
+ MAPRelatesTo(String relatesTo, QName type)
+ {
+ this.relatesTo = relatesTo;
+ this.type = type;
+ }
+
+ public String getRelatesTo()
+ {
+ return relatesTo;
+ }
+
+ public QName getType()
+ {
+ return type;
+ }
+
+ public void setType(QName type)
+ {
+ this.type = type;
+ }
+
+ private String relatesTo;
+ private QName type;
+}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/processor/BaseWSAddrResponseProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/processor/BaseWSAddrResponseProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/processor/BaseWSAddrResponseProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,8 +21,8 @@
package com.arjuna.webservices11.wsaddr.processor;
import com.arjuna.webservices.base.processors.BaseProcessor;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.Relationship;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.map.MAPRelatesTo;
/**
* Utility class handling common response functionality.
@@ -32,20 +32,16 @@
{
/**
* Get the callback ids.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @return The callback ids.
*/
- protected String[] getIDs(final AddressingProperties addressingProperties)
+ protected String[] getIDs(final MAP map)
{
- final Relationship[] relationships = addressingProperties.getRelatesTo() ;
- if (relationships != null)
+ final MAPRelatesTo relatesTo = map.getRelatesTo() ;
+ if (relatesTo != null)
{
- final int numRelationships = relationships.length ;
- final String[] ids = new String[numRelationships] ;
- for(int count = 0 ; count < numRelationships ; count++)
- {
- ids[count] = relationships[count].getID().toString();
- }
+ final String[] ids = new String[1] ;
+ ids[0] = relatesTo.getRelatesTo();
return ids ;
}
return null ;
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/InstanceIdentifier.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/InstanceIdentifier.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/InstanceIdentifier.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -27,9 +27,9 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFactory;
import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
-import javax.xml.ws.addressing.EndpointReference;
import com.arjuna.webservices.wsarj.ArjunaConstants;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
/**
* Representation of an InstanceIdentifier element.
@@ -120,7 +120,7 @@
* @param epReference The WS Addressing endpoint reference.
* @param instanceIdentifier The identifier.
*/
- public static void setEndpointInstanceIdentifier(final EndpointReference epReference, final InstanceIdentifier instanceIdentifier)
+ public static void setEndpointInstanceIdentifier(final MAPEndpoint epReference, final InstanceIdentifier instanceIdentifier)
{
setEndpointInstanceIdentifier(epReference, instanceIdentifier.getInstanceIdentifier());
}
@@ -130,9 +130,9 @@
* @param epReference The WS Addressing endpoint reference.
* @param instanceIdentifier The identifier string.
*/
- public static void setEndpointInstanceIdentifier(final EndpointReference epReference, final String instanceIdentifier)
+ public static void setEndpointInstanceIdentifier(final MAPEndpoint epReference, final String instanceIdentifier)
{
- epReference.getReferenceParameters().addElement(createInstanceIdentifierElement(instanceIdentifier));
+ epReference.addReferenceParameter(createInstanceIdentifierElement(instanceIdentifier));
}
/**
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/processor/BaseNotificationProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/processor/BaseNotificationProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsarj/processor/BaseNotificationProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -4,8 +4,6 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* Utility class handling common response functionality.
* @author kevin
@@ -14,11 +12,10 @@
{
/**
* Get the callback ids.
- * @param addressingProperties The addressing context.
* @param arjunaContext The arjuna context.
* @return The callback ids.
*/
- protected String[] getIDs(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ protected String[] getIDs(final ArjunaContext arjunaContext)
{
if (arjunaContext != null)
{
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/ActivationCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/ActivationCoordinatorClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/ActivationCoordinatorClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,10 +22,9 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
-import com.arjuna.webservices11.wscoor.client.WSCOORClient;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.*;
-import javax.xml.ws.addressing.AddressingProperties;
import java.io.IOException;
/**
@@ -48,7 +47,7 @@
/**
* Send a create coordination request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param coordinationType The type of the coordination.
* @param expires The expiry interval of the context.
* @param currentContext The current coordination context.
@@ -56,7 +55,7 @@
* @throws IOException for any transport errors.
*/
public CreateCoordinationContextResponseType
- sendCreateCoordination(final AddressingProperties addressingProperties,
+ sendCreateCoordination(final MAP map,
final String coordinationType, final Expires expires, final CoordinationContext currentContext)
throws SoapFault, IOException
{
@@ -80,7 +79,7 @@
}
// get proxy with required message id and end point address
- ActivationPortType port = WSCOORClient.getActivationPort(addressingProperties, CoordinationConstants.WSCOOR_ACTION_CREATE_COORDINATION_CONTEXT);
+ ActivationPortType port = WSCOORClient.getActivationPort(map, CoordinationConstants.WSCOOR_ACTION_CREATE_COORDINATION_CONTEXT);
// invoke remote method
return port.createCoordinationContextOperation(request);
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,22 +1,16 @@
package com.arjuna.webservices11.wscoor.client;
-import com.arjuna.webservices11.wsarj.handler.InstanceIdentifierHandler;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.ActivationPortType;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.ActivationService;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegistrationPortType;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegistrationService;
-import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import javax.xml.ws.BindingProvider;
-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.handler.Handler;
import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.handler.Handler;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -42,11 +36,6 @@
private static ThreadLocal<RegistrationService> registrationService = new ThreadLocal<RegistrationService>();
/**
- * 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
*/
@@ -70,32 +59,22 @@
return registrationService.get();
}
- public static ActivationPortType getActivationPort(AddressingProperties addressingProperties,
+ public static ActivationPortType getActivationPort(MAP map,
String action)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
ActivationService service = getActivationService();
- // ActivationPortType port = service.getPort(ActivationPortType.class, new AddressingFeature(true, true));
- ActivationPortType port = service.getPort(ActivationPortType.class);
+ ActivationPortType port = service.getPort(ActivationPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- AttributedURI toUri = addressingProperties.getTo();
+ String to = map.getTo();
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
List<Handler> customHandlerChain = new ArrayList<Handler>();
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
- }
+ AddressingHelper.configureRequestContext(requestContext, map, to, action);
return port;
}
@@ -104,34 +83,21 @@
// the activation port request
public static RegistrationPortType getRegistrationPort(W3CEndpointReference endpointReference, String action, String messageID)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
RegistrationService service = getRegistrationService();
- // RegistrationPortType port = service.getPort(endpointReference, RegistrationPortType.class, new AddressingFeature(true, true));
- RegistrationPortType port = service.getPort(endpointReference, RegistrationPortType.class);
+ RegistrationPortType port = service.getPort(endpointReference, RegistrationPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannoy specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
List<Handler> customHandlerChain = new ArrayList<Handler>();
customHandlerChain.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+ */
- // ok, JBossWS native has hacked this by pulling the address and reference parameters out of the endpoint
- // and storing them in an AddressingProperties instance hung off the context under CLIENT_ADDRESSING_PROPERTIES_OUTBOUND.
- // but we still need to set the action and message id -- this is all distinctly non-portable :-/
- // n.b. Metro installs the address in requestContext under ENDPOINT_ADDRESS_PROPERTY. it also seems to ensure
- // that the reference parameters get installed -- but how?
-
Map<String, Object> requestContext = bindingProvider.getRequestContext();
- // String address = (String)requestContext.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
- // AddressingProperties addressingProperties = AddressingHelper.createRequestContext(address, action, messageID);
- // requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
- // jbossws should do this for us . . .
- // requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
- AddressingProperties addressingProperties = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
- AddressingHelper.installActionMessageID(addressingProperties, action, messageID);
+ MAP map = AddressingHelper.outboundMap(requestContext);
+ AddressingHelper.installActionMessageID(map, action, messageID);
// we should not need to do this but JBossWS does not pick up the value in the addressing properties
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, addressingProperties.getTo().getURI().toString());
+ AddressingHelper.configureRequestContext(requestContext, map.getTo(), action);
return port;
}
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/ActivationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/ActivationCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/ActivationCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -20,10 +20,9 @@
*/
package com.arjuna.webservices11.wscoor.processors;
-import javax.xml.ws.addressing.AddressingProperties;
-
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CreateCoordinationContextType;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CreateCoordinationContextResponseType;
+import com.arjuna.webservices11.wsaddr.map.MAP;
/**
* The Activation Coordinator processor.
@@ -60,11 +59,11 @@
/**
* Create the coordination context.
* @param createCoordinationContext The create coordination context request.
- * @param addressingContext The addressing context.
+ * @param map The addressing context.
* @return a response message containing the desired coordinaton context
*/
public abstract CreateCoordinationContextResponseType
createCoordinationContext(final CreateCoordinationContextType createCoordinationContext,
- final AddressingProperties addressingProperties,
+ final MAP map,
final boolean isSecure) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/RegistrationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/RegistrationCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/processors/RegistrationCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,13 +21,10 @@
package com.arjuna.webservices11.wscoor.processors;
import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegisterResponseType;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegisterType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
/**
* The Registration Coordinator processor.
* @author kevin
@@ -63,9 +60,9 @@
/**
* Register the participant in the protocol.
* @param register The register request.
- * @param addressingContext The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract RegisterResponseType register(final RegisterType register, final AddressingProperties addressingContext,
+ public abstract RegisterResponseType register(final RegisterType register, final MAP map,
final ArjunaContext arjunaContext, final boolean isSecure) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -2,6 +2,8 @@
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.ActivationPortType;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CreateCoordinationContextType;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CreateCoordinationContextResponseType;
@@ -10,8 +12,6 @@
import javax.jws.*;
import javax.jws.soap.SOAPBinding;
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.xml.ws.soap.Addressing;
import javax.servlet.http.HttpServletRequest;
@@ -31,7 +31,7 @@
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class ActivationPortTypeImpl implements ActivationPortType
{
@@ -46,8 +46,7 @@
MessageContext ctx = webServiceCtx.getMessageContext();
HttpServletRequest request = (HttpServletRequest)ctx.get(MessageContext.SERVLET_REQUEST);
boolean isSecure = request.getScheme().equals("https");
- AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
- return ActivationCoordinatorProcessor.getCoordinator().createCoordinationContext(parameters, inboundAddressProperties, isSecure);
+ MAP inboundMAP = AddressingHelper.inboundMap(ctx);
+ return ActivationCoordinatorProcessor.getCoordinator().createCoordinationContext(parameters, inboundMAP, isSecure);
}
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -7,8 +7,6 @@
import javax.jws.*;
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.soap.Addressing;
import javax.annotation.Resource;
@@ -16,6 +14,9 @@
import com.arjuna.webservices11.wscoor.processors.RegistrationCoordinatorProcessor;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
/**
* Created by IntelliJ IDEA.
@@ -33,7 +34,7 @@
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class RegistrationPortTypeImpl implements RegistrationPortType
{
@@ -49,11 +50,10 @@
MessageContext ctx = webServiceCtx.getMessageContext();
HttpServletRequest request = (HttpServletRequest)ctx.get(MessageContext.SERVLET_REQUEST);
boolean isSecure = request.getScheme().equals("https");
- AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx) ;
- return RegistrationCoordinatorProcessor.getCoordinator().register(parameters, inboundAddressProperties, arjunaContext, isSecure);
+ return RegistrationCoordinatorProcessor.getCoordinator().register(parameters, inboundMap, arjunaContext, isSecure);
}
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/ActivationCoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/ActivationCoordinator.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/ActivationCoordinator.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,6 +23,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.webservices11.wscoor.client.ActivationCoordinatorClient;
import com.arjuna.wsc.InvalidCreateParametersException;
@@ -33,7 +34,6 @@
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPFault;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.soap.SOAPFaultException;
import java.io.IOException;
@@ -59,7 +59,7 @@
final CoordinationContext currentContext)
throws InvalidCreateParametersException, SoapFault
{
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(activationCoordinatorURI, messageID) ;
+ final MAP map = AddressingHelper.createRequestContext(activationCoordinatorURI, messageID) ;
final Expires expiresValue;
if (expires == null) {
@@ -73,7 +73,7 @@
{
CreateCoordinationContextResponseType response;
ActivationCoordinatorClient client = ActivationCoordinatorClient.getClient();
- response = client.sendCreateCoordination(addressingProperties, coordinationTypeURI, expiresValue, currentContext) ;
+ response = client.sendCreateCoordination(map, coordinationTypeURI, expiresValue, currentContext) ;
return response.getCoordinationContext();
}
catch (final IOException ioe)
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,13 +23,13 @@
import com.arjuna.webservices.logging.WSCLogger;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.wsc11.ContextFactory;
import com.arjuna.wsc.InvalidCreateParametersException;
import com.arjuna.wsc11.ContextFactoryMapper;
import javax.xml.ws.soap.SOAPFaultException;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.ProtocolException;
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPFactory;
@@ -45,14 +45,14 @@
/**
* Create the coordination context.
* @param createCoordinationContext The create coordination context request.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @message com.arjuna.wsc11.messaging.ActivationCoordinatorProcessorImpl_1 [com.arjuna.wsc11.messaging.ActivationCoordinatorProcessorImpl_1] - Invalid create coordination context parameters
* @message com.arjuna.wsc11.messaging.ActivationCoordinatorProcessorImpl_2 [com.arjuna.wsc11.messaging.ActivationCoordinatorProcessorImpl_2] - Unexpected exception thrown from create:
* @message com.arjuna.wsc11.messaging.ActivationCoordinatorProcessorImpl_3 [com.arjuna.wsc11.messaging.ActivationCoordinatorProcessorImpl_3] - CreateCoordinationContext called for unknown coordination type: {0}
*/
public CreateCoordinationContextResponseType
createCoordinationContext(final CreateCoordinationContextType createCoordinationContext,
- final AddressingProperties addressingProperties,
+ final MAP map,
final boolean isSecure)
{
final ContextFactoryMapper contextFactoryMapper = ContextFactoryMapper.getFactory() ;
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -26,6 +26,7 @@
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.webservices11.wscoor.processors.RegistrationCoordinatorProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.wsc.*;
import com.arjuna.wsc11.RegistrarMapper;
import com.arjuna.wsc11.Registrar;
@@ -35,7 +36,6 @@
import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPFault;
import javax.xml.ws.ProtocolException;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.soap.SOAPFaultException;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -55,10 +55,10 @@
/**
* Register the participant in the protocol.
* @param register The register request.
- * @param addressingContext The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public RegisterResponseType register(final RegisterType register, final AddressingProperties addressingContext,
+ public RegisterResponseType register(final RegisterType register, final MAP map,
final ArjunaContext arjunaContext, final boolean isSecure)
{
final com.arjuna.wsc11.RegistrarMapper registrarMapper = RegistrarMapper.getFactory() ;
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/ObjectFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/ObjectFactory.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/ObjectFactory.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -53,14 +53,6 @@
}
/**
- * Create an instance of {@link Header }
- *
- */
- public Header createHeader() {
- return new Header();
- }
-
- /**
* Create an instance of {@link Fault }
*
*/
@@ -77,6 +69,14 @@
}
/**
+ * Create an instance of {@link Header }
+ *
+ */
+ public Header createHeader() {
+ return new Header();
+ }
+
+ /**
* Create an instance of {@link JAXBElement }{@code <}{@link Fault }{@code >}}
*
*/
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "SoapFaultPortType", targetNamespace = "http://jbossts.jboss.org/xts/soapfault")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface SoapFaultPortType {
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/SoapFaultService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/SoapFaultService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/jbossts/xts/soapfault/SoapFaultService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "SoapFaultService", targetNamespace = "http://jbossts.jboss.org/xts/soapfault", wsdlLocation = "wsdl/soapfault.wsdl")
public class SoapFaultService
- extends Service21
+ extends Service
{
private final static URL SOAPFAULTSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultPortType"), SoapFaultPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns SoapFaultPortType
+ */
+ @WebEndpoint(name = "SoapFaultPortType")
+ public SoapFaultPortType getSoapFaultPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultPortType"), SoapFaultPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ActivationPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ActivationPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ActivationPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebResult;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "ActivationPortType", targetNamespace = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface ActivationPortType {
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ActivationService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ActivationService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ActivationService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,19 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
-import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "ActivationService", targetNamespace = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06", wsdlLocation = "wsdl/wscoor-activation-binding.wsdl")
public class ActivationService
- extends Service21
+ extends Service
{
private final static URL ACTIVATIONSERVICE_WSDL_LOCATION;
@@ -57,4 +56,16 @@
return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wscoor/2006/06", "ActivationPortType"), ActivationPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns ActivationPortType
+ */
+ @WebEndpoint(name = "ActivationPortType")
+ public ActivationPortType getActivationPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wscoor/2006/06", "ActivationPortType"), ActivationPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/CoordinationContextType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/CoordinationContextType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/CoordinationContextType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,6 +8,7 @@
import javax.xml.bind.annotation.XmlAnyAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.namespace.QName;
@@ -50,6 +51,10 @@
"coordinationType",
"registrationService"
})
+ at XmlSeeAlso({
+ org.oasis_open.docs.ws_tx.wscoor._2006._06.CreateCoordinationContextType.CurrentContext.class,
+ CoordinationContext.class
+})
public class CoordinationContextType {
@XmlElement(name = "Identifier", required = true)
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ObjectFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ObjectFactory.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/ObjectFactory.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -45,11 +45,11 @@
}
/**
- * Create an instance of {@link CreateCoordinationContextResponseType }
+ * Create an instance of {@link CreateCoordinationContextType.CurrentContext }
*
*/
- public CreateCoordinationContextResponseType createCreateCoordinationContextResponseType() {
- return new CreateCoordinationContextResponseType();
+ public CreateCoordinationContextType.CurrentContext createCreateCoordinationContextTypeCurrentContext() {
+ return new CreateCoordinationContextType.CurrentContext();
}
/**
@@ -61,35 +61,35 @@
}
/**
- * Create an instance of {@link CoordinationContextType }
+ * Create an instance of {@link RegisterResponseType }
*
*/
- public CoordinationContextType createCoordinationContextType() {
- return new CoordinationContextType();
+ public RegisterResponseType createRegisterResponseType() {
+ return new RegisterResponseType();
}
/**
- * Create an instance of {@link CreateCoordinationContextType.CurrentContext }
+ * Create an instance of {@link CoordinationContext }
*
*/
- public CreateCoordinationContextType.CurrentContext createCreateCoordinationContextTypeCurrentContext() {
- return new CreateCoordinationContextType.CurrentContext();
+ public CoordinationContext createCoordinationContext() {
+ return new CoordinationContext();
}
/**
- * Create an instance of {@link RegisterResponseType }
+ * Create an instance of {@link CreateCoordinationContextType }
*
*/
- public RegisterResponseType createRegisterResponseType() {
- return new RegisterResponseType();
+ public CreateCoordinationContextType createCreateCoordinationContextType() {
+ return new CreateCoordinationContextType();
}
/**
- * Create an instance of {@link CreateCoordinationContextType }
+ * Create an instance of {@link CreateCoordinationContextResponseType }
*
*/
- public CreateCoordinationContextType createCreateCoordinationContextType() {
- return new CreateCoordinationContextType();
+ public CreateCoordinationContextResponseType createCreateCoordinationContextResponseType() {
+ return new CreateCoordinationContextResponseType();
}
/**
@@ -101,11 +101,11 @@
}
/**
- * Create an instance of {@link CoordinationContext }
+ * Create an instance of {@link CoordinationContextType }
*
*/
- public CoordinationContext createCoordinationContext() {
- return new CoordinationContext();
+ public CoordinationContextType createCoordinationContextType() {
+ return new CoordinationContextType();
}
/**
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/RegistrationPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/RegistrationPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/RegistrationPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebResult;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "RegistrationPortType", targetNamespace = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface RegistrationPortType {
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/RegistrationService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/RegistrationService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/RegistrationService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,19 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
-import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "RegistrationService", targetNamespace = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06", wsdlLocation = "wsdl/wscoor-registration-binding.wsdl")
public class RegistrationService
- extends Service21
+ extends Service
{
private final static URL REGISTRATIONSERVICE_WSDL_LOCATION;
@@ -57,4 +56,16 @@
return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wscoor/2006/06", "RegistrationPortType"), RegistrationPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns RegistrationPortType
+ */
+ @WebEndpoint(name = "RegistrationPortType")
+ public RegistrationPortType getRegistrationPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wscoor/2006/06", "RegistrationPortType"), RegistrationPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c-tests_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c-tests_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -33,7 +33,7 @@
</listener>
<servlet>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.TestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -43,7 +43,7 @@
</servlet>
<servlet>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.TestRunnerXMLServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -54,12 +54,12 @@
<!-- servlet mappings -->
<servlet-mapping>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<url-pattern>/index.xml</url-pattern>
</servlet-mapping>
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -33,7 +33,7 @@
</listener>
<servlet>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.TestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -43,7 +43,7 @@
</servlet>
<servlet>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.TestRunnerXMLServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -54,12 +54,12 @@
<!-- servlet mappings -->
<servlet-mapping>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<url-pattern>/index.xml</url-pattern>
</servlet-mapping>
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -31,7 +31,6 @@
import com.arjuna.wsc.tests.TestUtil;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/ActivationTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/ActivationTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/ActivationTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,6 +28,7 @@
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wscoor.client.ActivationCoordinatorClient;
import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
import com.arjuna.wsc.tests.TestUtil;
@@ -36,7 +37,6 @@
import junit.framework.TestCase;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.*;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
public class ActivationTestCase extends TestCase
@@ -151,7 +151,7 @@
private void executeRequestTest(final String messageId, final String coordinationType, final Long expires, final CoordinationContext coordinationContext)
throws Exception
{
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil11.activationCoordinatorService, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil11.activationCoordinatorService, messageId) ;
Expires expiresInstance;
if (expires == null) {
expiresInstance = null;
@@ -162,19 +162,19 @@
CreateCoordinationContextResponseType createCoordinationContextResponseType;
createCoordinationContextResponseType =
- ActivationCoordinatorClient.getClient().sendCreateCoordination(addressingProperties, coordinationType, expiresInstance, coordinationContext) ;
+ ActivationCoordinatorClient.getClient().sendCreateCoordination(map, coordinationType, expiresInstance, coordinationContext) ;
final CreateCoordinationContextDetails details = testActivationCoordinatorProcessor.getCreateCoordinationContextDetails(messageId, 10000) ;
final CreateCoordinationContextType requestCreateCoordinationContext = details.getCreateCoordinationContext() ;
- final AddressingProperties requestAddressingProperties = details.getAddressingProperties() ;
+ final MAP requestMAP = details.getMAP() ;
- assertNotNull(requestAddressingProperties.getTo());
- assertEquals(requestAddressingProperties.getTo().getURI().toString(), TestUtil11.activationCoordinatorService);
+ assertNotNull(requestMAP.getTo());
+ assertEquals(requestMAP.getTo(), TestUtil11.activationCoordinatorService);
// we don't care about the reply to field -- this is an RPC style message
- // assertNotNull(requestAddressingProperties.getReplyTo());
- // assertTrue(AddressingHelper.isNoneReplyTo(requestAddressingProperties));
- assertNotNull(requestAddressingProperties.getMessageID());
- assertEquals(requestAddressingProperties.getMessageID().getURI().toString(), messageId);
+ // assertNotNull(requestMAP.getReplyTo());
+ // assertTrue(AddressingHelper.isNoneReplyTo(requestMAP));
+ assertNotNull(requestMAP.getMessageID());
+ assertEquals(requestMAP.getMessageID(), messageId);
if (expires == null)
{
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -27,6 +27,7 @@
package com.arjuna.wsc11.tests.junit;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wscoor.client.ActivationCoordinatorClient;
import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
@@ -41,7 +42,6 @@
import junit.framework.TestCase;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.*;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
public class EnduranceTestCase extends TestCase
@@ -142,16 +142,16 @@
throws Exception
{
final String coordinationType = TestUtil.COORDINATION_TYPE ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil11.activationCoordinatorService, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil11.activationCoordinatorService, messageId) ;
CreateCoordinationContextResponseType response =
- ActivationCoordinatorClient.getClient().sendCreateCoordination(addressingProperties, coordinationType, null, null) ;
+ ActivationCoordinatorClient.getClient().sendCreateCoordination(map, coordinationType, null, null) ;
final CreateCoordinationContextDetails details = testActivationCoordinatorProcessor.getCreateCoordinationContextDetails(messageId, 10000) ;
final CreateCoordinationContextType requestCreateCoordinationContext = details.getCreateCoordinationContext() ;
- final AddressingProperties requestAddressingProperties = details.getAddressingProperties() ;
+ final MAP requestMap = details.getMAP() ;
- assertEquals(requestAddressingProperties.getTo().getURI().toString(), TestUtil11.activationCoordinatorService);
- assertEquals(requestAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertEquals(requestMap.getTo(), TestUtil11.activationCoordinatorService);
+ assertEquals(requestMap.getMessageID(), messageId);
assertNull(requestCreateCoordinationContext.getExpires()) ;
assertNull(requestCreateCoordinationContext.getCurrentContext()) ;
@@ -173,9 +173,9 @@
} catch (InvalidCreateParametersException icpe) {
final CreateCoordinationContextDetails details = testActivationCoordinatorProcessor.getCreateCoordinationContextDetails(messageId, 10000) ;
final CreateCoordinationContextType requestCreateCoordinationContext = details.getCreateCoordinationContext() ;
- final AddressingProperties requestAddressingProperties = details.getAddressingProperties() ;
- assertEquals(requestAddressingProperties.getTo().getURI().toString(), TestUtil11.activationCoordinatorService);
- assertEquals(requestAddressingProperties.getMessageID().getURI().toString(), messageId);
+ final MAP requestMap = details.getMAP() ;
+ assertEquals(requestMap.getTo(), TestUtil11.activationCoordinatorService);
+ assertEquals(requestMap.getMessageID(), messageId);
assertNull(requestCreateCoordinationContext.getExpires()) ;
assertNull(requestCreateCoordinationContext.getCurrentContext()) ;
@@ -201,11 +201,11 @@
final RegisterDetails details = testRegistrationCoordinatorProcessor.getRegisterDetails(messageId, 10000) ;
final RegisterType requestRegister = details.getRegister() ;
- final AddressingProperties requestAddressingProperties = details.getAddressingProperties() ;
+ final MAP requestMap = details.getMAP() ;
final ArjunaContext requestArjunaContext = details.getArjunaContext() ;
- assertEquals(requestAddressingProperties.getTo().getURI().toString(), TestUtil11.registrationCoordinatorService);
- assertEquals(requestAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertEquals(requestMap.getTo(), TestUtil11.registrationCoordinatorService);
+ assertEquals(requestMap.getMessageID(), messageId);
assertNotNull(requestArjunaContext) ;
assertEquals(requestArjunaContext.getInstanceIdentifier().getInstanceIdentifier(), identifierInstance.getValue()) ;
@@ -275,11 +275,11 @@
final RegisterDetails details = testRegistrationCoordinatorProcessor.getRegisterDetails(messageId, 10000) ;
final RegisterType requestRegister = details.getRegister() ;
- final AddressingProperties requestAddressingProperties = details.getAddressingProperties() ;
+ final MAP requestMap = details.getMAP() ;
final ArjunaContext requestArjunaContext = details.getArjunaContext() ;
- assertEquals(requestAddressingProperties.getTo().getURI().toString(), TestUtil11.registrationCoordinatorService);
- assertEquals(requestAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertEquals(requestMap.getTo(), TestUtil11.registrationCoordinatorService);
+ assertEquals(requestMap.getMessageID(), messageId);
assertNotNull(requestArjunaContext) ;
assertEquals(requestArjunaContext.getInstanceIdentifier().getInstanceIdentifier(), identifierInstance.getValue()); ;
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -27,6 +27,7 @@
package com.arjuna.wsc11.tests.junit;
import com.arjuna.webservices11.ServiceRegistry;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
@@ -39,7 +40,6 @@
import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegisterType;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegistrationPortType;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
public class RegistrationTestCase extends TestCase
@@ -84,11 +84,11 @@
final RegisterDetails details = testRegistrationCoordinatorProcessor.getRegisterDetails(messageId, 10000) ;
final RegisterType requestRegister = details.getRegister() ;
- final AddressingProperties requestAddressingProperties = details.getAddressingProperties() ;
+ final MAP requestMap = details.getMAP() ;
final ArjunaContext requestArjunaContext = details.getArjunaContext() ;
- assertEquals(requestAddressingProperties.getTo().getURI().toString(), TestUtil11.registrationCoordinatorService);
- assertEquals(requestAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertEquals(requestMap.getTo(), TestUtil11.registrationCoordinatorService);
+ assertEquals(requestMap.getMessageID(), messageId);
if (instanceIdentifier == null)
{
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestActivationCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,6 +23,7 @@
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.webservices11.wscoor.processors.ActivationCoordinatorProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.wsc.tests.TestUtil;
import com.arjuna.wsc11.tests.TestUtil11;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContext;
@@ -33,7 +34,6 @@
import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPFault;
import javax.xml.ws.ProtocolException;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.soap.SOAPFaultException;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
@@ -46,12 +46,12 @@
private Map messageIdMap = new HashMap() ;
public CreateCoordinationContextResponseType createCoordinationContext(final CreateCoordinationContextType createCoordinationContext,
- final AddressingProperties addressingProperties, boolean isSecure)
+ final MAP map, boolean isSecure)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
+ final String messageId = map.getMessageID() ;
synchronized(messageIdMap)
{
- messageIdMap.put(messageId, new CreateCoordinationContextDetails(createCoordinationContext, addressingProperties)) ;
+ messageIdMap.put(messageId, new CreateCoordinationContextDetails(createCoordinationContext, map)) ;
messageIdMap.notifyAll() ;
}
String coordinationType = createCoordinationContext.getCoordinationType();
@@ -119,13 +119,13 @@
public static class CreateCoordinationContextDetails
{
private final CreateCoordinationContextType createCoordinationContext ;
- private final AddressingProperties addressingProperties ;
+ private final MAP map ;
CreateCoordinationContextDetails(final CreateCoordinationContextType createCoordinationContext,
- final AddressingProperties addressingProperties)
+ final MAP map)
{
this.createCoordinationContext = createCoordinationContext ;
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
}
public CreateCoordinationContextType getCreateCoordinationContext()
@@ -133,9 +133,9 @@
return createCoordinationContext ;
}
- public AddressingProperties getAddressingProperties()
+ public MAP getMAP()
{
- return addressingProperties ;
+ return map ;
}
}
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,6 +25,7 @@
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.webservices11.wscoor.processors.RegistrationCoordinatorProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.wsc.tests.TestUtil;
import com.arjuna.wsc11.tests.TestUtil11;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegisterResponseType;
@@ -33,7 +34,6 @@
import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPFault;
import javax.xml.ws.ProtocolException;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.soap.SOAPFaultException;
import java.util.HashMap;
import java.util.Map;
@@ -43,12 +43,12 @@
{
private Map messageIdMap = new HashMap() ;
- public RegisterResponseType register(final RegisterType register, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext, boolean isSecure)
+ public RegisterResponseType register(final RegisterType register, final MAP map, final ArjunaContext arjunaContext, boolean isSecure)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
+ final String messageId = map.getMessageID() ;
synchronized(messageIdMap)
{
- messageIdMap.put(messageId, new RegisterDetails(register, addressingProperties, arjunaContext)) ;
+ messageIdMap.put(messageId, new RegisterDetails(register, map, arjunaContext)) ;
messageIdMap.notifyAll() ;
}
String protocolIdentifier = register.getProtocolIdentifier();
@@ -135,15 +135,15 @@
public static class RegisterDetails
{
private final RegisterType register ;
- private final AddressingProperties addressingProperties ;
+ private final MAP map ;
private final ArjunaContext arjunaContext ;
RegisterDetails(final RegisterType register,
- final AddressingProperties addressingProperties,
+ final MAP map,
final ArjunaContext arjunaContext)
{
this.register = register ;
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
@@ -152,9 +152,9 @@
return register ;
}
- public AddressingProperties getAddressingProperties()
+ public MAP getMAP()
{
- return addressingProperties ;
+ return map ;
}
public ArjunaContext getArjunaContext()
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -80,46 +80,46 @@
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>Completion Coordinator</servlet-name>
+ <servlet-name>CompletionCoordinator</servlet-name>
<servlet-class>com.arjuna.webservices11.wsat.sei.CompletionCoordinatorPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>Completion Initiator</servlet-name>
+ <servlet-name>CompletionInitiator</servlet-name>
<servlet-class>com.arjuna.webservices11.wsat.sei.CompletionInitiatorPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- Define WSBA 1.1 JaxWS Server Endpoints -->
<servlet>
- <servlet-name>Business Agreement With Coordinator Completion Coordinator</servlet-name>
+ <servlet-name>BusinessAgreementWithCoordinatorCompletionCoordinator</servlet-name>
<servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>Business Agreement With Coordinator Completion Participant</servlet-name>
+ <servlet-name>BusinessAgreementWithCoordinatorCompletionParticipant</servlet-name>
<servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>Business Agreement With Participant Completion Coordinator</servlet-name>
+ <servlet-name>BusinessAgreementWithParticipantCompletionCoordinator</servlet-name>
<servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>Business Agreement With Participant Completion Participant</servlet-name>
+ <servlet-name>BusinessAgreementWithParticipantCompletionParticipant</servlet-name>
<servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- Define WSArjTX JaxWS Server Endpoints -->
<servlet>
- <servlet-name>Termination Coordinator</servlet-name>
+ <servlet-name>TerminationCoordinator</servlet-name>
<servlet-class>com.arjuna.webservices11.wsarjtx.sei.TerminationCoordinatorPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>Termination Participant</servlet-name>
+ <servlet-name>TerminationParticipant</servlet-name>
<servlet-class>com.arjuna.webservices11.wsarjtx.sei.TerminationParticipantPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -134,39 +134,39 @@
<url-pattern>/ParticipantService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Completion Coordinator</servlet-name>
+ <servlet-name>CompletionCoordinator</servlet-name>
<url-pattern>/CompletionCoordinatorService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Completion Initiator</servlet-name>
+ <servlet-name>CompletionInitiator</servlet-name>
<url-pattern>/CompletionInitiatorService</url-pattern>
</servlet-mapping>
<!-- Define WSBA 1.1 JaxWS Server Endpoint Mappings -->
<servlet-mapping>
- <servlet-name>Business Agreement With Coordinator Completion Coordinator</servlet-name>
+ <servlet-name>BusinessAgreementWithCoordinatorCompletionCoordinator</servlet-name>
<url-pattern>/BusinessAgreementWithCoordinatorCompletionCoordinatorService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Business Agreement With Coordinator Completion Participant</servlet-name>
+ <servlet-name>BusinessAgreementWithCoordinatorCompletionParticipant</servlet-name>
<url-pattern>/BusinessAgreementWithCoordinatorCompletionParticipantService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Business Agreement With Participant Completion Coordinator</servlet-name>
+ <servlet-name>BusinessAgreementWithParticipantCompletionCoordinator</servlet-name>
<url-pattern>/BusinessAgreementWithParticipantCompletionCoordinatorService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Business Agreement With Participant Completion Participant</servlet-name>
+ <servlet-name>BusinessAgreementWithParticipantCompletionParticipant</servlet-name>
<url-pattern>/BusinessAgreementWithParticipantCompletionParticipantService</url-pattern>
</servlet-mapping>
<!-- Define WSArjTX JaxWS Server Endpoint Mappings -->
<servlet-mapping>
- <servlet-name>Termination Coordinator</servlet-name>
+ <servlet-name>TerminationCoordinator</servlet-name>
<url-pattern>/TerminationCoordinatorService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Termination Participant</servlet-name>
+ <servlet-name>TerminationParticipant</servlet-name>
<url-pattern>/TerminationParticipantService</url-pattern>
</servlet-mapping>
</web-app>
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t_handlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t_handlers.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t_handlers.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -29,9 +29,11 @@
<handler-name>Instance Identifier Handler</handler-name>
<handler-class>com.arjuna.webservices11.wsarj.handler.InstanceIdentifierHandler</handler-class>
</handler>
+ <!-- should not need this any more
<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>
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wsarjtx/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wsarjtx/build.sh 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wsarjtx/build.sh 2009-05-12 14:36:47 UTC (rev 26470)
@@ -24,9 +24,9 @@
# generate termination participant and coordinator code
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsarjtx-termination-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 wsdl/wsarjtx-termination-participant-binding.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsarjtx-termination-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsarjtx-termination-participant-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsarjtx-termination-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 wsdl/wsarjtx-termination-coordinator-binding.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsarjtx-termination-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsarjtx-termination-coordinator-binding.wsdl
# we need to patch the resource lookup used to provide a jar base URL
# for the wsdl location supplied above wsimport generates
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/build.sh 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/build.sh 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,23 +28,23 @@
# first the at services
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 wsdl/wsat-completion-coordinator-binding.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-completion-coordinator-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-completion-initiator-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 wsdl/wsat-completion-initiator-binding.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-completion-initiator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-completion-initiator-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 wsdl/wsat-coordinator-binding.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-coordinator-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 wsdl/wsat-participant-binding.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-participant-binding.wsdl
# now the ba services
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-coordinator-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 wsdl/wsba-coordinator-completion-coordinator-binding.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-coordinator-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-coordinator-completion-coordinator-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-coordinator-completion-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 wsdl/wsba-coordinator-completion-participant-binding.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-coordinator-completion-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-coordinator-completion-participant-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-participant-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 wsdl/wsba-participant-completion-coordinator-binding.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-participant-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-participant-completion-coordinator-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-participant-completion-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.0 wsdl/wsba-participant-completion-participant-binding.wsdl
+$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-participant-completion-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-participant-completion-participant-binding.wsdl
# we need to patch the resource lookup used to provide a jar base URL
# for the wsdl location supplied above wsimport generates
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/ObjectFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/ObjectFactory.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/ObjectFactory.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -41,19 +41,19 @@
}
/**
- * Create an instance of {@link ExceptionType }
+ * Create an instance of {@link NotificationType }
*
*/
- public ExceptionType createExceptionType() {
- return new ExceptionType();
+ public NotificationType createNotificationType() {
+ return new NotificationType();
}
/**
- * Create an instance of {@link NotificationType }
+ * Create an instance of {@link ExceptionType }
*
*/
- public NotificationType createNotificationType() {
- return new NotificationType();
+ public ExceptionType createExceptionType() {
+ return new ExceptionType();
}
/**
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationCoordinatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationCoordinatorPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationCoordinatorPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "TerminationCoordinatorPortType", targetNamespace = "http://schemas.arjuna.com/ws/2005/10/wsarjtx")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface TerminationCoordinatorPortType {
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationCoordinatorService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationCoordinatorService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationCoordinatorService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "TerminationCoordinatorService", targetNamespace = "http://schemas.arjuna.com/ws/2005/10/wsarjtx", wsdlLocation = "wsdl/wsarjtx-termination-coordinator-binding.wsdl")
public class TerminationCoordinatorService
- extends Service21
+ extends Service
{
private final static URL TERMINATIONCOORDINATORSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://schemas.arjuna.com/ws/2005/10/wsarjtx", "TerminationCoordinatorPortType"), TerminationCoordinatorPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns TerminationCoordinatorPortType
+ */
+ @WebEndpoint(name = "TerminationCoordinatorPortType")
+ public TerminationCoordinatorPortType getTerminationCoordinatorPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://schemas.arjuna.com/ws/2005/10/wsarjtx", "TerminationCoordinatorPortType"), TerminationCoordinatorPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationParticipantPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationParticipantPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationParticipantPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "TerminationParticipantPortType", targetNamespace = "http://schemas.arjuna.com/ws/2005/10/wsarjtx")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface TerminationParticipantPortType {
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationParticipantService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationParticipantService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/schemas/ws/_2005/_10/wsarjtx/TerminationParticipantService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "TerminationParticipantService", targetNamespace = "http://schemas.arjuna.com/ws/2005/10/wsarjtx", wsdlLocation = "wsdl/wsarjtx-termination-participant-binding.wsdl")
public class TerminationParticipantService
- extends Service21
+ extends Service
{
private final static URL TERMINATIONPARTICIPANTSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://schemas.arjuna.com/ws/2005/10/wsarjtx", "TerminationParticipantPortType"), TerminationParticipantPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns TerminationParticipantPortType
+ */
+ @WebEndpoint(name = "TerminationParticipantPortType")
+ public TerminationParticipantPortType getTerminationParticipantPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://schemas.arjuna.com/ws/2005/10/wsarjtx", "TerminationParticipantPortType"), TerminationParticipantPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,14 +1,11 @@
package com.arjuna.webservices11.wsarjtx.client;
import com.arjuna.schemas.ws._2005._10.wsarjtx.*;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import javax.xml.ws.BindingProvider;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
import javax.xml.ws.soap.AddressingFeature;
-import javax.xml.ws.handler.Handler;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
/**
@@ -42,28 +39,25 @@
return terminationCoordinatorService.get();
}
- public static TerminationParticipantPortType getTerminationParticipantPort(AddressingProperties addressingProperties)
+ public static TerminationParticipantPortType getTerminationParticipantPort(MAP map)
{
TerminationParticipantService service = getTerminationParticipantService();
TerminationParticipantPortType port = service.getPort(TerminationParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
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);
+ AddressingHelper.configureRequestContext(requestContext, map);
return port;
}
- public static TerminationCoordinatorPortType getRegistrationPort(AddressingProperties addressingProperties)
+ public static TerminationCoordinatorPortType getRegistrationPort(MAP map)
{
TerminationCoordinatorService service = getTerminationCoordinatorService();
TerminationCoordinatorPortType port = service.getPort(TerminationCoordinatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
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);
+ AddressingHelper.configureRequestContext(requestContext, map);
+ AddressingHelper.configureRequestContext(requestContext, map);
return port;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -29,14 +29,13 @@
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
import java.net.URISyntaxException;
@@ -56,29 +55,29 @@
/**
* The complete action.
*/
- private AttributedURI completeAction = null;
+ private String completeAction = null;
/**
* The close action.
*/
- private AttributedURI closeAction = null;
+ private String closeAction = null;
/**
* The cancel action.
*/
- private AttributedURI cancelAction = null;
+ private String cancelAction = null;
/**
* The SOAP fault action.
*/
- private AttributedURI faultAction = null;
+ private String faultAction = null;
/**
* The participant URI for replies.
*/
- private EndpointReference terminationParticipant ;
+ private MAPEndpoint terminationParticipant ;
/**
* The participant URI for secure replies.
*/
- private EndpointReference secureTerminationParticipant ;
+ private MAPEndpoint secureTerminationParticipant ;
/**
@@ -86,52 +85,34 @@
*/
private TerminationCoordinatorClient()
{
- final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- completeAction = builder.newURI(ArjunaTXConstants.WSARJTX_ACTION_COMPLETE);
- closeAction = builder.newURI(ArjunaTXConstants.WSARJTX_ACTION_CLOSE);
- cancelAction = builder.newURI(ArjunaTXConstants.WSARJTX_ACTION_CANCEL);
- faultAction = builder.newURI(ArjunaTXConstants.WSARJTX_ACTION_SOAP_FAULT) ;
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- //final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ completeAction = ArjunaTXConstants.WSARJTX_ACTION_COMPLETE;
+ closeAction = ArjunaTXConstants.WSARJTX_ACTION_CLOSE;
+ cancelAction = ArjunaTXConstants.WSARJTX_ACTION_CANCEL;
+ faultAction = ArjunaTXConstants.WSARJTX_ACTION_SOAP_FAULT ;
- // Add WS-Addressing
- //AddressingPolicy.register(handlerRegistry) ;
- // Add client policies
- //ClientPolicy.register(handlerRegistry) ;
final String terminationParticipantURIString =
ServiceRegistry.getRegistry().getServiceURI(ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME, false);
final String secureTerminationParticipantURIString =
ServiceRegistry.getRegistry().getServiceURI(ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME, true);
- try {
- URI terminationParticipantURI = new URI(terminationParticipantURIString);
- terminationParticipant = builder.newEndpointReference(terminationParticipantURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- try {
- URI secureTerminationParticipantURI = new URI(secureTerminationParticipantURIString);
- secureTerminationParticipant = builder.newEndpointReference(secureTerminationParticipantURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
+
+ terminationParticipant = builder.newEndpoint(terminationParticipantURIString);
+ secureTerminationParticipant = builder.newEndpoint(secureTerminationParticipantURIString);
}
/**
* Send a complete request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendComplete(final W3CEndpointReference coordinator, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendComplete(final W3CEndpointReference coordinator, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(coordinator);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
- final TerminationCoordinatorPortType port = getPort(coordinator, addressingProperties, identifier, completeAction);
+ MAPEndpoint participant = getParticipant(coordinator);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
+ final TerminationCoordinatorPortType port = getPort(coordinator, map, identifier, completeAction);
final NotificationType complete = new NotificationType();
port.completeOperation(complete);
@@ -139,17 +120,17 @@
/**
* Send a close request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendClose(final W3CEndpointReference coordinator, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendClose(final W3CEndpointReference coordinator, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(coordinator);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
- final TerminationCoordinatorPortType port = getPort(coordinator, addressingProperties, identifier, closeAction);
+ MAPEndpoint participant = getParticipant(coordinator);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
+ final TerminationCoordinatorPortType port = getPort(coordinator, map, identifier, closeAction);
final NotificationType close = new NotificationType();
port.closeOperation(close);
@@ -157,17 +138,17 @@
/**
* Send a cancel request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCancel(final W3CEndpointReference coordinator, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCancel(final W3CEndpointReference coordinator, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(coordinator);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
- final TerminationCoordinatorPortType port = getPort(coordinator, addressingProperties, identifier, cancelAction);
+ MAPEndpoint participant = getParticipant(coordinator);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
+ final TerminationCoordinatorPortType port = getPort(coordinator, map, identifier, cancelAction);
final NotificationType cancel = new NotificationType();
port.cancelOperation(cancel);
@@ -175,21 +156,21 @@
/**
* Send a fault.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param soapFault The SOAP fault.
* @param identifier The arjuna instance identifier.
* @throws SoapFault For any errors.
* @throws IOException for any transport errors.
*/
public void sendSoapFault(final W3CEndpointReference endpoint,
- final AddressingProperties addressingProperties,
+ final MAP map,
final SoapFault soapFault,
final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
// use the SoapFaultService to format a soap fault and send it back to the faultto or from address
- SoapFaultClient.sendSoapFault((SoapFault11)soapFault, endpoint, addressingProperties, faultAction);
+ SoapFaultClient.sendSoapFault((SoapFault11)soapFault, endpoint, map, faultAction);
}
/**
@@ -197,7 +178,7 @@
* @param coordinator
* @return either the secure terminaton coordinator endpoint or the non-secure endpoint
*/
- EndpointReference getParticipant(W3CEndpointReference coordinator)
+ MAPEndpoint getParticipant(W3CEndpointReference coordinator)
{
NativeEndpointReference nativeRef = EndpointHelper.transform(NativeEndpointReference.class, coordinator);
String address = nativeRef.getAddress();
@@ -218,14 +199,14 @@
}
private TerminationCoordinatorPortType getPort(final W3CEndpointReference endpoint,
- final AddressingProperties addressingProperties,
+ final MAP map,
final InstanceIdentifier identifier,
- final AttributedURI action)
+ final String action)
{
// we only need the message id from the addressing properties as the address is already wrapped up
// in the ednpoint reference. also the identifier should already be installed in the endpoint
// reference as a reference parameter so we don't need that either
- AddressingHelper.installNoneReplyTo(addressingProperties);
- return WSARJTXClient.getTerminationCoordinatorPort(endpoint, action, addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
+ return WSARJTXClient.getTerminationCoordinatorPort(endpoint, action, map);
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationParticipantClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationParticipantClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -26,22 +26,17 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
/**
* The Client side of the Terminator Coordinator.
@@ -57,86 +52,67 @@
/**
* The completed action.
*/
- private AttributedURI completedAction = null;
+ private String completedAction = null;
/**
* The closed action.
*/
- private AttributedURI closedAction = null;
+ private String closedAction = null;
/**
* The cancelled action.
*/
- private AttributedURI cancelledAction = null;
+ private String cancelledAction = null;
/**
* The faulted action.
*/
- private AttributedURI faultedAction = null;
+ private String faultedAction = null;
/**
* The SOAP fault action.
*/
- private AttributedURI soapFaultAction = null;
+ private String soapFaultAction = null;
/**
* The participant URI for replies.
*/
- private EndpointReference terminationCoordinator ;
+ private MAPEndpoint terminationCoordinator ;
/**
* The participant URI for securereplies.
*/
- private EndpointReference secureTerminationCoordinator ;
+ private MAPEndpoint secureTerminationCoordinator ;
/**
* Construct the terminator coordinator client.
*/
private TerminationParticipantClient()
{
- final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- completedAction = builder.newURI(ArjunaTXConstants.WSARJTX_ACTION_COMPLETED);
- closedAction = builder.newURI(ArjunaTXConstants.WSARJTX_ACTION_CLOSED);
- cancelledAction = builder.newURI(ArjunaTXConstants.WSARJTX_ACTION_CANCELLED);
- faultedAction = builder.newURI(ArjunaTXConstants.WSARJTX_ACTION_FAULTED);
- soapFaultAction = builder.newURI(ArjunaTXConstants.WSARJTX_ACTION_SOAP_FAULT);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+ final MAPBuilder builder = MAPBuilder.getBuilder();
+ completedAction = ArjunaTXConstants.WSARJTX_ACTION_COMPLETED;
+ closedAction = ArjunaTXConstants.WSARJTX_ACTION_CLOSED;
+ cancelledAction = ArjunaTXConstants.WSARJTX_ACTION_CANCELLED;
+ faultedAction = ArjunaTXConstants.WSARJTX_ACTION_FAULTED;
+ soapFaultAction = ArjunaTXConstants.WSARJTX_ACTION_SOAP_FAULT;
- // Add WS-Addressing
- // AddressingPolicy.register(handlerRegistry) ;
- // Add client policies
- // ClientPolicy.register(handlerRegistry) ;
final String terminationCoordinatorURIString =
ServiceRegistry.getRegistry().getServiceURI(ArjunaTX11Constants.TERMINATION_COORDINATOR_SERVICE_NAME, false);
final String secureTerminationCoordinatorURIString =
ServiceRegistry.getRegistry().getServiceURI(ArjunaTX11Constants.TERMINATION_COORDINATOR_SERVICE_NAME, true);
- try {
- URI terminationCoordinatorURI = new URI(terminationCoordinatorURIString);
- terminationCoordinator = builder.newEndpointReference(terminationCoordinatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- try {
- URI secureTerminationCoordinatorURI = new URI(secureTerminationCoordinatorURIString);
- secureTerminationCoordinator = builder.newEndpointReference(secureTerminationCoordinatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
+ terminationCoordinator = builder.newEndpoint(terminationCoordinatorURIString);
+ secureTerminationCoordinator = builder.newEndpoint(secureTerminationCoordinatorURIString);
}
/**
* Send a completed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCompleted(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCompleted(final W3CEndpointReference participant, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(participant);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
- final TerminationParticipantPortType port = getPort(participant, addressingProperties, identifier, completedAction);
+ MAPEndpoint coordinator = getCoordinator(participant);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
+ final TerminationParticipantPortType port = getPort(participant, map, identifier, completedAction);
final NotificationType completed = new NotificationType();
port.completedOperation(completed);
@@ -144,17 +120,17 @@
/**
* Send a closed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendClosed(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendClosed(final W3CEndpointReference participant, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(participant);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
- final TerminationParticipantPortType port = getPort(participant, addressingProperties, identifier, closedAction);
+ MAPEndpoint coordinator = getCoordinator(participant);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
+ final TerminationParticipantPortType port = getPort(participant, map, identifier, closedAction);
final NotificationType closed = new NotificationType();
port.closedOperation(closed);
@@ -162,17 +138,17 @@
/**
* Send a cancelled request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCancelled(final W3CEndpointReference participant,final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCancelled(final W3CEndpointReference participant,final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(participant);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
- final TerminationParticipantPortType port = getPort(participant, addressingProperties, identifier, cancelledAction);
+ MAPEndpoint coordinator = getCoordinator(participant);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
+ final TerminationParticipantPortType port = getPort(participant, map, identifier, cancelledAction);
final NotificationType cancelled = new NotificationType();
port.cancelledOperation(cancelled);
@@ -180,17 +156,17 @@
/**
* Send a faulted request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendFaulted(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendFaulted(final W3CEndpointReference participant, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(participant);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
- final TerminationParticipantPortType port = getPort(participant, addressingProperties, identifier, faultedAction);
+ MAPEndpoint coordinator = getCoordinator(participant);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
+ final TerminationParticipantPortType port = getPort(participant, map, identifier, faultedAction);
final NotificationType faulted = new NotificationType();
port.faultedOperation(faulted);
@@ -199,18 +175,18 @@
/**
* Send a fault.
* @param endpoint the endpoint reference to notify
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param soapFault The SOAP fault.
* @param identifier The arjuna instance identifier.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendSoapFault(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final SoapFault soapFault, final InstanceIdentifier identifier)
+ public void sendSoapFault(final W3CEndpointReference endpoint, final MAP map, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- //AddressingHelper.installFrom(addressingProperties, terminationCoordinator, identifier);
- AddressingHelper.installNoneReplyTo(addressingProperties);
- final TerminationParticipantPortType port = getPort(endpoint, addressingProperties, identifier, soapFaultAction);
+ //AddressingHelper.installFrom(map, terminationCoordinator, identifier);
+ AddressingHelper.installNoneReplyTo(map);
+ final TerminationParticipantPortType port = getPort(endpoint, map, identifier, soapFaultAction);
final ExceptionType fault = new ExceptionType();
// we pass the fault type, reason and subcode. we cannot pass the detail and header elements as they are
// built from Kev's element types rather than dom element types. this is all we need anyway since we only
@@ -224,16 +200,16 @@
/**
* Send a fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param soapFault The SOAP fault.
* @param identifier The arjuna instance identifier.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendSoapFault(final SoapFault soapFault, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- final TerminationParticipantPortType port = getPort(addressingProperties, identifier, soapFaultAction);
+ final TerminationParticipantPortType port = getPort(map, identifier, soapFaultAction);
final ExceptionType fault = new ExceptionType();
// we pass the fault type, reason and subcode. we cannot pass the detail and header elements as they are
// built from Kev's element types rather than dom element types. this is all we need anyway since we only
@@ -250,7 +226,7 @@
* @param participant
* @return either the secure terminaton participant endpoint or the non-secure endpoint
*/
- EndpointReference getCoordinator(W3CEndpointReference participant)
+ MAPEndpoint getCoordinator(W3CEndpointReference participant)
{
NativeEndpointReference nativeRef = EndpointHelper.transform(NativeEndpointReference.class, participant);
String address = nativeRef.getAddress();
@@ -271,22 +247,22 @@
}
private TerminationParticipantPortType getPort(final W3CEndpointReference endpoint,
- final AddressingProperties addressingProperties,
+ final MAP map,
final InstanceIdentifier identifier,
- final AttributedURI action)
+ final String action)
{
// we only need the message id from the addressing properties as the address is already wrapped up
// in the ednpoint reference. also the identifier should already be installed in the endpoint
// reference as a reference parameter so we don't need that either
- return WSARJTXClient.getTerminationParticipantPort(endpoint, action, addressingProperties);
+ return WSARJTXClient.getTerminationParticipantPort(endpoint, action, map);
}
- private TerminationParticipantPortType getPort(final AddressingProperties addressingProperties,
+ private TerminationParticipantPortType getPort(final MAP map,
final InstanceIdentifier identifier,
- final AttributedURI action)
+ final String action)
{
// create a port specific to the incoming addressing properties
- AddressingHelper.installNoneReplyTo(addressingProperties);
- return WSARJTXClient.getTerminationParticipantPort(identifier, action, addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
+ return WSARJTXClient.getTerminationParticipantPort(identifier, action, map);
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -4,24 +4,19 @@
import com.arjuna.schemas.ws._2005._10.wsarjtx.TerminationCoordinatorService;
import com.arjuna.schemas.ws._2005._10.wsarjtx.TerminationParticipantPortType;
import com.arjuna.schemas.ws._2005._10.wsarjtx.TerminationParticipantService;
-import com.arjuna.webservices11.wsarj.handler.InstanceIdentifierHandler;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.map.MAPConstants;
import javax.xml.ws.BindingProvider;
-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.handler.Handler;
import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.handler.Handler;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.net.URISyntaxException;
-
-import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import org.w3c.dom.Element;
/**
@@ -47,7 +42,7 @@
/**
* builder used to construct addressing info for calls
*/
- private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ private static MAPBuilder builder = MAPBuilder.getBuilder();
/**
* fetch a termination coordinator service unique to the current thread
@@ -74,95 +69,68 @@
}
public static TerminationCoordinatorPortType getTerminationCoordinatorPort(W3CEndpointReference endpointReference,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
TerminationCoordinatorService service = getTerminationCoordinatorService();
- // TerminationCoordinatorPortType port = service.getPort(endpointReference, TerminationCoordinatorPortType.class, new AddressingFeature(true, true));
- TerminationCoordinatorPortType port = service.getPort(endpointReference, TerminationCoordinatorPortType.class);
+ TerminationCoordinatorPortType port = service.getPort(endpointReference, TerminationCoordinatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannoy specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
List<Handler> customHandlerChain = new ArrayList<Handler>();
customHandlerChain.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
- // ok, JBossWS native has hacked this by pulling the address and reference parameters out of the endpoint
- // and storing them in an AddressingProperties instance hung off the context under CLIENT_ADDRESSING_PROPERTIES_OUTBOUND.
- // we still need to set the action and message id and possibly relatesTo -- this is all distinctly non-portable :-/
- // n.b. Metro installs the address in requestContext under ENDPOINT_ADDRESS_PROPERTY. it also seems to ensure
- // that the reference parameters get installed -- but how?
+ */
- // the address will have been pulled out of the endpoint by getPort but we still have to set it in the
- // addressing properties along with the action and message id
Map<String, Object> requestContext = bindingProvider.getRequestContext();
- AddressingProperties requestProperties = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
- addressingProperties.setAction(action);
- AddressingHelper.installCallerProperties(addressingProperties, requestProperties);
- // we should not need to do this but JBossWS does not pick up the value in the addressing properties
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, requestProperties.getTo().getURI().toString());
+ MAP requestMap = AddressingHelper.outboundMap(requestContext);
+ map.setAction(action);
+ AddressingHelper.installCallerProperties(map, requestMap);
+ AddressingHelper.configureRequestContext(requestContext, requestMap.getTo(), action);
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 TerminationParticipantPortType getTerminationParticipantPort(W3CEndpointReference endpointReference,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
TerminationParticipantService service = getTerminationParticipantService();
- // TerminationParticipantPortType port = service.getPort(endpointReference, TerminationParticipantPortType.class, new AddressingFeature(true, true));
- TerminationParticipantPortType port = service.getPort(endpointReference, TerminationParticipantPortType.class);
+ TerminationParticipantPortType port = service.getPort(endpointReference, TerminationParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannoy specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
List<Handler> customHandlerChain = new ArrayList<Handler>();
customHandlerChain.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
- // ok, JBossWS native has hacked this by pulling the address and reference parameters out of the endpoint
- // and storing them in an AddressingProperties instance hung off the context under CLIENT_ADDRESSING_PROPERTIES_OUTBOUND.
- // we still need to set the action and message id and possibly relatesTo -- this is all distinctly non-portable :-/
- // n.b. Metro installs the address in requestContext under ENDPOINT_ADDRESS_PROPERTY. it also seems to ensure
- // that the reference parameters get installed -- but how?
-
- // the address will have been pulled out of the endpoint by getPort but we still have to set it in the
- // addressing properties along with the action and message id
+ */
Map<String, Object> requestContext = bindingProvider.getRequestContext();
- AddressingProperties requestProperties = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
- addressingProperties.setAction(action);
- AddressingHelper.installCallerProperties(addressingProperties, requestProperties);
- // we should not need to do this but JBossWS does not pick up the value in the addressing properties
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, requestProperties.getTo().getURI().toString());
+ MAP requestMap = AddressingHelper.outboundMap(requestContext);
+ map.setAction(action);
+ AddressingHelper.installCallerProperties(map, requestMap);
+ AddressingHelper.configureRequestContext(requestContext, requestMap.getTo(), action);
return port;
}
// we use this in situations where we don't have a proper endpoint but we do have caller addressing properties
public static TerminationParticipantPortType getTerminationParticipantPort(InstanceIdentifier identifier,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
TerminationParticipantService service = getTerminationParticipantService();
- // TerminationParticipantPortType port = service.getPort(endpointReference, TerminationParticipantPortType.class, new AddressingFeature(true, true));
- TerminationParticipantPortType port = service.getPort(TerminationParticipantPortType.class);
+ TerminationParticipantPortType port = service.getPort(TerminationParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannoy specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
List<Handler> customHandlerChain = new ArrayList<Handler>();
customHandlerChain.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+ */
Map<String, Object> requestContext = bindingProvider.getRequestContext();
Element refParam = InstanceIdentifier.createInstanceIdentifierElement(identifier.getInstanceIdentifier());
- addressingProperties.getReferenceParameters().addElement(refParam);
- addressingProperties.setAction(action);
- requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
- // JBossWS shoudl do this for us
- requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
- // we should not need to do this but JBossWS does not pick up the value in the addressing properties
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, addressingProperties.getTo().getURI().toString());
+ map.addReferenceParameter(refParam);
+ map.setAction(action);
+ AddressingHelper.configureRequestContext(requestContext, map, map.getTo(), action);
return port;
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,11 +23,10 @@
import com.arjuna.schemas.ws._2005._10.wsarjtx.NotificationType;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.wst11.BusinessActivityTerminator;
import com.arjuna.webservices.SoapFault;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The Terminator Participant processor.
* @author kevin
@@ -83,35 +82,35 @@
/**
* Cancel.
* @param cancel The cancel notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void cancel(final NotificationType cancel, final AddressingProperties addressingProperties,
+ public abstract void cancel(final NotificationType cancel, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Close.
* @param close The close notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void close(final NotificationType close, final AddressingProperties addressingProperties,
+ public abstract void close(final NotificationType close, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Complete.
* @param complete The complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void complete(final NotificationType complete, final AddressingProperties addressingProperties,
+ public abstract void complete(final NotificationType complete, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* handle a soap fault sent by the participant.
* @param soapFault The soap fault
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext);
+ public abstract void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext);
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantCallback.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantCallback.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -24,9 +24,8 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.base.processors.Callback;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The Terminator Coordinator callback.
* @author kevin
@@ -36,45 +35,45 @@
/**
* A cancelled response.
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void cancelled(final NotificationType cancelled, final AddressingProperties addressingProperties,
+ public abstract void cancelled(final NotificationType cancelled, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* A closed response.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void closed(final NotificationType closed, final AddressingProperties addressingProperties,
+ public abstract void closed(final NotificationType closed, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* A completed response.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void completed(final NotificationType completed, final AddressingProperties addressingProperties,
+ public abstract void completed(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* A faulted response.
* @param faulted The faulted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void faulted(final NotificationType faulted, final AddressingProperties addressingProperties,
+ public abstract void faulted(final NotificationType faulted, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* A SOAP fault response.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public abstract void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext) ;
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/processors/TerminationParticipantProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,9 +25,8 @@
import com.arjuna.webservices.base.processors.Callback;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.processor.BaseNotificationProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The Terminator Coordinator processor.
* @author kevin
@@ -51,81 +50,81 @@
/**
* Handle a cancelled response.
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void handleCancelled(final NotificationType cancelled, final AddressingProperties addressingProperties,
+ public void handleCancelled(final NotificationType cancelled, final MAP map,
final ArjunaContext arjunaContext)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((TerminationParticipantCallback)callback).cancelled(cancelled, addressingProperties, arjunaContext) ;
+ ((TerminationParticipantCallback)callback).cancelled(cancelled, map, arjunaContext) ;
}
- }, getIDs(addressingProperties, arjunaContext)) ;
+ }, getIDs(arjunaContext)) ;
}
/**
* Handle a closed response.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void handleClosed(final NotificationType closed, final AddressingProperties addressingProperties,
+ public void handleClosed(final NotificationType closed, final MAP map,
final ArjunaContext arjunaContext)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((TerminationParticipantCallback)callback).closed(closed, addressingProperties, arjunaContext) ;
+ ((TerminationParticipantCallback)callback).closed(closed, map, arjunaContext) ;
}
- }, getIDs(addressingProperties, arjunaContext)) ;
+ }, getIDs(arjunaContext)) ;
}
/**
* Handle a completed response.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void handleCompleted(final NotificationType completed, final AddressingProperties addressingProperties,
+ public void handleCompleted(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((TerminationParticipantCallback)callback).completed(completed, addressingProperties, arjunaContext) ;
+ ((TerminationParticipantCallback)callback).completed(completed, map, arjunaContext) ;
}
- }, getIDs(addressingProperties, arjunaContext)) ;
+ }, getIDs(arjunaContext)) ;
}
/**
* Handle a faulted response.
* @param faulted The faulted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void handleFaulted(final NotificationType faulted, final AddressingProperties addressingProperties,
+ public void handleFaulted(final NotificationType faulted, final MAP map,
final ArjunaContext arjunaContext)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((TerminationParticipantCallback)callback).faulted(faulted, addressingProperties, arjunaContext) ;
+ ((TerminationParticipantCallback)callback).faulted(faulted, map, arjunaContext) ;
}
- }, getIDs(addressingProperties, arjunaContext)) ;
+ }, getIDs(arjunaContext)) ;
}
/**
* Handle a SOAP fault response.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public void handleSoapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((TerminationParticipantCallback)callback).soapFault(soapFault, addressingProperties, arjunaContext) ;
+ ((TerminationParticipantCallback)callback).soapFault(soapFault, map, arjunaContext) ;
}
- }, getIDs(addressingProperties, arjunaContext)) ;
+ }, getIDs(arjunaContext)) ;
}
/**
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,6 +8,9 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarjtx.processors.TerminationCoordinatorProcessor;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.map.MAPConstants;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices.SoapFault;
import javax.annotation.Resource;
@@ -15,8 +18,6 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.soap.Addressing;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
import javax.xml.ws.handler.MessageContext;
import javax.servlet.http.HttpServletRequest;
@@ -35,7 +36,7 @@
portName = "TerminationCoordinatorPortType"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class TerminationCoordinatorPortTypeImpl implements TerminationCoordinatorPortType
{
@@ -57,13 +58,12 @@
HttpServletRequest request = (HttpServletRequest)ctx.get(MessageContext.SERVLET_REQUEST);
boolean isSecure = request.getScheme().equals("https");
final NotificationType complete = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- TerminationCoordinatorProcessor.getProcessor().complete(complete, inboundAddressProperties, arjunaContext) ;
+ TerminationCoordinatorProcessor.getProcessor().complete(complete, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -80,13 +80,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType close = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- TerminationCoordinatorProcessor.getProcessor().close(close, inboundAddressProperties, arjunaContext) ;
+ TerminationCoordinatorProcessor.getProcessor().close(close, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -103,13 +102,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType cancel = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- TerminationCoordinatorProcessor.getProcessor().cancel(cancel, inboundAddressProperties, arjunaContext) ;
+ TerminationCoordinatorProcessor.getProcessor().cancel(cancel, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -121,13 +119,13 @@
Fault fault)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- final AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
final SoapFault soapFault = SoapFault11.fromFault(fault);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- TerminationCoordinatorProcessor.getProcessor().soapFault(soapFault, inboundAddressProperties, arjunaContext); ;
+ TerminationCoordinatorProcessor.getProcessor().soapFault(soapFault, inboundMap, arjunaContext); ;
}
}) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -10,6 +10,8 @@
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarjtx.processors.TerminationParticipantProcessor;
@@ -19,8 +21,6 @@
import javax.xml.namespace.QName;
import javax.xml.ws.WebServiceContext;
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.xml.ws.soap.Addressing;
@@ -37,7 +37,7 @@
portName = "TerminationParticipantPortType"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class TerminationParticipantPortTypeImpl implements TerminationParticipantPortType
{
@@ -57,13 +57,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType completed = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- TerminationParticipantProcessor.getProcessor().handleCompleted(completed, inboundAddressProperties, arjunaContext);
+ TerminationParticipantProcessor.getProcessor().handleCompleted(completed, inboundMap, arjunaContext);
}
}) ;
}
@@ -80,13 +79,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType closed = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- TerminationParticipantProcessor.getProcessor().handleClosed(closed, inboundAddressProperties, arjunaContext);
+ TerminationParticipantProcessor.getProcessor().handleClosed(closed, inboundMap, arjunaContext);
}
}) ;
}
@@ -103,13 +101,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType cancelled = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- TerminationParticipantProcessor.getProcessor().handleCancelled(cancelled, inboundAddressProperties, arjunaContext);
+ TerminationParticipantProcessor.getProcessor().handleCancelled(cancelled, inboundMap, arjunaContext);
}
}) ;
}
@@ -126,13 +123,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType faulted = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- TerminationParticipantProcessor.getProcessor().handleFaulted(faulted, inboundAddressProperties, arjunaContext);
+ TerminationParticipantProcessor.getProcessor().handleFaulted(faulted, inboundMap, arjunaContext);
}
}) ;
}
@@ -154,8 +150,7 @@
String reason = parameters.getReason();
QName subcode = parameters.getSubCode();
final SoapFault soapFault;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
try {
SoapFaultType soapFaultType = SoapFaultType.toState(soapFaultTypeName);
@@ -167,7 +162,7 @@
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- TerminationParticipantProcessor.getProcessor().handleSoapFault(soapFault, inboundAddressProperties, arjunaContext);
+ TerminationParticipantProcessor.getProcessor().handleSoapFault(soapFault, inboundMap, arjunaContext);
}
}) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,7 +25,6 @@
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.wsc11.common.Environment;
-import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,7 +22,6 @@
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContext;
import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
import com.arjuna.webservices11.ServiceRegistry;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/CoordinatorInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/CoordinatorInboundEvents.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/CoordinatorInboundEvents.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,9 +1,9 @@
package com.arjuna.webservices11.wsat;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.SoapFault;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
@@ -16,42 +16,42 @@
/**
* Handle the aborted event.
* @param aborted The aborted notification.
- * @param addressingContext The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void aborted(final Notification aborted, final AddressingProperties addressingContext, final ArjunaContext arjunaContext) ;
+ public void aborted(final Notification aborted, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the committed event.
* @param committed The committed notification.
- * @param addressingContext The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void committed(final Notification committed, final AddressingProperties addressingContext, final ArjunaContext arjunaContext) ;
+ public void committed(final Notification committed, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the prepared event.
* @param prepared The prepared notification.
- * @param addressingContext The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void prepared(final Notification prepared, final AddressingProperties addressingContext, final ArjunaContext arjunaContext) ;
+ public void prepared(final Notification prepared, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the readOnly event.
* @param readOnly The readOnly notification.
- * @param addressingContext The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void readOnly(final Notification readOnly, final AddressingProperties addressingContext, final ArjunaContext arjunaContext) ;
+ public void readOnly(final Notification readOnly, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingContext The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingContext, final ArjunaContext arjunaContext) ;
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Get the participant endpoint reference
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/ParticipantInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/ParticipantInboundEvents.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/ParticipantInboundEvents.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,9 +1,9 @@
package com.arjuna.webservices11.wsat;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.SoapFault;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
@@ -16,34 +16,34 @@
/**
* Handle the commit event.
* @param commit The commit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void commit(final Notification commit, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void commit(final Notification commit, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the prepare event.
* @param prepare The prepare notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void prepare(final Notification prepare, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void prepare(final Notification prepare, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the rollback event.
* @param rollback The rollback notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void rollback(final Notification rollback, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void rollback(final Notification rollback, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Return the endpoint reference for the coordinator associated with this participant.
* @return the coordinator endpoint reference
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionCoordinatorClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionCoordinatorClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -3,22 +3,18 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wsat.client.WSATClient;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsat._2006._06.CompletionCoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
/**
* The Client side of the Completion Coordinator.
@@ -34,34 +30,30 @@
/**
* The commit action.
*/
- private AttributedURI commitAction = null;
+ private String commitAction = null;
/**
* The rollback action.
*/
- private AttributedURI rollbackAction = null;
+ private String rollbackAction = null;
/**
* The completion initiator URI for replies.
*/
- private EndpointReference completionInitiator ;
+ private MAPEndpoint completionInitiator ;
/**
* The completion initiator URI for secure replies.
*/
- private EndpointReference secureCompletionInitiator ;
+ private MAPEndpoint secureCompletionInitiator ;
/**
* Construct the completion coordinator client.
*/
private CompletionCoordinatorClient()
{
- final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- commitAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_COMMIT);
- rollbackAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_ROLLBACK);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
+ final MAPBuilder builder = MAPBuilder.getBuilder();
+ commitAction = AtomicTransactionConstants.WSAT_ACTION_COMMIT;
+ rollbackAction = AtomicTransactionConstants.WSAT_ACTION_ROLLBACK;
// final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
// Add WS-Addressing
@@ -73,33 +65,23 @@
ServiceRegistry.getRegistry().getServiceURI(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME, false) ;
final String secureCompletionInitiatorURIString =
ServiceRegistry.getRegistry().getServiceURI(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME, true) ;
- try {
- URI completionInitiatorURI = new URI(completionInitiatorURIString) ;
- completionInitiator = builder.newEndpointReference(completionInitiatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- try {
- URI secureCompletionInitiatorURI = new URI(secureCompletionInitiatorURIString) ;
- secureCompletionInitiator = builder.newEndpointReference(secureCompletionInitiatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
+ completionInitiator = builder.newEndpoint(completionInitiatorURIString);
+ secureCompletionInitiator = builder.newEndpoint(secureCompletionInitiatorURIString);
}
/**
* Send a commit request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCommit(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCommit(final W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference initiator = getCompletionInitiator(endpoint);
- AddressingHelper.installFromFaultTo(addressingProperties, initiator, identifier);
- CompletionCoordinatorPortType port = getPort(endpoint, addressingProperties, commitAction);
+ MAPEndpoint initiator = getCompletionInitiator(endpoint);
+ AddressingHelper.installFromFaultTo(map, initiator, identifier);
+ CompletionCoordinatorPortType port = getPort(endpoint, map, commitAction);
Notification commit = new Notification();
port.commitOperation(commit);
@@ -107,17 +89,17 @@
/**
* Send a rollback request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendRollback(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendRollback(final W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference initiator = getCompletionInitiator(endpoint);
- AddressingHelper.installFromFaultTo(addressingProperties, initiator, identifier);
- CompletionCoordinatorPortType port = getPort(endpoint, addressingProperties, rollbackAction);
+ MAPEndpoint initiator = getCompletionInitiator(endpoint);
+ AddressingHelper.installFromFaultTo(map, initiator, identifier);
+ CompletionCoordinatorPortType port = getPort(endpoint, map, rollbackAction);
Notification rollback = new Notification();
port.rollbackOperation(rollback);
@@ -128,7 +110,7 @@
* @param participant
* @return either the secure terminaton participant endpoint or the non-secure endpoint
*/
- EndpointReference getCompletionInitiator(W3CEndpointReference participant)
+ MAPEndpoint getCompletionInitiator(W3CEndpointReference participant)
{
NativeEndpointReference nativeRef = EndpointHelper.transform(NativeEndpointReference.class, participant);
String address = nativeRef.getAddress();
@@ -152,15 +134,15 @@
* obtain a port from the completion coordinator endpoint configured with the instance identifier handler and the supplied
* addressing properties supplemented with the given action
* @param endpoint
- * @param addressingProperties
+ * @param map
* @param action
* @return
*/
private CompletionCoordinatorPortType getPort(final W3CEndpointReference endpoint,
- final AddressingProperties addressingProperties,
- final AttributedURI action)
+ final MAP map,
+ final String action)
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
- return WSATClient.getCompletionCoordinatorPort(endpoint, action, addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
+ return WSATClient.getCompletionCoordinatorPort(endpoint, action, map);
}
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -3,24 +3,20 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wsat.client.WSATClient;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsat._2006._06.CompletionInitiatorPortType;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
/**
* The Client side of the Completion Initiator.
@@ -36,77 +32,57 @@
/**
* The committed action.
*/
- private AttributedURI committedAction = null;
+ private String committedAction = null;
/**
* The aborted action.
*/
- private AttributedURI abortedAction = null;
+ private String abortedAction = null;
/**
* The fault action.
*/
- private AttributedURI faultAction = null;
+ private String faultAction = null;
/**
* The completion coordinator URI for replies.
*/
- private EndpointReference completionCoordinator ;
+ private MAPEndpoint completionCoordinator ;
/**
* The completion coordinator URI for secure replies.
*/
- private EndpointReference secureCompletionCoordinator ;
+ private MAPEndpoint secureCompletionCoordinator ;
/**
* Construct the completion initiator client.
*/
private CompletionInitiatorClient()
{
- final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- committedAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_COMMITTED);
- abortedAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_ABORTED);
- faultAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_FAULT);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+ final MAPBuilder builder = MAPBuilder.getBuilder();
+ committedAction = AtomicTransactionConstants.WSAT_ACTION_COMMITTED;
+ abortedAction = AtomicTransactionConstants.WSAT_ACTION_ABORTED;
+ faultAction = AtomicTransactionConstants.WSAT_ACTION_FAULT;
- // Add WS-Addressing
- // AddressingPolicy.register(handlerRegistry) ;
- // Add client policies
- // ClientPolicy.register(handlerRegistry) ;
-
final String completionCoordinatorURIString =
ServiceRegistry.getRegistry().getServiceURI(AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_NAME, false) ;
final String secureCompletionCoordinatorURIString =
ServiceRegistry.getRegistry().getServiceURI(AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_NAME, true) ;
- try {
- URI completionCoordinatorURI = new URI(completionCoordinatorURIString) ;
- completionCoordinator = builder.newEndpointReference(completionCoordinatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- try {
- URI secureCompletionCoordinatorURI = new URI(secureCompletionCoordinatorURIString) ;
- secureCompletionCoordinator = builder.newEndpointReference(secureCompletionCoordinatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
+ completionCoordinator = builder.newEndpoint(completionCoordinatorURIString);
+ secureCompletionCoordinator = builder.newEndpoint(secureCompletionCoordinatorURIString);
}
/**
* Send a committed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCommitted(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCommitted(final W3CEndpointReference participant, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCompletionCoordinator(participant);
- AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
- CompletionInitiatorPortType port = getPort(participant, addressingProperties, committedAction);
+ MAPEndpoint coordinator = getCompletionCoordinator(participant);
+ AddressingHelper.installFaultTo(map, coordinator, identifier);
+ CompletionInitiatorPortType port = getPort(participant, map, committedAction);
Notification commited = new Notification();
port.committedOperation(commited);
@@ -114,17 +90,17 @@
/**
* Send an aborted request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendAborted(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendAborted(final W3CEndpointReference participant, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCompletionCoordinator(participant);
- AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
- CompletionInitiatorPortType port = getPort(participant, addressingProperties, abortedAction);
+ MAPEndpoint coordinator = getCompletionCoordinator(participant);
+ AddressingHelper.installFaultTo(map, coordinator, identifier);
+ CompletionInitiatorPortType port = getPort(participant, map, abortedAction);
Notification aborted = new Notification();
port.abortedOperation(aborted);
@@ -132,18 +108,18 @@
/**
* Send a fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param soapFault The SOAP fault.
* @param identifier The arjuna instance identifier.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendSoapFault(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final SoapFault soapFault, final InstanceIdentifier identifier)
+ public void sendSoapFault(final W3CEndpointReference participant, final MAP map, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
// use the SoapFaultService to format a soap fault and send it back to the faultto or from address
- SoapFaultClient.sendSoapFault((SoapFault11)soapFault, participant, addressingProperties, faultAction);
+ SoapFaultClient.sendSoapFault((SoapFault11)soapFault, participant, map, faultAction);
}
/**
@@ -151,7 +127,7 @@
* @param participant
* @return either the secure terminaton participant endpoint or the non-secure endpoint
*/
- EndpointReference getCompletionCoordinator(W3CEndpointReference participant)
+ MAPEndpoint getCompletionCoordinator(W3CEndpointReference participant)
{
NativeEndpointReference nativeRef = EndpointHelper.transform(NativeEndpointReference.class, participant);
String address = nativeRef.getAddress();
@@ -175,15 +151,15 @@
* obtain a port from the completion participant endpoint configured with the instance identifier handler and the supplied
* addressing properties supplemented with the given action
* @param participant
- * @param addressingProperties
+ * @param map
* @param action
* @return
*/
private CompletionInitiatorPortType getPort(final W3CEndpointReference participant,
- final AddressingProperties addressingProperties,
- final AttributedURI action)
+ final MAP map,
+ final String action)
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
- return WSATClient.getCompletionInitiatorPort(participant, action, addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
+ return WSATClient.getCompletionInitiatorPort(participant, action, map);
}
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -3,24 +3,20 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wsat.client.WSATClient;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsat._2006._06.CoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
/**
* The Client side of the Coordinator.
@@ -36,87 +32,67 @@
/**
* The prepared action.
*/
- private AttributedURI preparedAction = null;
+ private String preparedAction = null;
/**
* The aborted action.
*/
- private AttributedURI abortedAction = null;
+ private String abortedAction = null;
/**
* The read only action.
*/
- private AttributedURI readOnlyAction = null;
+ private String readOnlyAction = null;
/**
* The committed action.
*/
- private AttributedURI committedAction = null;
+ private String committedAction = null;
/**
* The fault action.
*/
- private AttributedURI faultAction = null;
+ private String faultAction = null;
/**
* The participant URI for replies.
*/
- private EndpointReference participant ;
+ private MAPEndpoint participant ;
/**
* The participant URI for secure replies.
*/
- private EndpointReference secureParticipant ;
+ private MAPEndpoint secureParticipant ;
/**
* Construct the coordinator client.
*/
private CoordinatorClient()
{
- final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- preparedAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_PREPARED);
- abortedAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_ABORTED);
- readOnlyAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_READ_ONLY);
- committedAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_COMMITTED);
- faultAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_FAULT);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+ final MAPBuilder builder = MAPBuilder.getBuilder();
+ preparedAction = AtomicTransactionConstants.WSAT_ACTION_PREPARED;
+ abortedAction = AtomicTransactionConstants.WSAT_ACTION_ABORTED;
+ readOnlyAction = AtomicTransactionConstants.WSAT_ACTION_READ_ONLY;
+ committedAction = AtomicTransactionConstants.WSAT_ACTION_COMMITTED;
+ faultAction = AtomicTransactionConstants.WSAT_ACTION_FAULT;
- // Add WS-Addressing
- // AddressingPolicy.register(handlerRegistry) ;
- // Add client policies
- // ClientPolicy.register(handlerRegistry) ;
-
final String participantURIString =
ServiceRegistry.getRegistry().getServiceURI(AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME, false);
final String secureParticipantURIString =
ServiceRegistry.getRegistry().getServiceURI(AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME, true);
- try {
- URI participantURI = new URI(participantURIString);
- participant = builder.newEndpointReference(participantURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- try {
- URI secureParticipantURI = new URI(secureParticipantURIString);
- secureParticipant = builder.newEndpointReference(secureParticipantURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
+ participant = builder.newEndpoint(participantURIString);
+ secureParticipant = builder.newEndpoint(secureParticipantURIString);
}
/**
* Send a prepared request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any SOAP errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendPrepared(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendPrepared(final W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
- CoordinatorPortType port = getPort(endpoint, addressingProperties, preparedAction);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
+ CoordinatorPortType port = getPort(endpoint, map, preparedAction);
Notification prepared = new Notification();
port.preparedOperation(prepared);
@@ -124,17 +100,17 @@
/**
* Send an aborted request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any SOAP errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendAborted(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendAborted(final W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
- CoordinatorPortType port = getPort(endpoint, addressingProperties, abortedAction);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFaultTo(map, participant, identifier);
+ CoordinatorPortType port = getPort(endpoint, map, abortedAction);
Notification aborted = new Notification();
port.abortedOperation(aborted);
@@ -142,17 +118,17 @@
/**
* Send a read only request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any SOAP errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendReadOnly(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendReadOnly(final W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
- CoordinatorPortType port = getPort(endpoint, addressingProperties, readOnlyAction);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFaultTo(map, participant, identifier);
+ CoordinatorPortType port = getPort(endpoint, map, readOnlyAction);
Notification readOnly = new Notification();
port.readOnlyOperation(readOnly);
@@ -160,17 +136,17 @@
/**
* Send a committed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any SOAP errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCommitted(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCommitted(final W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
- CoordinatorPortType port = getPort(endpoint, addressingProperties, committedAction);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFaultTo(map, participant, identifier);
+ CoordinatorPortType port = getPort(endpoint, map, committedAction);
Notification committed = new Notification();
port.committedOperation(committed);
@@ -178,18 +154,18 @@
/**
* Send a fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param soapFault The SOAP fault.
* @param identifier The arjuna instance identifier.
* @throws com.arjuna.webservices.SoapFault For any SOAP errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendSoapFault(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final SoapFault soapFault, final InstanceIdentifier identifier)
+ public void sendSoapFault(final W3CEndpointReference endpoint, final MAP map, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
// use the SoapFaultService to format a soap fault and send it back to the faultto address
- SoapFaultClient.sendSoapFault((SoapFault11)soapFault, endpoint, addressingProperties, faultAction);
+ SoapFaultClient.sendSoapFault((SoapFault11)soapFault, endpoint, map, faultAction);
}
/**
@@ -197,14 +173,14 @@
* @param endpoint
* @return either the secure participant endpoint or the non-secure endpoint
*/
- EndpointReference getParticipant(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
+ MAPEndpoint getParticipant(W3CEndpointReference endpoint, MAP map)
{
String address;
if (endpoint != null) {
NativeEndpointReference nativeRef = EndpointHelper.transform(NativeEndpointReference.class, endpoint);
address = nativeRef.getAddress();
} else {
- address = addressingProperties.getTo().getURI().toString();
+ address = map.getTo();
}
if (address.startsWith("https")) {
@@ -227,19 +203,19 @@
* obtain a port from the coordinator endpoint configured with the instance identifier handler and the supplied
* addressing properties supplemented with the given action
* @param endpoint
- * @param addressingProperties
+ * @param map
* @param action
* @return
*/
private CoordinatorPortType getPort(final W3CEndpointReference endpoint,
- final AddressingProperties addressingProperties,
- final AttributedURI action)
+ final MAP map,
+ final String action)
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
if (endpoint != null) {
- return WSATClient.getCoordinatorPort(endpoint, action, addressingProperties);
+ return WSATClient.getCoordinatorPort(endpoint, action, map);
} else {
- return WSATClient.getCoordinatorPort(action, addressingProperties);
+ return WSATClient.getCoordinatorPort(action, map);
}
}
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -3,24 +3,20 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wsat.client.WSATClient;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
import org.oasis_open.docs.ws_tx.wsat._2006._06.ParticipantPortType;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
/**
* The Client side of the Participant.
@@ -36,80 +32,59 @@
/**
* The prepare action.
*/
- private AttributedURI prepareAction = null;
+ private String prepareAction = null;
/**
* The commit action.
*/
- private AttributedURI commitAction = null;
+ private String commitAction = null;
/**
* The rollback action.
*/
- private AttributedURI rollbackAction = null;
+ private String rollbackAction = null;
/**
* The SOAP fault action.
*/
- private AttributedURI faultAction;
+ private String faultAction;
/**
* The coordinator URI for replies.
*/
- private EndpointReference coordinator ;
+ private MAPEndpoint coordinator ;
/**
* The coordinator URI for secure replies.
*/
- private EndpointReference secureCoordinator ;
+ private MAPEndpoint secureCoordinator ;
/**
* Construct the completion initiator client.
*/
{
- final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- prepareAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_PREPARE);
- commitAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_COMMIT);
- rollbackAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_ROLLBACK);
- faultAction = builder.newURI(AtomicTransactionConstants.WSAT_ACTION_FAULT);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+ final MAPBuilder builder = MAPBuilder.getBuilder();
+ prepareAction = AtomicTransactionConstants.WSAT_ACTION_PREPARE;
+ commitAction = AtomicTransactionConstants.WSAT_ACTION_COMMIT;
+ rollbackAction = AtomicTransactionConstants.WSAT_ACTION_ROLLBACK;
+ faultAction = AtomicTransactionConstants.WSAT_ACTION_FAULT;
- // Add WS-Addressing
- // AddressingPolicy.register(handlerRegistry) ;
- // Add client policies
- // ClientPolicy.register(handlerRegistry) ;
-
final String coordinatorURIString = ServiceRegistry.getRegistry().getServiceURI(AtomicTransactionConstants.COORDINATOR_SERVICE_NAME, false);
final String secureCoordinatorURIString = ServiceRegistry.getRegistry().getServiceURI(AtomicTransactionConstants.COORDINATOR_SERVICE_NAME, true);
- try {
- URI coordinatorURI = new URI(coordinatorURIString);
- coordinator = builder.newEndpointReference(coordinatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- try {
- URI secureCoordinatorURI = new URI(secureCoordinatorURIString);
- secureCoordinator = builder.newEndpointReference(secureCoordinatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
-
+ coordinator = builder.newEndpoint(coordinatorURIString);
+ secureCoordinator = builder.newEndpoint(secureCoordinatorURIString);
}
/**
* Send a prepare request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendPrepare(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendPrepare(final W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
- ParticipantPortType port = getPort(endpoint, addressingProperties, prepareAction);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
+ ParticipantPortType port = getPort(endpoint, map, prepareAction);
Notification prepare = new Notification();
port.prepareOperation(prepare);
@@ -117,17 +92,17 @@
/**
* Send a commit request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCommit(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCommit(final W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
- ParticipantPortType port = getPort(endpoint, addressingProperties, commitAction);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
+ ParticipantPortType port = getPort(endpoint, map, commitAction);
Notification commit = new Notification();
port.commitOperation(commit);
@@ -135,17 +110,17 @@
/**
* Send a rollback request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendRollback(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendRollback(final W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
- ParticipantPortType port = getPort(endpoint, addressingProperties, rollbackAction);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
+ ParticipantPortType port = getPort(endpoint, map, rollbackAction);
Notification rollback = new Notification();
port.rollbackOperation(rollback);
@@ -153,18 +128,18 @@
/**
* Send a fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param soapFault The SOAP fault.
* @param identifier The arjuna instance identifier.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault soapFault, final InstanceIdentifier identifier)
+ public void sendSoapFault(final MAP map, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
// use the SoapFaultService to format a soap fault and send it back to the faultto or from address
- SoapFaultClient.sendSoapFault((SoapFault11)soapFault, addressingProperties, faultAction);
+ SoapFaultClient.sendSoapFault((SoapFault11)soapFault, map, faultAction);
}
/**
@@ -172,14 +147,14 @@
* @param endpoint
* @return either the secure coordinator endpoint or the non-secure endpoint
*/
- EndpointReference getCoordinator(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
+ MAPEndpoint getCoordinator(W3CEndpointReference endpoint, MAP map)
{
String address;
if (endpoint != null) {
NativeEndpointReference nativeRef = EndpointHelper.transform(NativeEndpointReference.class, endpoint);
address = nativeRef.getAddress();
} else {
- address = addressingProperties.getTo().getURI().toString();
+ address = map.getTo();
}
if (address.startsWith("https")) {
@@ -202,19 +177,19 @@
* obtain a port from the participant endpoint configured with the instance identifier handler and the supplied
* addressing properties supplemented with the given action
* @param participant
- * @param addressingProperties
+ * @param map
* @param action
* @return
*/
private ParticipantPortType getPort(final W3CEndpointReference participant,
- final AddressingProperties addressingProperties,
- final AttributedURI action)
+ final MAP map,
+ final String action)
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
if (participant != null) {
- return WSATClient.getParticipantPort(participant, action, addressingProperties);
+ return WSATClient.getParticipantPort(participant, action, map);
} else {
- return WSATClient.getParticipantPort(action, addressingProperties);
+ return WSATClient.getParticipantPort(action, map);
}
}
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,19 +1,14 @@
package com.arjuna.webservices11.wsat.client;
-import com.arjuna.webservices11.wsarj.handler.InstanceIdentifierHandler;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsat._2006._06.*;
-import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
-import javax.xml.ws.BindingProvider;
-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.handler.Handler;
-import javax.xml.ws.soap.AddressingFeature;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import java.net.URISyntaxException;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.soap.AddressingFeature;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -51,7 +46,7 @@
/**
* builder used to construct addressing info for calls
*/
- private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ private static MAPBuilder builder = MAPBuilder.getBuilder();
/**
* fetch a coordinator service unique to the current thread
@@ -104,165 +99,134 @@
// fetch ports when we HAVE an endpoint
public static CoordinatorPortType getCoordinatorPort(W3CEndpointReference endpointReference,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
CoordinatorService service = getCoordinatorService();
- // CoordinatorPortType port = service.getPort(endpointReference, CoordinatorPortType.class, new AddressingFeature(true, true));
- CoordinatorPortType port = service.getPort(endpointReference, CoordinatorPortType.class);
+ CoordinatorPortType port = service.getPort(endpointReference, CoordinatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configureEndpointPort(bindingProvider, action, addressingProperties);
+ configureEndpointPort(bindingProvider, action, map);
return port;
}
public static ParticipantPortType getParticipantPort(W3CEndpointReference endpointReference,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // 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(endpointReference, ParticipantPortType.class, new AddressingFeature(true, true));
- ParticipantPortType port = service.getPort(endpointReference, ParticipantPortType.class);
+ ParticipantPortType port = service.getPort(endpointReference, ParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configureEndpointPort(bindingProvider, action, addressingProperties);
+ configureEndpointPort(bindingProvider, action, map);
return port;
}
public static CompletionCoordinatorPortType getCompletionCoordinatorPort(W3CEndpointReference endpointReference,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
CompletionCoordinatorService service = getCompletionCoordinatorService();
- // CompletionCoordinatorPortType port = service.getPort(endpointReference, CompletionCoordinatorPortType.class, new AddressingFeature(true, true));
- CompletionCoordinatorPortType port = service.getPort(endpointReference, CompletionCoordinatorPortType.class);
+ CompletionCoordinatorPortType port = service.getPort(endpointReference, CompletionCoordinatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configureEndpointPort(bindingProvider, action, addressingProperties);
+ configureEndpointPort(bindingProvider, action, map);
return port;
}
public static CompletionInitiatorPortType getCompletionInitiatorPort(W3CEndpointReference endpointReference,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
CompletionInitiatorService service = getCompletionInitiatorService();
- // CompletionInitiatorPortType port = service.getPort(endpointReference, CompletionInitiatorPortType.class, new AddressingFeature(true, true));
- CompletionInitiatorPortType port = service.getPort(endpointReference, CompletionInitiatorPortType.class);
+ CompletionInitiatorPortType port = service.getPort(endpointReference, CompletionInitiatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configureEndpointPort(bindingProvider, action, addressingProperties);
+ configureEndpointPort(bindingProvider, action, map);
return port;
}
// fetch ports when we have NO endpoint
- public static CoordinatorPortType getCoordinatorPort(AttributedURI action,
- AddressingProperties addressingProperties)
+ public static CoordinatorPortType getCoordinatorPort(String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
CoordinatorService service = getCoordinatorService();
- // CoordinatorPortType port = service.getPort(CoordinatorPortType.class, new AddressingFeature(true, true));
- CoordinatorPortType port = service.getPort(CoordinatorPortType.class);
+ CoordinatorPortType port = service.getPort(CoordinatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configurePort(bindingProvider, action, addressingProperties);
+ configurePort(bindingProvider, action, map);
return port;
}
- public static ParticipantPortType getParticipantPort(AttributedURI action,
- AddressingProperties addressingProperties)
+ public static ParticipantPortType getParticipantPort(String action,
+ MAP map)
{
- // 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, new AddressingFeature(true, true));
- ParticipantPortType port = service.getPort(ParticipantPortType.class);
+ ParticipantPortType port = service.getPort(ParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configurePort(bindingProvider, action, addressingProperties);
+ configurePort(bindingProvider, action, map);
return port;
}
- public static CompletionCoordinatorPortType getCompletionCoordinatorPort(AttributedURI action,
- AddressingProperties addressingProperties)
+ public static CompletionCoordinatorPortType getCompletionCoordinatorPort(String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
CompletionCoordinatorService service = getCompletionCoordinatorService();
- // CompletionCoordinatorPortType port = service.getPort(CompletionCoordinatorPortType.class, new AddressingFeature(true, true));
- CompletionCoordinatorPortType port = service.getPort(CompletionCoordinatorPortType.class);
+ CompletionCoordinatorPortType port = service.getPort(CompletionCoordinatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configurePort(bindingProvider, action, addressingProperties);
+ configurePort(bindingProvider, action, map);
return port;
}
- public static CompletionInitiatorPortType getCompletionInitiatorPort(AttributedURI action,
- AddressingProperties addressingProperties)
+ public static CompletionInitiatorPortType getCompletionInitiatorPort(String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
CompletionInitiatorService service = getCompletionInitiatorService();
- // CompletionInitiatorPortType port = service.getPort(CompletionInitiatorPortType.class, new AddressingFeature(true, true));
- CompletionInitiatorPortType port = service.getPort(CompletionInitiatorPortType.class);
+ CompletionInitiatorPortType port = service.getPort(CompletionInitiatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configurePort(bindingProvider, action, addressingProperties);
+ configurePort(bindingProvider, action, map);
return port;
}
- private static void configureEndpointPort(BindingProvider bindingProvider,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ private static void configureEndpointPort(BindingProvider bindingProvider, String action, MAP map)
{
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannoy specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
List<Handler> customHandlerChain = new ArrayList<Handler>();
customHandlerChain.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
- // ok, JBossWS native has hacked this by pulling the address and reference parameters out of the endpoint
- // and storing them in an AddressingProperties instance hung off the context under CLIENT_ADDRESSING_PROPERTIES_OUTBOUND.
- // we still need to set the action and message id and possibly relatesTo -- this is all distinctly non-portable :-/
- // n.b. Metro installs the address in requestContext under ENDPOINT_ADDRESS_PROPERTY. it also seems to ensure
- // that the reference parameters get installed -- but how?
-
- // the address will have been pulled out of the endpoint by getPort but we still have to set it in the
- // addressing properties along with the action and message id
+ */
Map<String, Object> requestContext = bindingProvider.getRequestContext();
- AddressingProperties requestProperties = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
- addressingProperties.setAction(action);
- AddressingHelper.installCallerProperties(addressingProperties, requestProperties);
- // we should not need to do this but JBossWS does not pick up the value in the addressing properties
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, requestProperties.getTo().getURI().toString());
+ MAP requestMap = AddressingHelper.outboundMap(requestContext);
+ map.setAction(action);
+ AddressingHelper.installCallerProperties(map, requestMap);
+ AddressingHelper.configureRequestContext(requestContext, requestMap.getTo(), action);
}
private static void configurePort(BindingProvider bindingProvider,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannoy specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
List<Handler> customHandlerChain = new ArrayList<Handler>();
customHandlerChain.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+ */
Map<String, Object> requestContext = bindingProvider.getRequestContext();
- addressingProperties.setAction(action);
- requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
- // JaxWS should do this for us
- requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
- // we should not need to do this but JBossWS does not pick up the value in the addressing properties
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, addressingProperties.getTo().getURI().toString());
+ map.setAction(action);
+ AddressingHelper.configureRequestContext(requestContext, map, map.getTo(), action);
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -2,9 +2,8 @@
import com.arjuna.wst11.CompletionCoordinatorParticipant;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
-
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
/**
@@ -55,18 +54,18 @@
/**
* Commit.
* @param commit The commit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void commit(final Notification commit, final AddressingProperties addressingProperties,
+ public abstract void commit(final Notification commit, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Rollback.
* @param rollback The rollback notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void rollback(final Notification rollback, final AddressingProperties addressingProperties,
+ public abstract void rollback(final Notification rollback, final MAP map,
final ArjunaContext arjunaContext) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorCallback.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorCallback.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -2,11 +2,10 @@
import com.arjuna.webservices.base.processors.Callback;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.SoapFault;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The Completion Initiator callback.
* @author kevin
@@ -16,27 +15,27 @@
/**
* An aborted response.
* @param aborted The aborted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void aborted(final Notification aborted, final AddressingProperties addressingProperties,
+ public abstract void aborted(final Notification aborted, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* A committed response.
* @param committed The committed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void committed(final Notification committed, final AddressingProperties addressingProperties,
+ public abstract void committed(final Notification committed, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* A SOAP fault response.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public abstract void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CompletionInitiatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -2,13 +2,11 @@
import com.arjuna.webservices11.wsarj.processor.BaseNotificationProcessor;
import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsat.processors.CompletionInitiatorCallback;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.base.processors.Callback;
import com.arjuna.webservices.SoapFault;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The Completion Initiator processor.
* @author kevin
@@ -32,49 +30,49 @@
/**
* Handle an aborted response.
* @param aborted The aborted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void handleAborted(final Notification aborted, final AddressingProperties addressingProperties,
+ public void handleAborted(final Notification aborted, final MAP map,
final ArjunaContext arjunaContext)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((CompletionInitiatorCallback)callback).aborted(aborted, addressingProperties, arjunaContext) ;
+ ((CompletionInitiatorCallback)callback).aborted(aborted, map, arjunaContext) ;
}
- }, getIDs(addressingProperties, arjunaContext)) ;
+ }, getIDs(arjunaContext)) ;
}
/**
* Handle a committed response.
* @param committed The committed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void handleCommitted(final Notification committed, final AddressingProperties addressingProperties,
+ public void handleCommitted(final Notification committed, final MAP map,
final ArjunaContext arjunaContext)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((CompletionInitiatorCallback)callback).committed(committed, addressingProperties, arjunaContext) ;
+ ((CompletionInitiatorCallback)callback).committed(committed, map, arjunaContext) ;
}
- }, getIDs(addressingProperties, arjunaContext)) ;
+ }, getIDs(arjunaContext)) ;
}
/**
* Handle a SOAP fault response.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public void handleSoapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((CompletionInitiatorCallback)callback).soapFault(soapFault, addressingProperties, arjunaContext) ;
+ ((CompletionInitiatorCallback)callback).soapFault(soapFault, map, arjunaContext) ;
}
- }, getIDs(addressingProperties, arjunaContext)) ;
+ }, getIDs(arjunaContext)) ;
}
/**
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/CoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -2,10 +2,9 @@
import com.arjuna.webservices11.wsat.CoordinatorInboundEvents;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.SoapFault;
-import javax.xml.ws.addressing.AddressingProperties;
-
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
/**
@@ -62,37 +61,37 @@
/**
* Aborted.
* @param aborted The aborted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void aborted(final Notification aborted, final AddressingProperties addressingProperties,
+ public abstract void aborted(final Notification aborted, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Committed.
* @param committed The committed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void committed(final Notification committed, final AddressingProperties addressingProperties,
+ public abstract void committed(final Notification committed, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Prepared.
* @param prepared The prepared notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void prepared(final Notification prepared, final AddressingProperties addressingProperties,
+ public abstract void prepared(final Notification prepared, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Read only.
* @param readOnly The read only notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void readOnly(final Notification readOnly, final AddressingProperties addressingProperties,
+ public abstract void readOnly(final Notification readOnly, final MAP map,
final ArjunaContext arjunaContext) ;
/**
@@ -101,6 +100,6 @@
* @param addressingContext The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingContext,
+ public abstract void soapFault(final SoapFault soapFault, final MAP addressingContext,
final ArjunaContext arjunaContext) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/ParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/ParticipantProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/processors/ParticipantProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -2,10 +2,9 @@
import com.arjuna.webservices11.wsat.ParticipantInboundEvents;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.SoapFault;
-import javax.xml.ws.addressing.AddressingProperties;
-
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
/**
@@ -62,36 +61,36 @@
/**
* Commit.
* @param commit The commit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void commit(final Notification commit, final AddressingProperties addressingProperties,
+ public abstract void commit(final Notification commit, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Prepare.
* @param prepare The prepare notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void prepare(final Notification prepare, final AddressingProperties addressingProperties,
+ public abstract void prepare(final Notification prepare, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Rollback.
* @param rollback The rollback notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void rollback(final Notification rollback, final AddressingProperties addressingProperties,
+ public abstract void rollback(final Notification rollback, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* SOAP Fault.
* @param soapFault The SOAP fault notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public abstract void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -7,13 +7,13 @@
import javax.jws.soap.SOAPBinding;
import javax.annotation.Resource;
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.xml.ws.soap.Addressing;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsat.processors.CompletionCoordinatorProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.services.framework.task.TaskManager;
import com.arjuna.services.framework.task.Task;
@@ -29,7 +29,7 @@
portName = "CompletionCoordinatorPortType"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class CompletionCoordinatorPortTypeImpl implements CompletionCoordinatorPortType
{
@@ -48,13 +48,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification commit = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CompletionCoordinatorProcessor.getProcessor().commit(commit, inboundAddressProperties, arjunaContext) ;
+ CompletionCoordinatorProcessor.getProcessor().commit(commit, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -71,13 +70,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification rollback = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CompletionCoordinatorProcessor.getProcessor().rollback(rollback, inboundAddressProperties, arjunaContext) ;
+ CompletionCoordinatorProcessor.getProcessor().rollback(rollback, inboundMap, arjunaContext) ;
}
}) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -9,13 +9,13 @@
import javax.annotation.Resource;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.soap.Addressing;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
import javax.xml.ws.handler.MessageContext;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsat.processors.CompletionInitiatorProcessor;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.services.framework.task.TaskManager;
import com.arjuna.services.framework.task.Task;
import com.arjuna.webservices.SoapFault;
@@ -32,7 +32,7 @@
portName = "CompletionInitiatorPortType"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class CompletionInitiatorPortTypeImpl implements CompletionInitiatorPortType
{
@@ -52,13 +52,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification committed = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CompletionInitiatorProcessor.getProcessor().handleCommitted(committed, inboundAddressProperties, arjunaContext) ;
+ CompletionInitiatorProcessor.getProcessor().handleCommitted(committed, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -75,13 +74,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification aborted = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CompletionInitiatorProcessor.getProcessor().handleAborted(aborted, inboundAddressProperties, arjunaContext) ;
+ CompletionInitiatorProcessor.getProcessor().handleAborted(aborted, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -93,13 +91,13 @@
Fault fault)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- final AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
final SoapFault soapFault = SoapFault11.fromFault(fault);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CompletionInitiatorProcessor.getProcessor().handleSoapFault(soapFault, inboundAddressProperties, arjunaContext); ;
+ CompletionInitiatorProcessor.getProcessor().handleSoapFault(soapFault, inboundMap, arjunaContext); ;
}
}) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -9,13 +9,13 @@
import javax.annotation.Resource;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.soap.Addressing;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
import javax.xml.ws.handler.MessageContext;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsat.processors.CoordinatorProcessor;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.services.framework.task.TaskManager;
import com.arjuna.services.framework.task.Task;
import com.arjuna.webservices.SoapFault;
@@ -32,7 +32,7 @@
portName = "CoordinatorPortType"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class CoordinatorPortTypeImpl implements CoordinatorPortType
{
@@ -52,13 +52,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification prepared = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorProcessor.getProcessor().prepared(prepared, inboundAddressProperties, arjunaContext) ;
+ CoordinatorProcessor.getProcessor().prepared(prepared, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -75,13 +74,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification aborted = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorProcessor.getProcessor().aborted(aborted, inboundAddressProperties, arjunaContext) ;
+ CoordinatorProcessor.getProcessor().aborted(aborted, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -98,13 +96,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification readOnly = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorProcessor.getProcessor().readOnly(readOnly, inboundAddressProperties, arjunaContext) ;
+ CoordinatorProcessor.getProcessor().readOnly(readOnly, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -121,13 +118,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification committed = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorProcessor.getProcessor().committed(committed, inboundAddressProperties, arjunaContext) ;
+ CoordinatorProcessor.getProcessor().committed(committed, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -139,13 +135,13 @@
Fault fault)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- final AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
final SoapFault soapFault = SoapFault11.fromFault(fault);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorProcessor.getProcessor().soapFault(soapFault, inboundAddressProperties, arjunaContext); ;
+ CoordinatorProcessor.getProcessor().soapFault(soapFault, inboundMap, arjunaContext); ;
}
}) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -10,12 +10,12 @@
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.soap.Addressing;
import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.services.framework.task.TaskManager;
import com.arjuna.services.framework.task.Task;
import com.arjuna.webservices.SoapFault;
@@ -32,7 +32,7 @@
portName = "ParticipantPortType"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class ParticipantPortTypeImpl implements ParticipantPortType
{
@@ -52,13 +52,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification prepare = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantProcessor.getProcessor().prepare(prepare, inboundAddressProperties, arjunaContext) ;
+ ParticipantProcessor.getProcessor().prepare(prepare, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -75,13 +74,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification commit = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantProcessor.getProcessor().commit(commit, inboundAddressProperties, arjunaContext) ;
+ ParticipantProcessor.getProcessor().commit(commit, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -98,13 +96,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final Notification rollback = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantProcessor.getProcessor().rollback(rollback, inboundAddressProperties, arjunaContext) ;
+ ParticipantProcessor.getProcessor().rollback(rollback, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -116,13 +113,13 @@
Fault fault)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- final AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
final SoapFault soapFault = SoapFault11.fromFault(fault);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantProcessor.getProcessor().soapFault(soapFault, inboundAddressProperties, arjunaContext); ;
+ ParticipantProcessor.getProcessor().soapFault(soapFault, inboundMap, arjunaContext); ;
}
}) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionCoordinatorInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionCoordinatorInboundEvents.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionCoordinatorInboundEvents.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,13 +22,11 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
/**
* The Participant events.
*/
@@ -37,83 +35,83 @@
/**
* Handle the cancelled event.
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cancelled(final NotificationType cancelled, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void cancelled(final NotificationType cancelled, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the closed event.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void closed(final NotificationType closed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void closed(final NotificationType closed, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the compensated event.
* @param compensated The compensated notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void compensated(final NotificationType compensated, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void compensated(final NotificationType compensated, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the completed event.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void completed(final NotificationType completed, final AddressingProperties addressingProperties,
+ public void completed(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Handle the exit event.
* @param exit The exit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void exit(final NotificationType exit, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void exit(final NotificationType exit, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the fail event.
* @param fail The fail exception.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void fail(final ExceptionType fail, final AddressingProperties addressingProperties,
+ public void fail(final ExceptionType fail, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Handle the cannotComplete event.
* @param cannotComplete The cannotComplete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cannotComplete(final NotificationType cannotComplete, final AddressingProperties addressingProperties,
+ public void cannotComplete(final NotificationType cannotComplete, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Handle the getStatus event.
* @param getStatus The getStatus notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the status event.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext) ;
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionParticipantInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionParticipantInboundEvents.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/CoordinatorCompletionParticipantInboundEvents.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,8 +22,8 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
@@ -36,80 +36,80 @@
/**
* Handle the cancel event.
* @param cancel The cancel notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cancel(final NotificationType cancel, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void cancel(final NotificationType cancel, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the close event.
* @param close The close notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void close(final NotificationType close, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void close(final NotificationType close, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the compensate event.
* @param compensate The compensate notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void compensate(final NotificationType compensate, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void compensate(final NotificationType compensate, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the complete event.
* @param complete The complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void complete(final NotificationType complete, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void complete(final NotificationType complete, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the exited event.
* @param exited The exited notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void exited(final NotificationType exited, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void exited(final NotificationType exited, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the failed event.
* @param failed The failed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void failed(final NotificationType failed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void failed(final NotificationType failed, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the not completed event.
* @param notCompleted The not completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void notCompleted(final NotificationType notCompleted, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void notCompleted(final NotificationType notCompleted, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the getStatus event.
* @param getStatus The getStatus notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the status event.
* @param status The status type.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext) ;
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionCoordinatorInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionCoordinatorInboundEvents.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionCoordinatorInboundEvents.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,13 +22,11 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
/**
* The Participant events.
*/
@@ -37,83 +35,83 @@
/**
* Handle the cancelled event.
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cancelled(final NotificationType cancelled, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void cancelled(final NotificationType cancelled, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the closed event.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void closed(final NotificationType closed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void closed(final NotificationType closed, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the compensated event.
* @param compensated The compensated notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void compensated(final NotificationType compensated, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void compensated(final NotificationType compensated, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the completed event.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void completed(final NotificationType completed, final AddressingProperties addressingProperties,
+ public void completed(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Handle the exit event.
* @param exit The exit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void exit(final NotificationType exit, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void exit(final NotificationType exit, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the fail event.
* @param fail The fail exception.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void fail(final ExceptionType fail, final AddressingProperties addressingProperties,
+ public void fail(final ExceptionType fail, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Handle the cannotComplete event.
* @param cannotComplete The cannotComplete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cannotComplete(final NotificationType cannotComplete, final AddressingProperties addressingProperties,
+ public void cannotComplete(final NotificationType cannotComplete, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Handle the getStatus event.
* @param getStatus The getStatus notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the status event.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext) ;
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionParticipantInboundEvents.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionParticipantInboundEvents.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/ParticipantCompletionParticipantInboundEvents.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,12 +22,10 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.ArjunaContext;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
/**
* The Participant events.
*/
@@ -36,72 +34,72 @@
/**
* Handle the cancel event.
* @param cancel The cancel notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cancel(final NotificationType cancel, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void cancel(final NotificationType cancel, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the close event.
* @param close The close notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void close(final NotificationType close, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void close(final NotificationType close, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the compensate event.
* @param compensate The compensate notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void compensate(final NotificationType compensate, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void compensate(final NotificationType compensate, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the exited event.
* @param exited The exited notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void exited(final NotificationType exited, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void exited(final NotificationType exited, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the failed event.
* @param failed The failed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void failed(final NotificationType failed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void failed(final NotificationType failed, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the not completed event.
* @param notCompleted The not completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void notCompleted(final NotificationType notCompleted, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void notCompleted(final NotificationType notCompleted, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the getStatus event.
* @param getStatus The getStatus notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the status event.
* @param status The status type.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext) ;
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,20 +28,17 @@
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionCoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
/**
* The Client side of the Coordinator Completion Coordinator.
@@ -57,108 +54,88 @@
/**
* The completed action.
*/
- private AttributedURI completedAction = null;
+ private String completedAction = null;
/**
* The fault action.
*/
- private AttributedURI failAction = null;
+ private String failAction = null;
/**
* The compensated action.
*/
- private AttributedURI compensatedAction = null;
+ private String compensatedAction = null;
/**
* The closed action.
*/
- private AttributedURI closedAction = null;
+ private String closedAction = null;
/**
* The cancelled action.
*/
- private AttributedURI cancelledAction = null;
+ private String cancelledAction = null;
/**
* The exit action.
*/
- private AttributedURI cannotCompleteAction = null;
+ private String cannotCompleteAction = null;
/**
* The exit action.
*/
- private AttributedURI exitAction = null;
+ private String exitAction = null;
/**
* The get status action.
*/
- private AttributedURI getStatusAction = null;
+ private String getStatusAction = null;
/**
* The status action.
*/
- private AttributedURI statusAction = null;
+ private String statusAction = null;
/**
* The coordinator completion participant URI for replies.
*/
- private EndpointReference coordinatorCompletionParticipant = null;
+ private MAPEndpoint coordinatorCompletionParticipant = null;
/**
* The coordinator completion participant URI for replies.
*/
- private EndpointReference secureCoordinatorCompletionParticipant = null;
+ private MAPEndpoint secureCoordinatorCompletionParticipant = null;
/**
* Construct the participant completion coordinator client.
*/
private CoordinatorCompletionCoordinatorClient()
{
- final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- completedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_COMPLETED);
- failAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_FAIL);
- compensatedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_COMPENSATED);
- closedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_CLOSED);
- cancelledAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_CANCELLED);
- exitAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_EXIT);
- cannotCompleteAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_CANNOT_COMPLETE);
- getStatusAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_GET_STATUS);
- statusAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_STATUS);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- //final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+ final MAPBuilder builder = MAPBuilder.getBuilder();
+ completedAction = BusinessActivityConstants.WSBA_ACTION_COMPLETED;
+ failAction = BusinessActivityConstants.WSBA_ACTION_FAIL;
+ compensatedAction = BusinessActivityConstants.WSBA_ACTION_COMPENSATED;
+ closedAction = BusinessActivityConstants.WSBA_ACTION_CLOSED;
+ cancelledAction = BusinessActivityConstants.WSBA_ACTION_CANCELLED;
+ exitAction = BusinessActivityConstants.WSBA_ACTION_EXIT;
+ cannotCompleteAction = BusinessActivityConstants.WSBA_ACTION_CANNOT_COMPLETE;
+ getStatusAction = BusinessActivityConstants.WSBA_ACTION_GET_STATUS;
+ statusAction = BusinessActivityConstants.WSBA_ACTION_STATUS;
- // Add WS-Addressing
- //AddressingPolicy.register(handlerRegistry) ;
- // Add client policies
- //ClientPolicy.register(handlerRegistry) ;
-
final String coordinatorCompletionParticipantURIString =
ServiceRegistry.getRegistry().getServiceURI(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME, false) ;
final String secureCoordinatorCompletionParticipantURIString =
ServiceRegistry.getRegistry().getServiceURI(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME, true) ;
- try {
- URI coordinatorCompletionParticipantURI = new URI(coordinatorCompletionParticipantURIString) ;
- coordinatorCompletionParticipant = builder.newEndpointReference(coordinatorCompletionParticipantURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- try {
- URI secureCoordinatorCompletionParticipantURI = new URI(secureCoordinatorCompletionParticipantURIString) ;
- secureCoordinatorCompletionParticipant = builder.newEndpointReference(secureCoordinatorCompletionParticipantURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
+ coordinatorCompletionParticipant = builder.newEndpoint(coordinatorCompletionParticipantURIString);
+ secureCoordinatorCompletionParticipant = builder.newEndpoint(secureCoordinatorCompletionParticipantURIString);
}
/**
* Send a completed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCompleted(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, completedAction);
+ port = getPort(endpoint, map, completedAction);
NotificationType completed = new NotificationType();
port.completedOperation(completed);
@@ -166,19 +143,19 @@
/** Address
* Send a fail request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendFail(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier,
+ public void sendFail(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier,
final QName exceptionIdentifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, failAction);
+ port = getPort(endpoint, map, failAction);
ExceptionType fail = new ExceptionType();
fail.setExceptionIdentifier(exceptionIdentifier);
@@ -187,18 +164,18 @@
/**
* Send a compensated request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCompensated(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCompensated(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFaultTo(map, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, compensatedAction);
+ port = getPort(endpoint, map, compensatedAction);
NotificationType compensated = new NotificationType();
port.compensatedOperation(compensated);
@@ -206,18 +183,18 @@
/**
* Send a closed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendClosed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendClosed(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFaultTo(map, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, closedAction);
+ port = getPort(endpoint, map, closedAction);
NotificationType closed = new NotificationType();
port.closedOperation(closed);
@@ -225,18 +202,18 @@
/**
* Send a cancelled request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCancelled(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCancelled(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFaultTo(map, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, cancelledAction);
+ port = getPort(endpoint, map, cancelledAction);
NotificationType camcelled = new NotificationType();
port.canceledOperation(camcelled);
@@ -244,18 +221,18 @@
/**
* Send an exit request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendExit(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendExit(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, exitAction);
+ port = getPort(endpoint, map, exitAction);
NotificationType exited = new NotificationType();
port.exitOperation(exited);
@@ -263,18 +240,18 @@
/**
* Send a cannot complete request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCannotComplete(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCannotComplete(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, cannotCompleteAction);
+ port = getPort(endpoint, map, cannotCompleteAction);
NotificationType cannotComplete = new NotificationType();
port.cannotComplete(cannotComplete);
@@ -282,18 +259,18 @@
/**
* Send a get status request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendGetStatus(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, getStatusAction);
+ port = getPort(endpoint, map, getStatusAction);
NotificationType getStatus = new NotificationType();
port.getStatusOperation(getStatus);
@@ -301,19 +278,19 @@
/**
* Send a status request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier,
+ public void sendStatus(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier,
final QName state)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, statusAction);
+ port = getPort(endpoint, map, statusAction);
StatusType status = new StatusType();
status.setState(state);
@@ -325,14 +302,14 @@
* @param endpoint
* @return either the secure participant endpoint or the non-secure endpoint
*/
- EndpointReference getParticipant(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
+ MAPEndpoint getParticipant(W3CEndpointReference endpoint, MAP map)
{
String address;
if (endpoint != null) {
NativeEndpointReference nativeRef = EndpointHelper.transform(NativeEndpointReference.class, endpoint);
address = nativeRef.getAddress();
} else {
- address = addressingProperties.getTo().getURI().toString();
+ address = map.getTo();
}
if (address.startsWith("https")) {
@@ -355,18 +332,18 @@
* obtain a port from the coordinator endpoint configured with the instance identifier handler and the supplied
* addressing properties supplemented with the given action
* @param participant
- * @param addressingProperties
+ * @param map
* @param action
* @return
*/
private BusinessAgreementWithCoordinatorCompletionCoordinatorPortType
- getPort(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final AttributedURI action)
+ getPort(final W3CEndpointReference participant, final MAP map, final String action)
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
if (participant != null) {
- return WSBAClient.getCoordinatorCompletionCoordinatorPort(participant, action, addressingProperties);
+ return WSBAClient.getCoordinatorCompletionCoordinatorPort(participant, action, map);
} else {
- return WSBAClient.getCoordinatorCompletionCoordinatorPort(action, addressingProperties);
+ return WSBAClient.getCoordinatorCompletionCoordinatorPort(action, map);
}
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,19 +28,16 @@
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionParticipantPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
/**
* The Client side of the Coordinator Participant Coordinator.
@@ -56,108 +53,88 @@
/**
* The complete action.
*/
- private AttributedURI completeAction = null;
+ private String completeAction = null;
/**
* The close action.
*/
- private AttributedURI closeAction = null;
+ private String closeAction = null;
/**
* The cancel action.
*/
- private AttributedURI cancelAction = null;
+ private String cancelAction = null;
/**
* The compensat action.
*/
- private AttributedURI compensateAction = null;
+ private String compensateAction = null;
/**
* The faulted action.
*/
- private AttributedURI failedAction = null;
+ private String failedAction = null;
/**
* The exited action.
*/
- private AttributedURI exitedAction = null;
+ private String exitedAction = null;
/**
* The not completed action.
*/
- private AttributedURI notCompletedAction = null;
+ private String notCompletedAction = null;
/**
* The get status action.
*/
- private AttributedURI getStatusAction = null;
+ private String getStatusAction = null;
/**
* The status action.
*/
- private AttributedURI statusAction = null;
+ private String statusAction = null;
/**
* The coordinator completion coordinator URI for replies.
*/
- private EndpointReference coordinatorCompletionCoordinator = null;
+ private MAPEndpoint coordinatorCompletionCoordinator = null;
/**
* The coordinator completion coordinator URI for secure replies.
*/
- private EndpointReference secureCoordinatorCompletionCoordinator = null;
+ private MAPEndpoint secureCoordinatorCompletionCoordinator = null;
/**
* Construct the participant completion coordinator client.
*/
private CoordinatorCompletionParticipantClient()
{
- final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- completeAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_COMPLETE);
- closeAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_CLOSE);
- cancelAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_CANCEL);
- compensateAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_COMPENSATE);
- failedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_FAILED);
- exitedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_EXITED);
- notCompletedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_NOT_COMPLETED);
- getStatusAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_GET_STATUS);
- statusAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_STATUS);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+ final MAPBuilder builder = MAPBuilder.getBuilder();
+ completeAction = BusinessActivityConstants.WSBA_ACTION_COMPLETE;
+ closeAction = BusinessActivityConstants.WSBA_ACTION_CLOSE;
+ cancelAction = BusinessActivityConstants.WSBA_ACTION_CANCEL;
+ compensateAction = BusinessActivityConstants.WSBA_ACTION_COMPENSATE;
+ failedAction = BusinessActivityConstants.WSBA_ACTION_FAILED;
+ exitedAction = BusinessActivityConstants.WSBA_ACTION_EXITED;
+ notCompletedAction = BusinessActivityConstants.WSBA_ACTION_NOT_COMPLETED;
+ getStatusAction = BusinessActivityConstants.WSBA_ACTION_GET_STATUS;
+ statusAction = BusinessActivityConstants.WSBA_ACTION_STATUS;
- // Add WS-Addressing
- // AddressingPolicy.register(handlerRegistry) ;
- // Add client policies
- // ClientPolicy.register(handlerRegistry) ;
-
final String coordinatorCompletionCoordinatorURIString =
ServiceRegistry.getRegistry().getServiceURI(BusinessActivityConstants.COORDINATOR_COMPLETION_COORDINATOR_SERVICE_NAME, false) ;
final String secureCoordinatorCompletionCoordinatorURIString =
ServiceRegistry.getRegistry().getServiceURI(BusinessActivityConstants.COORDINATOR_COMPLETION_COORDINATOR_SERVICE_NAME, true) ;
- try {
- URI coordinatorCompletionCoordinatorURI = new URI(coordinatorCompletionCoordinatorURIString) ;
- coordinatorCompletionCoordinator = builder.newEndpointReference(coordinatorCompletionCoordinatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- try {
- URI secureCoordinatorCompletionCoordinatorURI = new URI(secureCoordinatorCompletionCoordinatorURIString) ;
- secureCoordinatorCompletionCoordinator = builder.newEndpointReference(secureCoordinatorCompletionCoordinatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
+ coordinatorCompletionCoordinator = builder.newEndpoint(coordinatorCompletionCoordinatorURIString);
+ secureCoordinatorCompletionCoordinator = builder.newEndpoint(secureCoordinatorCompletionCoordinatorURIString);
}
/**
* Send a complete request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendComplete(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendComplete(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, completeAction);
+ port = getPort(endpoint, map, completeAction);
NotificationType complete = new NotificationType();
port.completeOperation(complete);
@@ -165,18 +142,18 @@
/**
* Send a close request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendClose(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendClose(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, closeAction);
+ port = getPort(endpoint, map, closeAction);
NotificationType close = new NotificationType();
port.closeOperation(close);
@@ -184,18 +161,18 @@
/**
* Send a cancel request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCancel(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCancel(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, cancelAction);
+ port = getPort(endpoint, map, cancelAction);
NotificationType cancel = new NotificationType();
port.cancelOperation(cancel);
@@ -203,18 +180,18 @@
/**
* Send a compensate request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCompensate(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCompensate(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, compensateAction);
+ port = getPort(endpoint, map, compensateAction);
NotificationType compensate = new NotificationType();
port.compensateOperation(compensate);
@@ -222,18 +199,18 @@
/**
* Send a failed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendFailed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendFailed(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFaultTo(map, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, failedAction);
+ port = getPort(endpoint, map, failedAction);
NotificationType failed = new NotificationType();
port.failedOperation(failed);
@@ -241,18 +218,18 @@
/**
* Send an exited request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendExited(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendExited(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFaultTo(map, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, exitedAction);
+ port = getPort(endpoint, map, exitedAction);
NotificationType exit = new NotificationType();
port.exitedOperation(exit);
@@ -260,18 +237,18 @@
/**
* Send an exited request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendNotCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendNotCompleted(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFaultTo(map, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, notCompletedAction);
+ port = getPort(endpoint, map, notCompletedAction);
NotificationType notCompleted = new NotificationType();
port.notCompleted(notCompleted);
@@ -279,18 +256,18 @@
/**
* Send a get status request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendGetStatus(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, getStatusAction);
+ port = getPort(endpoint, map, getStatusAction);
NotificationType getStatus = new NotificationType();
port.getStatusOperation(getStatus);
@@ -298,19 +275,19 @@
/**
* Send a status request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier,
+ public void sendStatus(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier,
final QName state)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, statusAction);
+ port = getPort(endpoint, map, statusAction);
StatusType status = new StatusType();
status.setState(state);
@@ -322,14 +299,14 @@
* @param endpoint
* @return either the secure coordinator endpoint or the non-secure endpoint
*/
- EndpointReference getCoordinator(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
+ MAPEndpoint getCoordinator(W3CEndpointReference endpoint, MAP map)
{
String address;
if (endpoint != null) {
NativeEndpointReference nativeRef = EndpointHelper.transform(NativeEndpointReference.class, endpoint);
address = nativeRef.getAddress();
} else {
- address = addressingProperties.getTo().getURI().toString();
+ address = map.getTo();
}
if (address.startsWith("https")) {
@@ -352,18 +329,18 @@
* obtain a port from the participant endpoint configured with the instance identifier handler and the supplied
* addressing properties supplemented with the given action
* @param participant
- * @param addressingProperties
+ * @param map
* @param action
* @return
*/
private BusinessAgreementWithCoordinatorCompletionParticipantPortType
- getPort(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final AttributedURI action)
+ getPort(final W3CEndpointReference participant, final MAP map, final String action)
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
if (participant != null) {
- return WSBAClient.getCoordinatorCompletionParticipantPort(participant, action, addressingProperties);
+ return WSBAClient.getCoordinatorCompletionParticipantPort(participant, action, map);
} else {
- return WSBAClient.getCoordinatorCompletionParticipantPort(action, addressingProperties);
+ return WSBAClient.getCoordinatorCompletionParticipantPort(action, map);
}
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,20 +28,17 @@
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionCoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
/**
* The Client side of the Participant Completion Coordinator.
@@ -57,108 +54,88 @@
/**
* The completed action.
*/
- private AttributedURI completedAction = null;
+ private String completedAction = null;
/**
* The fault action.
*/
- private AttributedURI failAction = null;
+ private String failAction = null;
/**
* The compensated action.
*/
- private AttributedURI compensatedAction = null;
+ private String compensatedAction = null;
/**
* The closed action.
*/
- private AttributedURI closedAction = null;
+ private String closedAction = null;
/**
* The cancelled action.
*/
- private AttributedURI cancelledAction = null;
+ private String cancelledAction = null;
/**
* The exit action.
*/
- private AttributedURI exitAction = null;
+ private String exitAction = null;
/**
* The cannot complete action.
*/
- private AttributedURI cannotCompleteAction = null;
+ private String cannotCompleteAction = null;
/**
* The get status action.
*/
- private AttributedURI getStatusAction = null;
+ private String getStatusAction = null;
/**
* The status action.
*/
- private AttributedURI statusAction = null;
+ private String statusAction = null;
/**
* The participant completion participant URI for replies.
*/
- private EndpointReference participantCompletionParticipant = null;
+ private MAPEndpoint participantCompletionParticipant = null;
/**
* The participant completion participant URI for secure replies.
*/
- private EndpointReference secureParticipantCompletionParticipant = null;
+ private MAPEndpoint secureParticipantCompletionParticipant = null;
/**
* Construct the participant completion coordinator client.
*/
private ParticipantCompletionCoordinatorClient()
{
- final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- completedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_COMPLETED);
- failAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_FAIL);
- compensatedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_COMPENSATED);
- closedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_CLOSED);
- cancelledAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_CANCELLED);
- exitAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_EXIT);
- cannotCompleteAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_CANNOT_COMPLETE);
- getStatusAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_GET_STATUS);
- statusAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_STATUS);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+ final MAPBuilder builder = MAPBuilder.getBuilder();
+ completedAction = BusinessActivityConstants.WSBA_ACTION_COMPLETED;
+ failAction = BusinessActivityConstants.WSBA_ACTION_FAIL;
+ compensatedAction = BusinessActivityConstants.WSBA_ACTION_COMPENSATED;
+ closedAction = BusinessActivityConstants.WSBA_ACTION_CLOSED;
+ cancelledAction = BusinessActivityConstants.WSBA_ACTION_CANCELLED;
+ exitAction = BusinessActivityConstants.WSBA_ACTION_EXIT;
+ cannotCompleteAction = BusinessActivityConstants.WSBA_ACTION_CANNOT_COMPLETE;
+ getStatusAction = BusinessActivityConstants.WSBA_ACTION_GET_STATUS;
+ statusAction = BusinessActivityConstants.WSBA_ACTION_STATUS;
- // Add WS-Addressing
- // AddressingPolicy.register(handlerRegistry) ;
- // Add client policies
- // ClientPolicy.register(handlerRegistry) ;
-
final String participantCompletionParticipantURIString =
ServiceRegistry.getRegistry().getServiceURI(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME, false) ;
final String secureParticipantCompletionParticipantURIString =
ServiceRegistry.getRegistry().getServiceURI(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME, true) ;
- try {
- URI participantCompletionParticipantURI = new URI(participantCompletionParticipantURIString) ;
- participantCompletionParticipant = builder.newEndpointReference(participantCompletionParticipantURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- try {
- URI secureParticipantCompletionParticipantURI = new URI(secureParticipantCompletionParticipantURIString) ;
- secureParticipantCompletionParticipant = builder.newEndpointReference(secureParticipantCompletionParticipantURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
+ participantCompletionParticipant = builder.newEndpoint(participantCompletionParticipantURIString);
+ secureParticipantCompletionParticipant = builder.newEndpoint(secureParticipantCompletionParticipantURIString);
}
/**
* Send a completed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCompleted(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, completedAction);
+ port = getPort(endpoint, map, completedAction);
NotificationType completed = new NotificationType();
port.completedOperation(completed);
@@ -166,19 +143,19 @@
/**
* Send a fault request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendFail(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier,
+ public void sendFail(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier,
final QName exceptionIdentifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, failAction);
+ port = getPort(endpoint, map, failAction);
ExceptionType fail = new ExceptionType();
fail.setExceptionIdentifier(exceptionIdentifier);
@@ -187,18 +164,18 @@
/**
* Send a compensated request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCompensated(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCompensated(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFaultTo(map, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, compensatedAction);
+ port = getPort(endpoint, map, compensatedAction);
NotificationType compensated = new NotificationType();
port.compensatedOperation(compensated);
@@ -206,18 +183,18 @@
/**
* Send a closed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendClosed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendClosed(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFaultTo(map, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, closedAction);
+ port = getPort(endpoint, map, closedAction);
NotificationType closed = new NotificationType();
port.closedOperation(closed);
@@ -225,18 +202,18 @@
/**
* Send a cancelled request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCancelled(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCancelled(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFaultTo(map, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, cancelledAction);
+ port = getPort(endpoint, map, cancelledAction);
NotificationType cancelled = new NotificationType();
port.canceledOperation(cancelled);
@@ -244,18 +221,18 @@
/**
* Send an exit request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendExit(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendExit(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, exitAction);
+ port = getPort(endpoint, map, exitAction);
NotificationType exit = new NotificationType();
port.exitOperation(exit);
@@ -263,18 +240,18 @@
/**
* Send a cannot complete request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCannotComplete(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCannotComplete(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, cannotCompleteAction);
+ port = getPort(endpoint, map, cannotCompleteAction);
NotificationType cannotComplete = new NotificationType();
port.cannotComplete(cannotComplete);
@@ -282,18 +259,18 @@
/**
* Send a get status request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendGetStatus(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, getStatusAction);
+ port = getPort(endpoint, map, getStatusAction);
NotificationType getStatus = new NotificationType();
port.getStatusOperation(getStatus);
@@ -301,19 +278,19 @@
/**
* Send a status request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier,
+ public void sendStatus(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier,
final QName state)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
+ MAPEndpoint participant = getParticipant(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
- port = getPort(endpoint, addressingProperties, statusAction);
+ port = getPort(endpoint, map, statusAction);
StatusType status = new StatusType();
status.setState(state);
@@ -325,14 +302,14 @@
* @param endpoint
* @return either the secure participant endpoint or the non-secure endpoint
*/
- EndpointReference getParticipant(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
+ MAPEndpoint getParticipant(W3CEndpointReference endpoint, MAP map)
{
String address;
if (endpoint != null) {
NativeEndpointReference nativeRef = EndpointHelper.transform(NativeEndpointReference.class, endpoint);
address = nativeRef.getAddress();
} else {
- address = addressingProperties.getTo().getURI().toString();
+ address = map.getTo();
}
if (address.startsWith("https")) {
@@ -355,18 +332,18 @@
* obtain a port from the coordinator endpoint configured with the instance identifier handler and the supplied
* addressing properties supplemented with the given action
* @param participant
- * @param addressingProperties
+ * @param map
* @param action
* @return
*/
private BusinessAgreementWithParticipantCompletionCoordinatorPortType
- getPort(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final AttributedURI action)
+ getPort(final W3CEndpointReference participant, final MAP map, final String action)
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
if (participant != null) {
- return WSBAClient.getParticipantCompletionCoordinatorPort(participant, action, addressingProperties);
+ return WSBAClient.getParticipantCompletionCoordinatorPort(participant, action, map);
} else {
- return WSBAClient.getParticipantCompletionCoordinatorPort(action, addressingProperties);
+ return WSBAClient.getParticipantCompletionCoordinatorPort(action, map);
}
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,19 +28,16 @@
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionParticipantPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URI;
/**
* The Client side of the Participant Participant Coordinator.
@@ -56,103 +53,83 @@
/**
* The close action.
*/
- private AttributedURI closeAction = null;
+ private String closeAction = null;
/**
* The cancel action.
*/
- private AttributedURI cancelAction = null;
+ private String cancelAction = null;
/**
* The compensat action.
*/
- private AttributedURI compensateAction = null;
+ private String compensateAction = null;
/**
* The failed action.
*/
- private AttributedURI failedAction = null;
+ private String failedAction = null;
/**
* The exited action.
*/
- private AttributedURI exitedAction = null;
+ private String exitedAction = null;
/**
* The not completed action.
*/
- private AttributedURI notCompletedAction = null;
+ private String notCompletedAction = null;
/**
* The get status action.
*/
- private AttributedURI getStatusAction = null;
+ private String getStatusAction = null;
/**
* The status action.
*/
- private AttributedURI statusAction = null;
+ private String statusAction = null;
/**
* The participant completion coordinator URI for replies.
*/
- private EndpointReference participantCompletionCoordinator = null;
+ private MAPEndpoint participantCompletionCoordinator = null;
/**
* The participant completion coordinator URI for secure replies.
*/
- private EndpointReference secureParticipantCompletionCoordinator = null;
+ private MAPEndpoint secureParticipantCompletionCoordinator = null;
/**
* Construct the participant completion participant client.
*/
private ParticipantCompletionParticipantClient()
{
- final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- closeAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_CLOSE);
- cancelAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_CANCEL);
- compensateAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_COMPENSATE);
- failedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_FAILED);
- exitedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_EXITED);
- notCompletedAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_NOT_COMPLETED);
- getStatusAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_GET_STATUS);
- statusAction = builder.newURI(BusinessActivityConstants.WSBA_ACTION_STATUS);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- // final HandlerRegistry handlerRegistry = new HandlerRegistry() ;
+ final MAPBuilder builder = MAPBuilder.getBuilder();
+ closeAction = BusinessActivityConstants.WSBA_ACTION_CLOSE;
+ cancelAction = BusinessActivityConstants.WSBA_ACTION_CANCEL;
+ compensateAction = BusinessActivityConstants.WSBA_ACTION_COMPENSATE;
+ failedAction = BusinessActivityConstants.WSBA_ACTION_FAILED;
+ exitedAction = BusinessActivityConstants.WSBA_ACTION_EXITED;
+ notCompletedAction = BusinessActivityConstants.WSBA_ACTION_NOT_COMPLETED;
+ getStatusAction = BusinessActivityConstants.WSBA_ACTION_GET_STATUS;
+ statusAction = BusinessActivityConstants.WSBA_ACTION_STATUS;
- // Add WS-Addressing
- // AddressingPolicy.register(handlerRegistry) ;
- // Add client policies
- // ClientPolicy.register(handlerRegistry) ;
-
final String participantCompletionCoordinatorURIString =
ServiceRegistry.getRegistry().getServiceURI(BusinessActivityConstants.PARTICIPANT_COMPLETION_COORDINATOR_SERVICE_NAME, false) ;
final String secureParticipantCompletionCoordinatorURIString =
ServiceRegistry.getRegistry().getServiceURI(BusinessActivityConstants.PARTICIPANT_COMPLETION_COORDINATOR_SERVICE_NAME, true) ;
- try {
- URI secureParticipantCompletionCoordinatorURI = new URI(secureParticipantCompletionCoordinatorURIString) ;
- secureParticipantCompletionCoordinator = builder.newEndpointReference(secureParticipantCompletionCoordinatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
- try {
- URI participantCompletionCoordinatorURI = new URI(participantCompletionCoordinatorURIString) ;
- participantCompletionCoordinator = builder.newEndpointReference(participantCompletionCoordinatorURI);
- } catch (URISyntaxException use) {
- // TODO - log fault and throw exception
- }
+ secureParticipantCompletionCoordinator = builder.newEndpoint(secureParticipantCompletionCoordinatorURIString);
+ participantCompletionCoordinator = builder.newEndpoint(participantCompletionCoordinatorURIString);
}
/**
* Send a close request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendClose(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendClose(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, closeAction);
+ port = getPort(endpoint, map, closeAction);
NotificationType close = new NotificationType();
port.closeOperation(close);
@@ -160,18 +137,18 @@
/**
* Send a cancel request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCancel(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCancel(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, cancelAction);
+ port = getPort(endpoint, map, cancelAction);
NotificationType cancel = new NotificationType();
port.cancelOperation(cancel);
@@ -179,18 +156,18 @@
/**
* Send a compensate request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendCompensate(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendCompensate(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, compensateAction);
+ port = getPort(endpoint, map, compensateAction);
NotificationType compensate = new NotificationType();
port.compensateOperation(compensate);
@@ -198,18 +175,18 @@
/**
* Send a failed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendFailed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendFailed(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFaultTo(map, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, failedAction);
+ port = getPort(endpoint, map, failedAction);
NotificationType failed = new NotificationType();
port.failedOperation(failed);
@@ -217,18 +194,18 @@
/**
* Send an exited request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendExited(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendExited(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFaultTo(map, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, exitedAction);
+ port = getPort(endpoint, map, exitedAction);
NotificationType exited = new NotificationType();
port.exitedOperation(exited);
@@ -236,18 +213,18 @@
/**
* Send a not completed request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendNotCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendNotCompleted(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFaultTo(map, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, notCompletedAction);
+ port = getPort(endpoint, map, notCompletedAction);
NotificationType notCompleted = new NotificationType();
port.notCompleted(notCompleted);
@@ -255,18 +232,18 @@
/**
* Send a get status request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
+ public void sendGetStatus(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, getStatusAction);
+ port = getPort(endpoint, map, getStatusAction);
NotificationType getStatus = new NotificationType();
port.getStatusOperation(getStatus);
@@ -274,19 +251,19 @@
/**
* Send a status request.
- * @param addressingProperties addressing context initialised with to and message ID.
+ * @param map addressing context initialised with to and message ID.
* @param identifier The identifier of the initiator.
* @throws com.arjuna.webservices.SoapFault For any errors.
* @throws java.io.IOException for any transport errors.
*/
- public void sendStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier,
+ public void sendStatus(W3CEndpointReference endpoint, final MAP map, final InstanceIdentifier identifier,
final QName state)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
- AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
+ MAPEndpoint coordinator = getCoordinator(endpoint, map);
+ AddressingHelper.installFromFaultTo(map, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
- port = getPort(endpoint, addressingProperties, statusAction);
+ port = getPort(endpoint, map, statusAction);
StatusType status = new StatusType();
status.setState(state);
@@ -298,14 +275,14 @@
* @param endpoint
* @return either the secure coordinator endpoint or the non-secure endpoint
*/
- EndpointReference getCoordinator(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
+ MAPEndpoint getCoordinator(W3CEndpointReference endpoint, MAP map)
{
String address;
if (endpoint != null) {
NativeEndpointReference nativeRef = EndpointHelper.transform(NativeEndpointReference.class, endpoint);
address = nativeRef.getAddress();
} else {
- address = addressingProperties.getTo().getURI().toString();
+ address = map.getTo();
}
if (address.startsWith("https")) {
@@ -328,18 +305,18 @@
* obtain a port from the participant endpoint configured with the instance identifier handler and the supplied
* addressing properties supplemented with the given action
* @param participant
- * @param addressingProperties
+ * @param map
* @param action
* @return
*/
private BusinessAgreementWithParticipantCompletionParticipantPortType
- getPort(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final AttributedURI action)
+ getPort(final W3CEndpointReference participant, final MAP map, final String action)
{
- AddressingHelper.installNoneReplyTo(addressingProperties);
+ AddressingHelper.installNoneReplyTo(map);
if (participant != null) {
- return WSBAClient.getParticipantCompletionParticipantPort(participant, action, addressingProperties);
+ return WSBAClient.getParticipantCompletionParticipantPort(participant, action, map);
} else {
- return WSBAClient.getParticipantCompletionParticipantPort(action, addressingProperties);
+ return WSBAClient.getParticipantCompletionParticipantPort(action, map);
}
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,16 +1,14 @@
package com.arjuna.webservices11.wsba.client;
-import com.arjuna.webservices11.wsarj.handler.InstanceIdentifierHandler;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.*;
-import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import javax.xml.ws.BindingProvider;
-import javax.xml.ws.addressing.*;
-import javax.xml.ws.handler.Handler;
import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.handler.Handler;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -48,7 +46,7 @@
/**
* builder used to construct addressing info for calls
*/
- private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ private static MAPBuilder builder = MAPBuilder.getBuilder();
/**
* fetch a participant completion coordinator service unique to the current thread
@@ -101,61 +99,53 @@
// get ports where we HAVE an endpoint to create the port from
public static BusinessAgreementWithParticipantCompletionCoordinatorPortType getParticipantCompletionCoordinatorPort(W3CEndpointReference endpointReference,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
BusinessAgreementWithParticipantCompletionCoordinatorService service = getParticipantCompletionCoordinatorService();
- // BusinessAgreementWithParticipantCompletionCoordinatorPortType port = service.getPort(endpointReference, BusinessAgreementWithParticipantCompletionCoordinatorPortType.class, new AddressingFeature(true, true));
- BusinessAgreementWithParticipantCompletionCoordinatorPortType port = service.getPort(endpointReference, BusinessAgreementWithParticipantCompletionCoordinatorPortType.class);
+ BusinessAgreementWithParticipantCompletionCoordinatorPortType port = service.getPort(endpointReference, BusinessAgreementWithParticipantCompletionCoordinatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configureEndpointPort(bindingProvider, action, addressingProperties);
+ configureEndpointPort(bindingProvider, action, map);
return port;
}
public static BusinessAgreementWithParticipantCompletionParticipantPortType getParticipantCompletionParticipantPort(W3CEndpointReference endpointReference,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
BusinessAgreementWithParticipantCompletionParticipantService service = getParticipantCompletionParticipantService();
- // BusinessAgreementWithParticipantCompletionParticipantPortType port = service.getPort(endpointReference, BusinessAgreementWithParticipantCompletionParticipantPortType.class, new AddressingFeature(true, true));
- BusinessAgreementWithParticipantCompletionParticipantPortType port = service.getPort(endpointReference, BusinessAgreementWithParticipantCompletionParticipantPortType.class);
+ BusinessAgreementWithParticipantCompletionParticipantPortType port = service.getPort(endpointReference, BusinessAgreementWithParticipantCompletionParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configureEndpointPort(bindingProvider, action, addressingProperties);
+ configureEndpointPort(bindingProvider, action, map);
return port;
}
public static BusinessAgreementWithCoordinatorCompletionCoordinatorPortType getCoordinatorCompletionCoordinatorPort(W3CEndpointReference endpointReference,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
BusinessAgreementWithCoordinatorCompletionCoordinatorService service = getCoordinatorCompletionCoordinatorService();
- // BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port = service.getPort(endpointReference, BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.class, new AddressingFeature(true, true));
- BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port = service.getPort(endpointReference, BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.class);
+ BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port = service.getPort(endpointReference, BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configureEndpointPort(bindingProvider, action, addressingProperties);
+ configureEndpointPort(bindingProvider, action, map);
return port;
}
public static BusinessAgreementWithCoordinatorCompletionParticipantPortType getCoordinatorCompletionParticipantPort(W3CEndpointReference endpointReference,
- AttributedURI action,
- AddressingProperties addressingProperties)
+ String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
BusinessAgreementWithCoordinatorCompletionParticipantService service = getCoordinatorCompletionParticipantService();
- // BusinessAgreementWithCoordinatorCompletionParticipantPortType port = service.getPort(endpointReference, BusinessAgreementWithCoordinatorCompletionParticipantPortType.class, new AddressingFeature(true, true));
- BusinessAgreementWithCoordinatorCompletionParticipantPortType port = service.getPort(endpointReference, BusinessAgreementWithCoordinatorCompletionParticipantPortType.class);
+ BusinessAgreementWithCoordinatorCompletionParticipantPortType port = service.getPort(endpointReference, BusinessAgreementWithCoordinatorCompletionParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configureEndpointPort(bindingProvider, action, addressingProperties);
+ configureEndpointPort(bindingProvider, action, map);
return port;
}
@@ -163,102 +153,80 @@
// get ports where we have NO endpoint to create the port from
public static BusinessAgreementWithParticipantCompletionCoordinatorPortType
- getParticipantCompletionCoordinatorPort(AttributedURI action,
- AddressingProperties addressingProperties)
+ getParticipantCompletionCoordinatorPort(String action,
+ MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
BusinessAgreementWithParticipantCompletionCoordinatorService service = getParticipantCompletionCoordinatorService();
- // BusinessAgreementWithParticipantCompletionCoordinatorPortType port = service.getPort(BusinessAgreementWithParticipantCompletionParticipantPortType.class, new AddressingFeature(true, true));
- BusinessAgreementWithParticipantCompletionCoordinatorPortType port = service.getPort(BusinessAgreementWithParticipantCompletionCoordinatorPortType.class);
+ BusinessAgreementWithParticipantCompletionCoordinatorPortType port = service.getPort(BusinessAgreementWithParticipantCompletionCoordinatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configurePort(bindingProvider, action, addressingProperties);
+ configurePort(bindingProvider, action, map);
return port;
}
public static BusinessAgreementWithParticipantCompletionParticipantPortType
- getParticipantCompletionParticipantPort(AttributedURI action, AddressingProperties addressingProperties)
+ getParticipantCompletionParticipantPort(String action, MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
BusinessAgreementWithParticipantCompletionParticipantService service = getParticipantCompletionParticipantService();
- // BusinessAgreementWithParticipantCompletionParticipantPortType port = service.getPort(BusinessAgreementWithParticipantCompletionParticipantPortType.class, new AddressingFeature(true, true));
- BusinessAgreementWithParticipantCompletionParticipantPortType port = service.getPort(BusinessAgreementWithParticipantCompletionParticipantPortType.class);
+ BusinessAgreementWithParticipantCompletionParticipantPortType port = service.getPort(BusinessAgreementWithParticipantCompletionParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configurePort(bindingProvider, action, addressingProperties);
+ configurePort(bindingProvider, action, map);
return port;
}
public static BusinessAgreementWithCoordinatorCompletionParticipantPortType
- getCoordinatorCompletionParticipantPort(AttributedURI action, AddressingProperties addressingProperties)
+ getCoordinatorCompletionParticipantPort(String action, MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
BusinessAgreementWithCoordinatorCompletionParticipantService service = getCoordinatorCompletionParticipantService();
- // BusinessAgreementWithCoordinatorCompletionParticipantPortType port = service.getPort(BusinessAgreementWithCoordinatorCompletionParticipantPortType.class, new AddressingFeature(true, true));
- BusinessAgreementWithCoordinatorCompletionParticipantPortType port = service.getPort(BusinessAgreementWithCoordinatorCompletionParticipantPortType.class);
+ BusinessAgreementWithCoordinatorCompletionParticipantPortType port = service.getPort(BusinessAgreementWithCoordinatorCompletionParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configurePort(bindingProvider, action, addressingProperties);
+ configurePort(bindingProvider, action, map);
return port;
}
public static BusinessAgreementWithCoordinatorCompletionCoordinatorPortType
- getCoordinatorCompletionCoordinatorPort(AttributedURI action, AddressingProperties addressingProperties)
+ getCoordinatorCompletionCoordinatorPort(String action, MAP map)
{
- // TODO - we need the 2.1 verison of Service so we can specify that we want to use the WS Addressing feature
BusinessAgreementWithCoordinatorCompletionCoordinatorService service = getCoordinatorCompletionCoordinatorService();
- // BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port = service.getPort(BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.class, new AddressingFeature(true, true));
- BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port = service.getPort(BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.class);
+ BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port = service.getPort(BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- configurePort(bindingProvider, action, addressingProperties);
+ configurePort(bindingProvider, action, map);
return port;
}
- private static void configureEndpointPort(BindingProvider bindingProvider, AttributedURI action, AddressingProperties addressingProperties)
+ private static void configureEndpointPort(BindingProvider bindingProvider, String action, MAP map)
{
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannoy specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
List<Handler> customHandlerChain = new ArrayList<Handler>();
customHandlerChain.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
- // ok, JBossWS native has hacked this by pulling the address and reference parameters out of the endpoint
- // and storing them in an AddressingProperties instance hung off the context under CLIENT_ADDRESSING_PROPERTIES_OUTBOUND.
- // we still need to set the action and message id and possibly from/faultTo/replyTo/relatesTo -- this is all
- // distinctly non-portable :-/
- // n.b. Metro installs the address in requestContext under ENDPOINT_ADDRESS_PROPERTY. it also seems to ensure
- // that the reference parameters get installed -- but how?
-
- // the address will have been pulled out of the endpoint by getPort but we still have to set it in the
- // addressing properties along with the action and message id
+ */
Map<String, Object> requestContext = bindingProvider.getRequestContext();
- AddressingProperties requestProperties = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
- addressingProperties.setAction(action);
- AddressingHelper.installCallerProperties(addressingProperties, requestProperties);
- // we should not need to do this but JBossWS does not pick up the value in the addressing properties
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, requestProperties.getTo().getURI().toString());
+ MAP requestMap = AddressingHelper.outboundMap(requestContext);
+ map.setAction(action);
+ AddressingHelper.installCallerProperties(map, requestMap);
+ AddressingHelper.configureRequestContext(requestContext, requestMap.getTo(), action);
}
- private static void configurePort(BindingProvider bindingProvider, AttributedURI action, AddressingProperties addressingProperties)
+ private static void configurePort(BindingProvider bindingProvider, String action, MAP map)
{
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannoy specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
List<Handler> customHandlerChain = new ArrayList<Handler>();
customHandlerChain.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+ */
Map<String, Object> requestContext = bindingProvider.getRequestContext();
- addressingProperties.setAction(action);
- requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
- // JaxWS shoudl do this for us
- requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
- // we should not need to do this but JBossWS does not pick up the value in the addressing properties
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, addressingProperties.getTo().getURI().toString());
+ map.setAction(action);
+ AddressingHelper.configureRequestContext(requestContext, map, map.getTo(), action);
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,13 +23,11 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.CoordinatorCompletionCoordinatorInboundEvents;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
/**
* The Coordinator Completion Coordinator processor.
* @author kevin
@@ -84,83 +82,83 @@
/**
* Cancelled.
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void cancelled(final NotificationType cancelled, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void cancelled(final NotificationType cancelled, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Closed.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void closed(final NotificationType closed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void closed(final NotificationType closed, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Compensated.
* @param compensated The compensated notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void compensated(final NotificationType compensated, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void compensated(final NotificationType compensated, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Fail.
* @param fail The fail exception.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void fail(final ExceptionType fail, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void fail(final ExceptionType fail, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Completed.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void completed(final NotificationType completed, final AddressingProperties addressingProperties,
+ public abstract void completed(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Exit.
* @param exit The exit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void exit(final NotificationType exit, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void exit(final NotificationType exit, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Cannot complete.
* @param cannotComplete The cannot complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void cannotComplete(final NotificationType cannotComplete, final AddressingProperties addressingProperties,
+ public abstract void cannotComplete(final NotificationType cannotComplete, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Get Status.
* @param getStatus The get status notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Status.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext) ;
/**
* SOAP fault.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public abstract void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext) ;
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionParticipantProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/CoordinatorCompletionParticipantProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,12 +23,10 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.CoordinatorCompletionParticipantInboundEvents;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
/**
* The Coordinator Completion Participant processor.
* @author kevin
@@ -83,81 +81,81 @@
/**
* Cancel.
* @param cancel The cancel notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void cancel(final NotificationType cancel, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void cancel(final NotificationType cancel, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Close.
* @param close The close notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void close(final NotificationType close, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void close(final NotificationType close, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Compensate.
* @param compensate The compensate notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void compensate(final NotificationType compensate, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void compensate(final NotificationType compensate, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Complete.
* @param complete The complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void complete(final NotificationType complete, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void complete(final NotificationType complete, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Exited.
* @param exited The exited notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void exited(final NotificationType exited, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void exited(final NotificationType exited, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Not Completed.
* @param notCompleted The not completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void notCompleted(final NotificationType notCompleted, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void notCompleted(final NotificationType notCompleted, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Failed.
* @param failed The failed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void failed(final NotificationType failed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void failed(final NotificationType failed, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Get Status.
* @param getStatus The get status notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Status.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext) ;
/**
* SOAP fault.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public abstract void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext) ;
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,13 +23,11 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.ParticipantCompletionCoordinatorInboundEvents;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
/**
* The Participant Completion Coordinator processor.
* @author kevin
@@ -84,83 +82,83 @@
/**
* Cancelled.
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void cancelled(final NotificationType cancelled, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void cancelled(final NotificationType cancelled, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Closed.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void closed(final NotificationType closed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void closed(final NotificationType closed, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Compensated.
* @param compensated The compensated notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void compensated(final NotificationType compensated, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void compensated(final NotificationType compensated, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Completed.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void completed(final NotificationType completed, final AddressingProperties addressingProperties,
+ public abstract void completed(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Completed.
* @param cannotComplete The cannot complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void cannotComplete(final NotificationType cannotComplete, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext);
+ public abstract void cannotComplete(final NotificationType cannotComplete, final MAP map, final ArjunaContext arjunaContext);
/**
* Exit.
* @param exit The exit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void exit(final NotificationType exit, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void exit(final NotificationType exit, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Fault.
* @param fail The fault exception.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void fail(final ExceptionType fail, final AddressingProperties addressingProperties,
+ public abstract void fail(final ExceptionType fail, final MAP map,
final ArjunaContext arjunaContext) ;
/**
* Get Status.
* @param getStatus The get status notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Status.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext) ;
/**
* SOAP fault.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public abstract void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext) ;
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionParticipantProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/processors/ParticipantCompletionParticipantProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,11 +23,10 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.ParticipantCompletionParticipantInboundEvents;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The Participant Completion Participant processor.
* @author kevin
@@ -82,73 +81,73 @@
/**
* Cancel.
* @param cancel The cancel notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void cancel(final NotificationType cancel, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void cancel(final NotificationType cancel, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Close.
* @param close The close notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void close(final NotificationType close, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void close(final NotificationType close, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Compensate.
* @param compensate The compensate notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void compensate(final NotificationType compensate, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void compensate(final NotificationType compensate, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Exited.
* @param exited The exited notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void exited(final NotificationType exited, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void exited(final NotificationType exited, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Not Completed.
* @param notCompleted The not completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void notCompleted(final NotificationType notCompleted, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void notCompleted(final NotificationType notCompleted, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Faulted.
* @param failed The failed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void failed(final NotificationType failed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void failed(final NotificationType failed, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Get Status.
* @param getStatus The get status notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext) ;
/**
* Status.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext) ;
+ public abstract void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext) ;
/**
* SOAP fault.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public abstract void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext) ;
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,6 +6,8 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionCoordinatorProcessor;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices.SoapFault;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionCoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
@@ -18,8 +20,6 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.soap.Addressing;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
import javax.xml.ws.handler.MessageContext;
@@ -35,7 +35,7 @@
portName = "BusinessAgreementWithCoordinatorCompletionCoordinatorPortType"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl implements BusinessAgreementWithCoordinatorCompletionCoordinatorPortType
{
@@ -54,13 +54,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType completed = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionCoordinatorProcessor.getProcessor().completed(completed, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionCoordinatorProcessor.getProcessor().completed(completed, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -77,13 +76,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final ExceptionType fail = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionCoordinatorProcessor.getProcessor().fail(fail, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionCoordinatorProcessor.getProcessor().fail(fail, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -100,13 +98,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType compensated = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionCoordinatorProcessor.getProcessor().compensated(compensated, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionCoordinatorProcessor.getProcessor().compensated(compensated, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -123,13 +120,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType closed = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionCoordinatorProcessor.getProcessor().closed(closed, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionCoordinatorProcessor.getProcessor().closed(closed, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -146,13 +142,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType canceled = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionCoordinatorProcessor.getProcessor().cancelled(canceled, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionCoordinatorProcessor.getProcessor().cancelled(canceled, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -169,13 +164,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType exit = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionCoordinatorProcessor.getProcessor().exit(exit, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionCoordinatorProcessor.getProcessor().exit(exit, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -192,13 +186,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType cannotComplete = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionCoordinatorProcessor.getProcessor().cannotComplete(cannotComplete, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionCoordinatorProcessor.getProcessor().cannotComplete(cannotComplete, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -215,13 +208,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType getStatus = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionCoordinatorProcessor.getProcessor().getStatus(getStatus, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionCoordinatorProcessor.getProcessor().getStatus(getStatus, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -238,13 +230,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final StatusType status = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionCoordinatorProcessor.getProcessor().status(status, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionCoordinatorProcessor.getProcessor().status(status, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -256,13 +247,13 @@
Fault fault)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- final AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
final SoapFault soapFault = SoapFault11.fromFault(fault);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionCoordinatorProcessor.getProcessor().soapFault(soapFault, inboundAddressProperties, arjunaContext); ;
+ CoordinatorCompletionCoordinatorProcessor.getProcessor().soapFault(soapFault, inboundMap, arjunaContext); ;
}
}) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,6 +6,8 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionParticipantProcessor;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices.SoapFault;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionParticipantPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
@@ -16,8 +18,6 @@
import javax.jws.*;
import javax.jws.soap.SOAPBinding;
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.xml.ws.soap.Addressing;
@@ -34,7 +34,7 @@
portName = "BusinessAgreementWithCoordinatorCompletionParticipantPortType"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl implements BusinessAgreementWithCoordinatorCompletionParticipantPortType
{
@@ -53,13 +53,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType complete = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionParticipantProcessor.getProcessor().complete(complete, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionParticipantProcessor.getProcessor().complete(complete, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -76,13 +75,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType close = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionParticipantProcessor.getProcessor().close(close, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionParticipantProcessor.getProcessor().close(close, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -99,13 +97,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType cancel = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionParticipantProcessor.getProcessor().cancel(cancel, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionParticipantProcessor.getProcessor().cancel(cancel, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -122,13 +119,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType compensate = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionParticipantProcessor.getProcessor().compensate(compensate, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionParticipantProcessor.getProcessor().compensate(compensate, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -145,13 +141,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType failed = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionParticipantProcessor.getProcessor().failed(failed, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionParticipantProcessor.getProcessor().failed(failed, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -168,13 +163,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType exited = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionParticipantProcessor.getProcessor().exited(exited, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionParticipantProcessor.getProcessor().exited(exited, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -191,13 +185,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType notCompleted = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionParticipantProcessor.getProcessor().notCompleted(notCompleted, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionParticipantProcessor.getProcessor().notCompleted(notCompleted, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -214,13 +207,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType getStatus = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionParticipantProcessor.getProcessor().getStatus(getStatus, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionParticipantProcessor.getProcessor().getStatus(getStatus, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -237,13 +229,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final StatusType status = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionParticipantProcessor.getProcessor().status(status, inboundAddressProperties, arjunaContext) ;
+ CoordinatorCompletionParticipantProcessor.getProcessor().status(status, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -255,13 +246,13 @@
Fault fault)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- final AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
final SoapFault soapFault = SoapFault11.fromFault(fault);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- CoordinatorCompletionParticipantProcessor.getProcessor().soapFault(soapFault, inboundAddressProperties, arjunaContext); ;
+ CoordinatorCompletionParticipantProcessor.getProcessor().soapFault(soapFault, inboundMap, arjunaContext); ;
}
}) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,6 +6,8 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.processors.ParticipantCompletionCoordinatorProcessor;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices.SoapFault;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionCoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
@@ -17,8 +19,6 @@
import javax.jws.*;
import javax.jws.soap.SOAPBinding;
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.xml.ws.soap.Addressing;
@@ -34,7 +34,7 @@
portName = "BusinessAgreementWithParticipantCompletionCoordinatorPortType"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl implements BusinessAgreementWithParticipantCompletionCoordinatorPortType
{
@@ -53,13 +53,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType completed = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionCoordinatorProcessor.getProcessor().completed(completed, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionCoordinatorProcessor.getProcessor().completed(completed, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -76,13 +75,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final ExceptionType fail = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionCoordinatorProcessor.getProcessor().fail(fail, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionCoordinatorProcessor.getProcessor().fail(fail, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -99,13 +97,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType compensated = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionCoordinatorProcessor.getProcessor().compensated(compensated, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionCoordinatorProcessor.getProcessor().compensated(compensated, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -122,13 +119,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType closed = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionCoordinatorProcessor.getProcessor().closed(closed, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionCoordinatorProcessor.getProcessor().closed(closed, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -145,13 +141,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType cancelled = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionCoordinatorProcessor.getProcessor().cancelled(cancelled, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionCoordinatorProcessor.getProcessor().cancelled(cancelled, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -168,13 +163,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType exit = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionCoordinatorProcessor.getProcessor().exit(exit, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionCoordinatorProcessor.getProcessor().exit(exit, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -191,13 +185,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType cannotComplete = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionCoordinatorProcessor.getProcessor().cannotComplete(cannotComplete, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionCoordinatorProcessor.getProcessor().cannotComplete(cannotComplete, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -214,13 +207,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType getStatus = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionCoordinatorProcessor.getProcessor().getStatus(getStatus, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionCoordinatorProcessor.getProcessor().getStatus(getStatus, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -237,13 +229,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final StatusType status = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionCoordinatorProcessor.getProcessor().status(status, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionCoordinatorProcessor.getProcessor().status(status, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -255,13 +246,13 @@
Fault fault)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- final AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
final SoapFault soapFault = SoapFault11.fromFault(fault);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionCoordinatorProcessor.getProcessor().soapFault(soapFault, inboundAddressProperties, arjunaContext); ;
+ ParticipantCompletionCoordinatorProcessor.getProcessor().soapFault(soapFault, inboundMap, arjunaContext); ;
}
}) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,6 +6,8 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.processors.ParticipantCompletionParticipantProcessor;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices.SoapFault;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionParticipantPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
@@ -16,8 +18,6 @@
import javax.jws.*;
import javax.jws.soap.SOAPBinding;
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.xml.ws.soap.Addressing;
@@ -34,7 +34,7 @@
portName = "BusinessAgreementWithParticipantCompletionParticipantPortType"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="handlers.xml")
+ at HandlerChain(file="/handlers.xml")
@Addressing(required=true)
public class BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl implements BusinessAgreementWithParticipantCompletionParticipantPortType
{
@@ -53,13 +53,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType close = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionParticipantProcessor.getProcessor().close(close, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionParticipantProcessor.getProcessor().close(close, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -75,13 +74,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType cancel = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionParticipantProcessor.getProcessor().cancel(cancel, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionParticipantProcessor.getProcessor().cancel(cancel, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -98,13 +96,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType compensate = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionParticipantProcessor.getProcessor().compensate(compensate, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionParticipantProcessor.getProcessor().compensate(compensate, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -121,13 +118,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType failed = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionParticipantProcessor.getProcessor().failed(failed, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionParticipantProcessor.getProcessor().failed(failed, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -144,13 +140,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType exited = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionParticipantProcessor.getProcessor().exited(exited, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionParticipantProcessor.getProcessor().exited(exited, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -167,13 +162,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType notCompleted = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionParticipantProcessor.getProcessor().notCompleted(notCompleted, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionParticipantProcessor.getProcessor().notCompleted(notCompleted, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -190,13 +184,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final NotificationType getStatus = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionParticipantProcessor.getProcessor().getStatus(getStatus, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionParticipantProcessor.getProcessor().getStatus(getStatus, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -213,13 +206,12 @@
{
MessageContext ctx = webServiceCtx.getMessageContext();
final StatusType status = parameters;
- final AddressingProperties inboundAddressProperties
- = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionParticipantProcessor.getProcessor().status(status, inboundAddressProperties, arjunaContext) ;
+ ParticipantCompletionParticipantProcessor.getProcessor().status(status, inboundMap, arjunaContext) ;
}
}) ;
}
@@ -231,13 +223,13 @@
Fault fault)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- final AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ final MAP inboundMap = AddressingHelper.inboundMap(ctx);
final ArjunaContext arjunaContext = ArjunaContext.getCurrentContext(ctx);
final SoapFault soapFault = SoapFault11.fromFault(fault);
TaskManager.getManager().queueTask(new Task() {
public void executeTask() {
- ParticipantCompletionParticipantProcessor.getProcessor().soapFault(soapFault, inboundAddressProperties, arjunaContext); ;
+ ParticipantCompletionParticipantProcessor.getProcessor().soapFault(soapFault, inboundMap, arjunaContext); ;
}
}) ;
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -7,6 +7,7 @@
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.client.CompletionInitiatorClient;
@@ -18,7 +19,6 @@
import com.arjuna.wst11.CompletionCoordinatorParticipant;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import javax.xml.ws.addressing.AddressingProperties;
import java.text.MessageFormat;
/**
@@ -75,10 +75,10 @@
/**
* Commit.
* @param commit The commit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void commit(final Notification commit, final AddressingProperties addressingProperties,
+ public void commit(final Notification commit, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -95,14 +95,14 @@
}
catch (final TransactionRolledBackException trbe)
{
- final AddressingProperties responseAddressingContext =
- AddressingHelper.createResponseContext(addressingProperties, messageId) ;
+ final MAP responseAddressingContext =
+ AddressingHelper.createResponseContext(map, messageId) ;
CompletionInitiatorClient.getClient().sendAborted(participant.getParticipant(), responseAddressingContext, instanceIdentifier) ;
return ;
}
catch (final UnknownTransactionException ute)
{
- final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultAddressingContext = AddressingHelper.createFaultContext(map, messageId) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_1")) ;
CompletionInitiatorClient.getClient().sendSoapFault(participant.getParticipant(), faultAddressingContext, soapFault, instanceIdentifier) ;
@@ -110,7 +110,7 @@
}
catch (final SystemException se)
{
- final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultAddressingContext = AddressingHelper.createFaultContext(map, messageId) ;
final String pattern = WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_2") ;
final String message = MessageFormat.format(pattern, new Object[] {se}) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME, message) ;
@@ -123,12 +123,12 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_3", th) ;
}
- final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
+ final MAP faultAddressingContext = AddressingHelper.createFaultContext(map, MessageId.getMessageId()) ;
final SoapFault soapFault = new SoapFault11(th) ;
CompletionInitiatorClient.getClient().sendSoapFault(participant.getParticipant(), faultAddressingContext, soapFault, instanceIdentifier) ;
return ;
}
- final AddressingProperties responseAddressingContext = AddressingHelper.createResponseContext(addressingProperties, messageId) ;
+ final MAP responseAddressingContext = AddressingHelper.createResponseContext(map, messageId) ;
CompletionInitiatorClient.getClient().sendCommitted(participant.getParticipant(), responseAddressingContext, instanceIdentifier) ;
}
else
@@ -137,7 +137,7 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_4", new Object[] {instanceIdentifier}) ;
}
- final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
+ final MAP faultAddressingContext = AddressingHelper.createFaultContext(map, MessageId.getMessageId()) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_5")) ;
CompletionInitiatorClient.getClient().sendSoapFault(participant.getParticipant(), faultAddressingContext, soapFault, instanceIdentifier) ;
@@ -152,10 +152,10 @@
/**
* Rollback.
* @param rollback The rollback notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void rollback(final Notification rollback, final AddressingProperties addressingProperties,
+ public void rollback(final Notification rollback, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -172,7 +172,7 @@
}
catch (final UnknownTransactionException ute)
{
- final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultAddressingContext = AddressingHelper.createFaultContext(map, messageId) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_6")) ;
CompletionInitiatorClient.getClient().sendSoapFault(participant.getParticipant(), faultAddressingContext, soapFault, instanceIdentifier) ;
@@ -180,7 +180,7 @@
}
catch (SystemException systemException)
{
- final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultAddressingContext = AddressingHelper.createFaultContext(map, messageId) ;
final String pattern = WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_7") ;
final String message = MessageFormat.format(pattern, new Object[] {systemException}) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME, message) ;
@@ -193,12 +193,12 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_8", th) ;
}
- final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
+ final MAP faultAddressingContext = AddressingHelper.createFaultContext(map, MessageId.getMessageId()) ;
final SoapFault soapFault = new SoapFault11(th) ;
CompletionInitiatorClient.getClient().sendSoapFault(participant.getParticipant(), faultAddressingContext, soapFault, instanceIdentifier) ;
return ;
}
- final AddressingProperties responseAddressingContext = AddressingHelper.createResponseContext(addressingProperties, messageId) ;
+ final MAP responseAddressingContext = AddressingHelper.createResponseContext(map, messageId) ;
CompletionInitiatorClient.getClient().sendAborted(participant.getParticipant(), responseAddressingContext, instanceIdentifier) ;
}
else
@@ -207,7 +207,7 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_9", new Object[] {instanceIdentifier}) ;
}
- final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
+ final MAP faultAddressingContext = AddressingHelper.createFaultContext(map, MessageId.getMessageId()) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_10")) ;
CompletionInitiatorClient.getClient().sendSoapFault(participant.getParticipant(), faultAddressingContext, soapFault, instanceIdentifier) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,14 +25,13 @@
import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.CoordinatorCompletionCoordinatorInboundEvents;
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.wsba.client.CoordinatorCompletionParticipantClient;
import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionCoordinatorProcessor;
-import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.wsc11.messaging.MessageId;
@@ -41,12 +40,6 @@
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
import org.jboss.jbossts.xts.recovery.participant.ba.XTSBARecoveryManager;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.AddressingBuilder;
-import java.net.URISyntaxException;
-
-
/**
* The Coordinator Completion Coordinator processor.
* @author kevin
@@ -100,13 +93,13 @@
/**
* Cancelled.
* @param cancelled The canceled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.cancelled_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.canceled_1] - Unexpected exception thrown from cancelled:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.cancelled_2 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.canceled_2] - Cancelled called on unknown coordinator: {0}
*/
- public void cancelled(final NotificationType cancelled, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void cancelled(final NotificationType cancelled, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -115,7 +108,7 @@
{
try
{
- coordinator.cancelled(cancelled, addressingProperties, arjunaContext) ;
+ coordinator.cancelled(cancelled, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -134,13 +127,13 @@
/**
* Closed.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.closed_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.closed_1] - Unexpected exception thrown from closed:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.closed_2 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.closed_2] - Closed called on unknown coordinator: {0}
*/
- public void closed(final NotificationType closed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void closed(final NotificationType closed, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -149,7 +142,7 @@
{
try
{
- coordinator.closed(closed, addressingProperties, arjunaContext) ;
+ coordinator.closed(closed, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -168,13 +161,13 @@
/**
* Compensated.
* @param compensated The compensated notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.compensated_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.compensated_1] - Unexpected exception thrown from compensated:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.compensated_2 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.compensated_2] - Compensated called on unknown coordinator: {0}
*/
- public void compensated(final NotificationType compensated, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void compensated(final NotificationType compensated, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -183,7 +176,7 @@
{
try
{
- coordinator.compensated(compensated, addressingProperties, arjunaContext) ;
+ coordinator.compensated(compensated, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -202,14 +195,14 @@
/**
* Fail.
* @param fail The fail exceptionnotification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.fail_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.fail_1] - Unexpected exception thrown from failed:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.fail_2 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.fail_2] - Failed called on unknown coordinator: {0}
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.fail_3 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.fail_3] - Ignoring fail called on unidentified coordinator until recovery pass is complete: {0}
*/
- public void fail(final ExceptionType fail, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void fail(final ExceptionType fail, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -218,7 +211,7 @@
{
try
{
- coordinator.fail(fail, addressingProperties, arjunaContext) ;
+ coordinator.fail(fail, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -233,7 +226,7 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.fail_2", new Object[] {instanceIdentifier}) ;
}
- sendFailed(addressingProperties, arjunaContext) ;
+ sendFailed(map, arjunaContext) ;
} else {
// we must delay responding until we can be sure there is no participant pending recovery
if (WSTLogger.arjLoggerI18N.isDebugEnabled())
@@ -246,14 +239,14 @@
/**
* Completed.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.completed_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.completed_1] - Unexpected exception thrown from completed:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.completed_2 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.completed_2] - Completed called on unknown coordinator: {0}
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.completed_3 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.completed_3] - Ignoring completed called on unidentified coordinator until recovery pass is complete: {0}
*/
- public void completed(final NotificationType completed, final AddressingProperties addressingProperties,
+ public void completed(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -263,7 +256,7 @@
{
try
{
- coordinator.completed(completed, addressingProperties, arjunaContext) ;
+ coordinator.completed(completed, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -288,13 +281,13 @@
/**
* Exit.
* @param exit The exit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.exit_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.exit_1] - Unexpected exception thrown from exit:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.exit_2 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.exit_2] - Exit called on unknown coordinator: {0}
*/
- public void exit(final NotificationType exit, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void exit(final NotificationType exit, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -303,7 +296,7 @@
{
try
{
- coordinator.exit(exit, addressingProperties, arjunaContext) ;
+ coordinator.exit(exit, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -319,20 +312,20 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.exit_2", new Object[] {instanceIdentifier}) ;
}
- sendExited(addressingProperties, arjunaContext) ;
+ sendExited(map, arjunaContext) ;
}
}
/**
* FaulCannot completet.
* @param cannotComplete The cannot complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.cannotComplete_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.cannotComplete_1] - Unexpected exception thrown from cannotComplete:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.cannotComplete_2 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.cannotComplete_2] - cannotComplete called on unknown coordinator: {0}
*/
- public void cannotComplete(final NotificationType cannotComplete, final AddressingProperties addressingProperties,
+ public void cannotComplete(final NotificationType cannotComplete, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -342,7 +335,7 @@
{
try
{
- coordinator.cannotComplete(cannotComplete, addressingProperties, arjunaContext); ;
+ coordinator.cannotComplete(cannotComplete, map, arjunaContext); ;
}
catch (final Throwable th)
{
@@ -358,14 +351,14 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.cannotComplete_2", new Object[] {instanceIdentifier}) ;
}
- sendNotCompleted(addressingProperties, arjunaContext) ;
+ sendNotCompleted(map, arjunaContext) ;
}
}
/**
* Get Status.
* @param getStatus The get status notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.getStatus_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.getStatus_1] - Unexpected exception thrown from getStatus:
@@ -373,7 +366,7 @@
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.getStatus_3 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.getStatus_3] - Unexpected exception while sending InvalidStateFault to participant {0}
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.getStatus_4 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.getStatus_4] - GetStatus requested for unknown coordinator completion participant
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -382,7 +375,7 @@
{
try
{
- coordinator.getStatus(getStatus, addressingProperties, arjunaContext) ;
+ coordinator.getStatus(getStatus, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -401,13 +394,13 @@
// send an invalid state fault
final String messageId = MessageId.getMessageId();
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
try
{
final SoapFault11 soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_STATE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.getStatus_4")) ;
- AddressingHelper.installNoneReplyTo(faultAddressingProperties);
- SoapFaultClient.sendSoapFault(soapFault, faultAddressingProperties, getFaultAction()) ;
+ AddressingHelper.installNoneReplyTo(faultMAP);
+ SoapFaultClient.sendSoapFault(soapFault, faultMAP, getFaultAction()) ;
}
catch (final Throwable th)
{
@@ -419,33 +412,21 @@
}
}
- private static AttributedURI faultAction = null;
-
- private static synchronized AttributedURI getFaultAction()
+ private static String getFaultAction()
{
- if (faultAction == null) {
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-
- try {
- faultAction = builder.newURI(CoordinationConstants.WSCOOR_ACTION_FAULT);
- } catch (URISyntaxException e) {
- // TODO log error here
- }
- }
-
- return faultAction;
+ return CoordinationConstants.WSCOOR_ACTION_FAULT;
}
/**
* Status.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.status_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.status_1] - Unexpected exception thrown from status:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.status_2 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.status_2] - Status called on unknown coordinator: {0}
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -454,7 +435,7 @@
{
try
{
- coordinator.status(status, addressingProperties, arjunaContext) ;
+ coordinator.status(status, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -473,13 +454,13 @@
/**
* SOAP fault.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.soapFault_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.soapFault_1] - Unexpected exception thrown from soapFault:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.soapFault_2 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.soapFault_2] - SoapFault called on unknown coordinator: {0}
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -489,7 +470,7 @@
{
try
{
- coordinator.soapFault(soapFault, addressingProperties, arjunaContext) ;
+ coordinator.soapFault(soapFault, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -508,16 +489,16 @@
/**
* Send an exited message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendExited_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendExited_1] - Unexpected exception while sending Exited
*/
- private void sendExited(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendExited(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingContext = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseAddressingContext = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
@@ -536,16 +517,16 @@
/**
* Send a faulted message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendFailed_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendFailed_1] - Unexpected exception while sending Faulted
*/
- private void sendFailed(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendFailed(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingContext = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseAddressingContext = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
@@ -564,16 +545,16 @@
/**
* Send a not completed message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendNotCompleted_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendNotCompleted_1] - Unexpected exception while sending NotCompleted
*/
- private void sendNotCompleted(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendNotCompleted(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingContext = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseAddressingContext = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,15 +25,14 @@
import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.CoordinatorCompletionParticipantInboundEvents;
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.wsba.State;
import com.arjuna.webservices11.wsba.client.CoordinatorCompletionCoordinatorClient;
import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionParticipantProcessor;
-import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.wsc11.messaging.MessageId;
@@ -41,11 +40,7 @@
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
import org.jboss.jbossts.xts.recovery.participant.ba.XTSBARecoveryManager;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.AddressingBuilder;
import javax.xml.namespace.QName;
-import java.net.URISyntaxException;
/**
@@ -101,7 +96,7 @@
/**
* Cancel.
* @param cancel The cancel notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.cancel_1 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.cancel_1] - Unexpected exception thrown from cancel:
@@ -110,7 +105,7 @@
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.cancel_4 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.cancel_4] - Cancel request dropped pending WS-BA participant recovery manager scan for unknown participant: {0}
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.cancel_5 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.cancel_5] - Cancel request dropped pending registration of application-specific recovery module for WS-BA participant: {0}
*/
- public void cancel(final NotificationType cancel, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void cancel(final NotificationType cancel, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -136,7 +131,7 @@
{
try
{
- participant.cancel(cancel, addressingProperties, arjunaContext) ;
+ participant.cancel(cancel, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -166,14 +161,14 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.cancel_2", new Object[] {instanceIdentifier}) ;
}
- sendCancelled(addressingProperties, arjunaContext) ;
+ sendCancelled(map, arjunaContext) ;
}
}
/**
* Close.
* @param close The close notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.close_1 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.close_1] - Unexpected exception thrown from close:
@@ -182,7 +177,7 @@
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.close_4 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.close_4] - Close request dropped pending WS-BA participant recovery manager scan for unknown participant: {0}
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.close_5 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.close_5] - Close request dropped pending registration of application-specific recovery module for WS-BA participant: {0}
*/
- public void close(final NotificationType close, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void close(final NotificationType close, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -208,7 +203,7 @@
{
try
{
- participant.close(close, addressingProperties, arjunaContext) ;
+ participant.close(close, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -238,14 +233,14 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.close_2", new Object[] {instanceIdentifier}) ;
}
- sendClosed(addressingProperties, arjunaContext) ;
+ sendClosed(map, arjunaContext) ;
}
}
/**
* Compensate.
* @param compensate The compensate notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.compensate_1 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.compensate_1] - Unexpected exception thrown from compensate:
@@ -254,7 +249,7 @@
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.compensate_4 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.compensate_4] - Compensate request dropped pending WS-BA participant recovery manager scan for unknown participant: {0}
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.compensate_5 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.compensate_5] - Compensate request dropped pending registration of application-specific recovery module for WS-BA participant: {0}
*/
- public void compensate(final NotificationType compensate, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void compensate(final NotificationType compensate, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -280,7 +275,7 @@
{
try
{
- participant.compensate(compensate, addressingProperties, arjunaContext) ;
+ participant.compensate(compensate, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -310,21 +305,21 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.compensate_2", new Object[] {instanceIdentifier}) ;
}
- sendCompensated(addressingProperties, arjunaContext) ;
+ sendCompensated(map, arjunaContext) ;
}
}
/**
* Complete.
* @param complete The complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.complete_1 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.complete_1] - Unexpected exception thrown from complete:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.complete_2 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.complete_2] - Complete called on unknown participant: {0}
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.complete_3 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.complete_3] - Complete called on unknown participant
*/
- public void complete(final NotificationType complete, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void complete(final NotificationType complete, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -333,7 +328,7 @@
{
try
{
- participant.complete(complete, addressingProperties, arjunaContext) ;
+ participant.complete(complete, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -349,20 +344,20 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.complete_2", new Object[] {instanceIdentifier}) ;
}
- sendFail(addressingProperties, arjunaContext, State.STATE_ENDED.getValue()) ;
+ sendFail(map, arjunaContext, State.STATE_ENDED.getValue()) ;
}
}
/**
* Exited.
* @param exited The exited notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.exited_1 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.exited_1] - Unexpected exception thrown from exited:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.exited_2 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.exited_2] - Exited called on unknown participant: {0}
*/
- public void exited(final NotificationType exited, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void exited(final NotificationType exited, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -371,7 +366,7 @@
{
try
{
- participant.exited(exited, addressingProperties, arjunaContext) ;
+ participant.exited(exited, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -390,13 +385,13 @@
/**
* Not Completed.
* @param notCompleted The not completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.notCompleted_1 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.notCompleted_1] - Unexpected exception thrown from notCompleted:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.notCompleted_2 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.notCompleted_2] - NotCompleted called on unknown participant: {0}
*/
- public void notCompleted(final NotificationType notCompleted, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void notCompleted(final NotificationType notCompleted, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -405,7 +400,7 @@
{
try
{
- participant.notCompleted(notCompleted, addressingProperties, arjunaContext) ;
+ participant.notCompleted(notCompleted, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -424,13 +419,13 @@
/**
* Failed.
* @param failed The failed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.failed_1 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.failed_1] - Unexpected exception thrown from failed:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.failed_2 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.failed_2] - Failed called on unknown participant: {0}
*/
- public void failed(final NotificationType failed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void failed(final NotificationType failed, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -439,7 +434,7 @@
{
try
{
- participant.failed(failed, addressingProperties, arjunaContext) ;
+ participant.failed(failed, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -458,7 +453,7 @@
/**
* Get Status.
* @param getStatus The get status notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.getStatus_1 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.getStatus_1] - Unexpected exception thrown from getStatus:
@@ -466,7 +461,7 @@
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.getStatus_3 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.getStatus_3] - Unexpected exception while sending InvalidStateFault to coordinator for participant {0}
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.getStatus_4 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.getStatus_4] - GetStatus requested for unknown coordinator completion participant
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -475,7 +470,7 @@
{
try
{
- participant.getStatus(getStatus, addressingProperties, arjunaContext) ;
+ participant.getStatus(getStatus, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -494,13 +489,13 @@
// send an invalid state fault
final String messageId = MessageId.getMessageId();
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
try
{
final SoapFault11 soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_STATE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.getStatus_4")) ;
- AddressingHelper.installNoneReplyTo(faultAddressingProperties);
- SoapFaultClient.sendSoapFault(soapFault, faultAddressingProperties, getFaultAction()) ;
+ AddressingHelper.installNoneReplyTo(faultMAP);
+ SoapFaultClient.sendSoapFault(soapFault, faultMAP, getFaultAction()) ;
}
catch (final Throwable th)
{
@@ -512,33 +507,21 @@
}
}
- private static AttributedURI faultAction = null;
-
- private static synchronized AttributedURI getFaultAction()
+ private static String getFaultAction()
{
- if (faultAction == null) {
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-
- try {
- faultAction = builder.newURI(CoordinationConstants.WSCOOR_ACTION_FAULT);
- } catch (URISyntaxException e) {
- // TODO log error here
- }
- }
-
- return faultAction;
+ return CoordinationConstants.WSCOOR_ACTION_FAULT;
}
/**
* Status.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.status_1 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.status_1] - Unexpected exception thrown from status:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.status_2 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.status_2] - Status called on unknown participant: {0}
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final CoordinatorCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -547,7 +530,7 @@
{
try
{
- participant.status(status, addressingProperties, arjunaContext) ;
+ participant.status(status, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -566,13 +549,13 @@
/**
* SOAP Fault.
* @param fault The SOAP fault notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.soapFault_1 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.soapFault_1] - Unexpected exception thrown from soapFault:
* @message com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.soapFault_2 [com.arjuna.wst11.messaging.CoordinatorCompletionParticipantProcessorImpl.soapFault_2] - SoapFault called on unknown participant: {0}
*/
- public void soapFault(final SoapFault fault, final AddressingProperties addressingProperties,
+ public void soapFault(final SoapFault fault, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -582,7 +565,7 @@
{
try
{
- participant.soapFault(fault, addressingProperties, arjunaContext) ;
+ participant.soapFault(fault, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -601,21 +584,21 @@
/**
* Send a cancelled message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendCancelled_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendCancelled_1] - Unexpected exception while sending Cancelled
*/
- private void sendCancelled(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendCancelled(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
// supply null endpoint to indicate addressing properties should be used to route message
- CoordinatorCompletionCoordinatorClient.getClient().sendCancelled(null, responseAddressingProperties, arjunaContext.getInstanceIdentifier()) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendCancelled(null, responseMAP, arjunaContext.getInstanceIdentifier()) ;
}
catch (final Throwable th)
{
@@ -629,21 +612,21 @@
/**
* Send a closed message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendClosed_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendClosed_1] - Unexpected exception while sending Closed
*/
- private void sendClosed(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendClosed(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
// supply null endpoint to indicate addressing properties should be used to route message
- CoordinatorCompletionCoordinatorClient.getClient().sendClosed(null, responseAddressingProperties, arjunaContext.getInstanceIdentifier()) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendClosed(null, responseMAP, arjunaContext.getInstanceIdentifier()) ;
}
catch (final Throwable th)
{
@@ -657,21 +640,21 @@
/**
* Send a compensated message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendCompensated_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendCompensated_1] - Unexpected exception while sending Compensated
*/
- private void sendCompensated(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendCompensated(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
// supply null endpoint to indicate addressing properties should be used to route message
- CoordinatorCompletionCoordinatorClient.getClient().sendCompensated(null, responseAddressingProperties, arjunaContext.getInstanceIdentifier()) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendCompensated(null, responseMAP, arjunaContext.getInstanceIdentifier()) ;
}
catch (final Throwable th)
{
@@ -685,22 +668,22 @@
/**
* Send a fail message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
* @param exceptionIdentifier The exception identifier.
*
* @message com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendFail_1 [com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl.sendFail_1] - Unexpected exception while sending Fail
*/
- private void sendFail(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext, final QName exceptionIdentifier)
+ private void sendFail(final MAP map, final ArjunaContext arjunaContext, final QName exceptionIdentifier)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createFaultContext(map, messageId) ;
try
{
// supply null endpoint to indicate addressing properties should be used to route message
- CoordinatorCompletionCoordinatorClient.getClient().sendFail(null, responseAddressingProperties, arjunaContext.getInstanceIdentifier(), exceptionIdentifier) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendFail(null, responseMAP, arjunaContext.getInstanceIdentifier(), exceptionIdentifier) ;
}
catch (final Throwable th)
{
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorProcessorImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorProcessorImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -5,19 +5,18 @@
import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.CoordinatorInboundEvents;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.wsat.client.ParticipantClient;
import com.arjuna.webservices11.wsat.processors.CoordinatorProcessor;
-import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.wsc11.messaging.MessageId;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
import org.jboss.jbossts.xts.recovery.participant.at.XTSATRecoveryManager;
-import javax.xml.ws.addressing.AddressingProperties;
/**
* The Coordinator processor.
@@ -73,13 +72,13 @@
/**
* Aborted.
* @param aborted The aborted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.aborted_1 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.aborted_1] - Unexpected exception thrown from aborted:
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.aborted_2 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.aborted_2] - Aborted called on unknown coordinator: {0}
*/
- public void aborted(final Notification aborted, final AddressingProperties addressingProperties,
+ public void aborted(final Notification aborted, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -89,7 +88,7 @@
{
try
{
- coordinator.aborted(aborted, addressingProperties, arjunaContext) ;
+ coordinator.aborted(aborted, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -108,13 +107,13 @@
/**
* Committed.
* @param committed The committed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.committed_1 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.committed_1] - Unexpected exception thrown from committed:
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.committed_2 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.committed_2] - Committed called on unknown coordinator: {0}
*/
- public void committed(final Notification committed, final AddressingProperties addressingProperties,
+ public void committed(final Notification committed, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -124,7 +123,7 @@
{
try
{
- coordinator.committed(committed, addressingProperties, arjunaContext) ;
+ coordinator.committed(committed, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -143,14 +142,14 @@
/**
* Prepared.
* @param prepared The prepared notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.prepared_1 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.prepared_1] - Unexpected exception thrown from prepared:
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.prepared_2 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.prepared_2] - Prepared called on unknown coordinator: {0}
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.prepared_3 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.prepared_3] - Ignoring prepared called on unidentified coordinator until recovery pass is complete: {0}
*/
- public void prepared(final Notification prepared, final AddressingProperties addressingProperties,
+ public void prepared(final Notification prepared, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -160,7 +159,7 @@
{
try
{
- coordinator.prepared(prepared, addressingProperties, arjunaContext) ;
+ coordinator.prepared(prepared, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -180,11 +179,11 @@
final String identifierValue = instanceIdentifier.getInstanceIdentifier() ;
if ((identifierValue != null) && (identifierValue.length() > 0) && (identifierValue.charAt(0) == 'D'))
{
- sendRollback(addressingProperties, arjunaContext) ;
+ sendRollback(map, arjunaContext) ;
}
else
{
- sendUnknownTransaction(addressingProperties, arjunaContext) ;
+ sendUnknownTransaction(map, arjunaContext) ;
}
}
else
@@ -202,13 +201,13 @@
/**
* Read only.
* @param readOnly The read only notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.readOnly_1 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.readOnly_1] - Unexpected exception thrown from readOnly:
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.readOnly_2 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.readOnly_2] - ReadOnly called on unknown coordinator: {0}
*/
- public void readOnly(final Notification readOnly, final AddressingProperties addressingProperties,
+ public void readOnly(final Notification readOnly, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -218,7 +217,7 @@
{
try
{
- coordinator.readOnly(readOnly, addressingProperties, arjunaContext) ;
+ coordinator.readOnly(readOnly, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -237,13 +236,13 @@
/**
* SOAP Fault.
* @param fault The SOAP fault notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.soapFault_1 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.soapFault_1] - Unexpected exception thrown from soapFault:
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.soapFault_2 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.soapFault_2] - SoapFault called on unknown coordinator: {0}
*/
- public void soapFault(final SoapFault fault, final AddressingProperties addressingProperties,
+ public void soapFault(final SoapFault fault, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -253,7 +252,7 @@
{
try
{
- coordinator.soapFault(fault, addressingProperties, arjunaContext) ;
+ coordinator.soapFault(fault, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -275,16 +274,16 @@
/**
* Send an unknown transaction fault.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.sendUnknownTransaction_1 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.sendUnknownTransaction_1] - Unknown Transaction.
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.sendUnknownTransaction_2 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.sendUnknownTransaction_2] - Unexpecting exception while sending InvalidState
*/
- private void sendUnknownTransaction(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendUnknownTransaction(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
- final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
+ final MAP faultAddressingContext = AddressingHelper.createFaultContext(map, MessageId.getMessageId()) ;
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
try {
@@ -302,16 +301,16 @@
/**
* Send a rollback message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.CoordinatorProcessorImpl.sendRollback_1 [com.arjuna.wst11.messaging.CoordinatorProcessorImpl.sendRollback_1] - Unexpected exception while sending Rollback
*/
- private void sendRollback(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendRollback(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingContext = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseAddressingContext = AddressingHelper.createOneWayResponseContext(map, messageId) ;
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
try
{
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,6 +25,7 @@
import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
@@ -39,12 +40,6 @@
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
import org.jboss.jbossts.xts.recovery.participant.ba.XTSBARecoveryManager;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.AddressingBuilder;
-import java.net.URISyntaxException;
-
-
/**
* The Participant Completion Coordinator processor.
* @author kevin
@@ -98,13 +93,13 @@
/**
* Cancelled.
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.cancelled_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.cancelled_1] - Unexpected exception thrown from cancelled:
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.cancelled_2 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.cancelled_2] - Cancelled called on unknown coordinator: {0}
*/
- public void cancelled(final NotificationType cancelled, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void cancelled(final NotificationType cancelled, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -113,7 +108,7 @@
{
try
{
- coordinator.cancelled(cancelled, addressingProperties, arjunaContext) ;
+ coordinator.cancelled(cancelled, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -132,13 +127,13 @@
/**
* Closed.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.closed_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.closed_1] - Unexpected exception thrown from closed:
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.closed_2 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.closed_2] - Closed called on unknown coordinator: {0}
*/
- public void closed(final NotificationType closed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void closed(final NotificationType closed, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -147,7 +142,7 @@
{
try
{
- coordinator.closed(closed, addressingProperties, arjunaContext) ;
+ coordinator.closed(closed, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -166,13 +161,13 @@
/**
* Compensated.
* @param compensated The compensated notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.compensated_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.compensated_1] - Unexpected exception thrown from compensated:
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.compensated_2 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.compensated_2] - Compensated called on unknown coordinator: {0}
*/
- public void compensated(final NotificationType compensated, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void compensated(final NotificationType compensated, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -181,7 +176,7 @@
{
try
{
- coordinator.compensated(compensated, addressingProperties, arjunaContext) ;
+ coordinator.compensated(compensated, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -200,14 +195,14 @@
/**
* Completed.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.completed_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.completed_1] - Unexpected exception thrown from completed:
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.completed_2 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.completed_2] - Completed called on unknown coordinator: {0}
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.completed_3 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.completed_3] - Ignoring completed called on unidentified coordinator until recovery pass is complete: {0}
*/
- public void completed(final NotificationType completed, final AddressingProperties addressingProperties,
+ public void completed(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -217,7 +212,7 @@
{
try
{
- coordinator.completed(completed, addressingProperties, arjunaContext) ;
+ coordinator.completed(completed, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -242,13 +237,13 @@
/**
* Completed.
* @param cannotComplete The cannot complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.cannotComplete_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.cannotComplete_1] - Unexpected exception thrown from cannot complete:
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.cannotComplete_2 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.cannotComplete_2] - Cannot complete called on unknown coordinator: {0}
*/
- public void cannotComplete(final NotificationType cannotComplete, final AddressingProperties addressingProperties,
+ public void cannotComplete(final NotificationType cannotComplete, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -258,7 +253,7 @@
{
try
{
- coordinator.cannotComplete(cannotComplete, addressingProperties, arjunaContext) ;
+ coordinator.cannotComplete(cannotComplete, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -273,20 +268,20 @@
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.completed_2", new Object[] {instanceIdentifier}) ;
}
- sendNotCompleted(addressingProperties, arjunaContext) ;
+ sendNotCompleted(map, arjunaContext) ;
}
}
/**
* Exit.
* @param exit The exit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.exit_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.exit_1] - Unexpected exception thrown from exit:
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.exit_2 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.exit_2] - Exit called on unknown coordinator: {0}
*/
- public void exit(final NotificationType exit, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void exit(final NotificationType exit, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -295,7 +290,7 @@
{
try
{
- coordinator.exit(exit, addressingProperties, arjunaContext) ;
+ coordinator.exit(exit, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -309,21 +304,21 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.exit_2", new Object[] {instanceIdentifier}) ;
}
- sendExited(addressingProperties, arjunaContext) ;
+ sendExited(map, arjunaContext) ;
}
}
/**
* Fail.
* @param fail The fail notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.fail_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.fail_1] - Unexpected exception thrown from fail:
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.fail_2 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.fail_2] - Fail called on unknown coordinator: {0}
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.fail_3 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.fail_3] - Ignoring fail called on unidentified coordinator until recovery pass is complete: {0}
*/
- public void fail(final ExceptionType fail, final AddressingProperties addressingProperties,
+ public void fail(final ExceptionType fail, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -333,7 +328,7 @@
{
try
{
- coordinator.fail(fail, addressingProperties, arjunaContext) ;
+ coordinator.fail(fail, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -348,7 +343,7 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.fail_2", new Object[] {instanceIdentifier}) ;
}
- sendFailed(addressingProperties, arjunaContext) ;
+ sendFailed(map, arjunaContext) ;
} else {
// we must delay responding until we can be sure there is no participant pending recovery
if (WSTLogger.arjLoggerI18N.isDebugEnabled())
@@ -361,7 +356,7 @@
/**
* Get Status.
* @param getStatus The get status notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.getStatus_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.getStatus_1] - Unexpected exception thrown from getStatus:
@@ -369,7 +364,7 @@
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.getStatus_3 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.getStatus_3] - Unexpected exception while sending InvalidStateFault to participant {0}
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.getStatus_4 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.getStatus_4] - GetStatus requested for unknown participant completion participant
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -378,7 +373,7 @@
{
try
{
- coordinator.getStatus(getStatus, addressingProperties, arjunaContext) ;
+ coordinator.getStatus(getStatus, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -398,13 +393,13 @@
// send an invalid state fault
final String messageId = MessageId.getMessageId();
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
try
{
final SoapFault11 soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_STATE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.getStatus_4")) ;
- AddressingHelper.installNoneReplyTo(faultAddressingProperties);
- SoapFaultClient.sendSoapFault(soapFault, faultAddressingProperties, getFaultAction()) ;
+ AddressingHelper.installNoneReplyTo(faultMAP);
+ SoapFaultClient.sendSoapFault(soapFault, faultMAP, getFaultAction()) ;
}
catch (final Throwable th)
{
@@ -416,33 +411,21 @@
}
}
- private static AttributedURI faultAction = null;
-
- private static synchronized AttributedURI getFaultAction()
+ private static String getFaultAction()
{
- if (faultAction == null) {
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-
- try {
- faultAction = builder.newURI(CoordinationConstants.WSCOOR_ACTION_FAULT);
- } catch (URISyntaxException e) {
- // TODO log error here
- }
- }
-
- return faultAction;
+ return CoordinationConstants.WSCOOR_ACTION_FAULT;
}
/**
* Status.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.status_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.status_1] - Unexpected exception thrown from status:
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.status_2 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.status_2] - Status called on unknown coordinator: {0}
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionCoordinatorInboundEvents coordinator = getCoordinator(instanceIdentifier) ;
@@ -451,7 +434,7 @@
{
try
{
- coordinator.status(status, addressingProperties, arjunaContext) ;
+ coordinator.status(status, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -470,13 +453,13 @@
/**
* SOAP fault.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.soapFault_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.soapFault_1] - Unexpected exception thrown from soapFault:
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.soapFault_2 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.soapFault_2] - SoapFault called on unknown coordinator: {0}
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -486,7 +469,7 @@
{
try
{
- coordinator.soapFault(soapFault, addressingProperties, arjunaContext) ;
+ coordinator.soapFault(soapFault, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -505,20 +488,20 @@
/**
* Send an exited message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.sendExited_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.sendExited_1] - Unexpected exception while sending Exited
*/
- private void sendExited(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendExited(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
// supply null endpoint so that addressing properties are used to deliver message
- ParticipantCompletionParticipantClient.getClient().sendExited(null, responseAddressingProperties, arjunaContext.getInstanceIdentifier()) ;
+ ParticipantCompletionParticipantClient.getClient().sendExited(null, responseMAP, arjunaContext.getInstanceIdentifier()) ;
}
catch (final Throwable th)
{
@@ -532,20 +515,20 @@
/**
* Send a failed message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.sendFailed_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.sendFailed_1] - Unexpected exception while sending Failed
*/
- private void sendFailed(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendFailed(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
// supply null endpoint so that addressing properties are used to deliver message
- ParticipantCompletionParticipantClient.getClient().sendFailed(null, responseAddressingProperties, arjunaContext.getInstanceIdentifier()) ;
+ ParticipantCompletionParticipantClient.getClient().sendFailed(null, responseMAP, arjunaContext.getInstanceIdentifier()) ;
}
catch (final Throwable th)
{
@@ -559,20 +542,20 @@
/**
* Send a not completed message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.sendNotCompleted_1 [com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl.sendNotCompleted_1] - Unexpected exception while sending NotCompleted
*/
- private void sendNotCompleted(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendNotCompleted(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
// supply null endpoint so that addressing properties are used to deliver message
- ParticipantCompletionParticipantClient.getClient().sendNotCompleted(null, responseAddressingProperties, arjunaContext.getInstanceIdentifier()); ;
+ ParticipantCompletionParticipantClient.getClient().sendNotCompleted(null, responseMAP, arjunaContext.getInstanceIdentifier()); ;
}
catch (final Throwable th)
{
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,14 +25,13 @@
import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.ParticipantCompletionParticipantInboundEvents;
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.wsba.client.ParticipantCompletionCoordinatorClient;
import com.arjuna.webservices11.wsba.processors.ParticipantCompletionParticipantProcessor;
-import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.wsc11.messaging.MessageId;
@@ -40,12 +39,6 @@
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
import org.jboss.jbossts.xts.recovery.participant.ba.XTSBARecoveryManager;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.AddressingBuilder;
-import java.net.URISyntaxException;
-
-
/**
* The Participant Completion Participant processor.
* @author kevin
@@ -99,7 +92,7 @@
/**
* Cancel.
* @param cancel The cancel notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.cancel_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.cancel_1] - Unexpected exception thrown from cancel:
@@ -108,7 +101,7 @@
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.cancel_4 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.cancel_4] - Cancel request dropped pending WS-BA participant recovery manager scan for unknown participant: {0}
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.cancel_5 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.cancel_5] - Cancel request dropped pending registration of application-specific recovery module for WS-BA participant: {0}
*/
- public void cancel(final NotificationType cancel, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void cancel(final NotificationType cancel, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -134,7 +127,7 @@
{
try
{
- participant.cancel(cancel, addressingProperties, arjunaContext) ;
+ participant.cancel(cancel, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -164,14 +157,14 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.cancel_2", new Object[] {instanceIdentifier}) ;
}
- sendCancelled(addressingProperties, arjunaContext) ;
+ sendCancelled(map, arjunaContext) ;
}
}
/**
* Close.
* @param close The close notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.close_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.close_1] - Unexpected exception thrown from close:
@@ -180,7 +173,7 @@
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.close_4 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.close_4] - Close request dropped pending WS-BA participant recovery manager scan for unknown participant: {0}
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.close_5 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.close_5] - Close request dropped pending registration of application-specific recovery module for WS-BA participant: {0}
*/
- public void close(final NotificationType close, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void close(final NotificationType close, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -206,7 +199,7 @@
{
try
{
- participant.close(close, addressingProperties, arjunaContext) ;
+ participant.close(close, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -236,14 +229,14 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.close_2", new Object[] {instanceIdentifier}) ;
}
- sendClosed(addressingProperties, arjunaContext) ;
+ sendClosed(map, arjunaContext) ;
}
}
/**
* Compensate.
* @param compensate The compensate notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.compensate_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.compensate_1] - Unexpected exception thrown from compensate:
@@ -252,7 +245,7 @@
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.compensate_4 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.compensate_4] - Compensate request dropped pending WS-BA participant recovery manager scan for unknown participant: {0}
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.compensate_5 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.compensate_5] - Compensate request dropped pending registration of application-specific recovery module for WS-BA participant: {0}
*/
- public void compensate(final NotificationType compensate, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void compensate(final NotificationType compensate, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -278,7 +271,7 @@
{
try
{
- participant.compensate(compensate, addressingProperties, arjunaContext) ;
+ participant.compensate(compensate, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -308,20 +301,20 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.compensate_2", new Object[] {instanceIdentifier}) ;
}
- sendCompensated(addressingProperties, arjunaContext) ;
+ sendCompensated(map, arjunaContext) ;
}
}
/**
* Exited.
* @param exited The exited notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.exited_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.exited_1] - Unexpected exception thrown from exited:
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.exited_2 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.exited_2] - Exited called on unknown participant: {0}
*/
- public void exited(final NotificationType exited, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void exited(final NotificationType exited, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -330,7 +323,7 @@
{
try
{
- participant.exited(exited, addressingProperties, arjunaContext) ;
+ participant.exited(exited, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -349,13 +342,13 @@
/**
* Not Completed.
* @param notCompleted The not completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.notCompleted_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.notCompleted_1] - Unexpected exception thrown from notCompleted:
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.notCompleted_2 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.notCompleted_2] - Exited called on unknown participant: {0}
*/
- public void notCompleted(final NotificationType notCompleted, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void notCompleted(final NotificationType notCompleted, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -364,7 +357,7 @@
{
try
{
- participant.notCompleted(notCompleted, addressingProperties, arjunaContext) ;
+ participant.notCompleted(notCompleted, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -383,13 +376,13 @@
/**
* Failed.
* @param failed The failed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.failed_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.failed_1] - Unexpected exception thrown from failed:
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.failed_2 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.failed_2] - Failed called on unknown participant: {0}
*/
- public void failed(final NotificationType failed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void failed(final NotificationType failed, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -398,7 +391,7 @@
{
try
{
- participant.failed(failed, addressingProperties, arjunaContext) ;
+ participant.failed(failed, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -417,7 +410,7 @@
/**
* Get Status.
* @param getStatus The get status notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.getStatus_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.getStatus_1] - Unexpected exception thrown from getStatus:
@@ -425,7 +418,7 @@
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.getStatus_3 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.getStatus_3] - Unexpected exception while sending InvalidStateFault to coordinator for participant {0}
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.getStatus_4 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.getStatus_4] - GetStatus requested for unknown participant completion participant
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -434,7 +427,7 @@
{
try
{
- participant.getStatus(getStatus, addressingProperties, arjunaContext) ;
+ participant.getStatus(getStatus, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -453,13 +446,13 @@
// send an invalid state fault
final String messageId = MessageId.getMessageId();
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
try
{
final SoapFault11 soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_STATE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.getStatus_4")) ;
- AddressingHelper.installNoneReplyTo(faultAddressingProperties);
- SoapFaultClient.sendSoapFault(soapFault, faultAddressingProperties, getFaultAction()) ;
+ AddressingHelper.installNoneReplyTo(faultMAP);
+ SoapFaultClient.sendSoapFault(soapFault, faultMAP, getFaultAction()) ;
}
catch (final Throwable th)
{
@@ -471,32 +464,20 @@
}
}
- private static AttributedURI faultAction = null;
-
- private static synchronized AttributedURI getFaultAction()
+ private static String getFaultAction()
{
- if (faultAction == null) {
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-
- try {
- faultAction = builder.newURI(CoordinationConstants.WSCOOR_ACTION_FAULT);
- } catch (URISyntaxException e) {
- // TODO log error here
- }
- }
-
- return faultAction;
+ return CoordinationConstants.WSCOOR_ACTION_FAULT;
}
/**
* Status.
* @param status The status type.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.status_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.status_1] - Unexpected exception thrown from status:
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.status_2 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.status_2] - Status called on unknown participant: {0}
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final ParticipantCompletionParticipantInboundEvents participant = getParticipant(instanceIdentifier) ;
@@ -505,7 +486,7 @@
{
try
{
- participant.status(status, addressingProperties, arjunaContext) ;
+ participant.status(status, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -524,13 +505,13 @@
/**
* SOAP Fault.
* @param fault The SOAP fault notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.soapFault_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.soapFault_1] - Unexpected exception thrown from soapFault:
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.soapFault_2 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.soapFault_2] - SoapFault called on unknown participant: {0}
*/
- public void soapFault(final SoapFault fault, final AddressingProperties addressingProperties,
+ public void soapFault(final SoapFault fault, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -540,7 +521,7 @@
{
try
{
- participant.soapFault(fault, addressingProperties, arjunaContext) ;
+ participant.soapFault(fault, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -559,20 +540,20 @@
/**
* Send a cancelled message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.sendCancelled_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.sendCancelled_1] - Unexpected exception while sending Cancelled
*/
- private void sendCancelled(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendCancelled(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
// supply null endpoint to indicate that addressing properties should be used to route message
- ParticipantCompletionCoordinatorClient.getClient().sendCancelled(null, responseAddressingProperties, arjunaContext.getInstanceIdentifier()) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendCancelled(null, responseMAP, arjunaContext.getInstanceIdentifier()) ;
}
catch (final Throwable th)
{
@@ -586,20 +567,20 @@
/**
* Send a closed message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.sendClosed_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.sendClosed_1] - Unexpected exception while sending Closed
*/
- private void sendClosed(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendClosed(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
// supply null endpoint to indicate that addressing properties should be used to route message
- ParticipantCompletionCoordinatorClient.getClient().sendClosed(null, responseAddressingProperties, arjunaContext.getInstanceIdentifier()) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendClosed(null, responseMAP, arjunaContext.getInstanceIdentifier()) ;
}
catch (final Throwable th)
{
@@ -613,20 +594,20 @@
/**
* Send a compensated message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.sendCompensated_1 [com.arjuna.wst11.messaging.ParticipantCompletionParticipantProcessorImpl.sendCompensated_1] - Unexpected exception while sending Compensated
*/
- private void sendCompensated(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendCompensated(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createOneWayResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createOneWayResponseContext(map, messageId) ;
try
{
// supply null endpoint to indicate that addressing properties should be used to route message
- ParticipantCompletionCoordinatorClient.getClient().sendCompensated(null, responseAddressingProperties, arjunaContext.getInstanceIdentifier()) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendCompensated(null, responseMAP, arjunaContext.getInstanceIdentifier()) ;
}
catch (final Throwable th)
{
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantProcessorImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantProcessorImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -4,6 +4,7 @@
import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
@@ -13,8 +14,6 @@
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
import org.jboss.jbossts.xts.recovery.participant.at.XTSATRecoveryManager;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The Participant processor.
* @author kevin
@@ -70,7 +69,7 @@
/**
* Commit.
* @param commit The commit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.commit_1 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.commit_1] - Unexpected exception thrown from commit:
@@ -79,7 +78,7 @@
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.commit_4 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.commit_4] - Commit request dropped pending WS-AT participant recovery manager scan for unknown participant: {0}
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.commit_5 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.commit_5] - Commit request dropped pending registration of application-specific recovery module for WS-AT participant: {0}
*/
- public void commit(final Notification commit, final AddressingProperties addressingProperties,
+ public void commit(final Notification commit, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -105,7 +104,7 @@
{
try
{
- participant.commit(commit, addressingProperties, arjunaContext) ;
+ participant.commit(commit, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -135,20 +134,20 @@
{
WSTLogger.arjLoggerI18N.warn("com.arjuna.wst11.messaging.ParticipantProcessorImpl.commit_2", new Object[] {instanceIdentifier}) ;
}
- sendCommitted(addressingProperties, arjunaContext) ;
+ sendCommitted(map, arjunaContext) ;
}
}
/**
* Prepare.
* @param prepare The prepare notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.prepare_1 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.prepare_1] - Unexpected exception thrown from prepare:
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.prepare_2 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.prepare_2] - Prepare called on unknown participant: {0}
*/
- public void prepare(final Notification prepare, final AddressingProperties addressingProperties,
+ public void prepare(final Notification prepare, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -158,7 +157,7 @@
{
try
{
- participant.prepare(prepare, addressingProperties, arjunaContext) ;
+ participant.prepare(prepare, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -174,14 +173,14 @@
{
WSTLogger.arjLoggerI18N.warn("com.arjuna.wst11.messaging.ParticipantProcessorImpl.prepare_2", new Object[] {instanceIdentifier}) ;
}
- sendAborted(addressingProperties, arjunaContext) ;
+ sendAborted(map, arjunaContext) ;
}
}
/**
* Rollback.
* @param rollback The rollback notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.rollback_1 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.rollback_1] - Unexpected exception thrown from rollback:
@@ -190,7 +189,7 @@
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.rollback_4 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.rollback_4] - Rollback request dropped pending WS-AT participant recovery manager scan for unknown participant: {0}
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.rollback_5 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.rollback_5] - Rollback request dropped pending registration of application-specific recovery module for WS-AT participant: {0}
*/
- public void rollback(final Notification rollback, final AddressingProperties addressingProperties,
+ public void rollback(final Notification rollback, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -215,7 +214,7 @@
{
try
{
- participant.rollback(rollback, addressingProperties, arjunaContext) ;
+ participant.rollback(rollback, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -245,20 +244,20 @@
{
WSTLogger.arjLoggerI18N.warn("com.arjuna.wst11.messaging.ParticipantProcessorImpl.rollback_2", new Object[] {instanceIdentifier}) ;
}
- sendAborted(addressingProperties, arjunaContext) ;
+ sendAborted(map, arjunaContext) ;
}
}
/**
* SOAP Fault.
* @param fault The SOAP fault notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.soapFault_1 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.soapFault_1] - Unexpected exception thrown from soapFault:
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.soapFault_2 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.soapFault_2] - SoapFault called on unknown participant: {0}
*/
- public void soapFault(final SoapFault fault, final AddressingProperties addressingProperties,
+ public void soapFault(final SoapFault fault, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -268,7 +267,7 @@
{
try
{
- participant.soapFault(fault, addressingProperties, arjunaContext) ;
+ participant.soapFault(fault, map, arjunaContext) ;
}
catch (final Throwable th)
{
@@ -290,20 +289,20 @@
/**
* Send a committed message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.sendCommitted_1 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.sendCommitted_1] - Unexpected exception while sending Committed
*/
- private void sendCommitted(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendCommitted(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createResponseContext(map, messageId) ;
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
try
{
- CoordinatorClient.getClient().sendCommitted(null, responseAddressingProperties, instanceIdentifier) ;
+ CoordinatorClient.getClient().sendCommitted(null, responseMAP, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -317,20 +316,20 @@
/**
* Send an aborted message.
*
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.ParticipantProcessorImpl.sendAborted_1 [com.arjuna.wst11.messaging.ParticipantProcessorImpl.sendAborted_1] - Unexpected exception while sending Aborted
*/
- private void sendAborted(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendAborted(final MAP map, final ArjunaContext arjunaContext)
{
// KEV add check for recovery
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties responseAddressingProperties = AddressingHelper.createResponseContext(addressingProperties, messageId) ;
+ final MAP responseMAP = AddressingHelper.createResponseContext(map, messageId) ;
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
try
{
- CoordinatorClient.getClient().sendAborted(null, responseAddressingProperties, instanceIdentifier) ;
+ CoordinatorClient.getClient().sendAborted(null, responseMAP, instanceIdentifier) ;
}
catch (final Throwable th)
{
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/TerminationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/TerminationCoordinatorProcessorImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/TerminationCoordinatorProcessorImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -27,13 +27,12 @@
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsarjtx.client.TerminationParticipantClient;
import com.arjuna.webservices11.wsarjtx.processors.TerminationCoordinatorProcessor;
-import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
import com.arjuna.wsc11.messaging.MessageId;
import com.arjuna.wst.FaultedException;
import com.arjuna.wst.SystemException;
@@ -41,7 +40,6 @@
import com.arjuna.wst.UnknownTransactionException;
import com.arjuna.wst11.BusinessActivityTerminator;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.text.MessageFormat;
@@ -106,10 +104,10 @@
/**
* Cancel.
* @param cancel The cancel notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cancel(final NotificationType cancel, final AddressingProperties addressingProperties,
+ public void cancel(final NotificationType cancel, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -128,24 +126,24 @@
}
catch (final FaultedException fe)
{
- final AddressingProperties responseAddressingProperties = AddressingHelper.createNotificationContext(messageId) ;
- TerminationParticipantClient.getClient().sendFaulted(endpoint, responseAddressingProperties, instanceIdentifier) ;
+ final MAP responseMAP = AddressingHelper.createNotificationContext(messageId) ;
+ TerminationParticipantClient.getClient().sendFaulted(endpoint, responseMAP, instanceIdentifier) ;
}
catch (final UnknownTransactionException ute)
{
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_1")) ;
- TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultAddressingProperties, soapFault, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultMAP, soapFault, instanceIdentifier) ;
return ;
}
catch (final SystemException se)
{
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
final String pattern = WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_2") ;
final String message = MessageFormat.format(pattern, new Object[] {se}) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME, message) ;
- TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultAddressingProperties, soapFault, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultMAP, soapFault, instanceIdentifier) ;
return ;
}
catch (final Throwable th)
@@ -154,13 +152,13 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_3", th) ;
}
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
final SoapFault soapFault = new SoapFault11(th) ;
- TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultAddressingProperties, soapFault, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultMAP, soapFault, instanceIdentifier) ;
return ;
}
- final AddressingProperties responseAddressingProperties = AddressingHelper.createNotificationContext(messageId) ;
- TerminationParticipantClient.getClient().sendCancelled(endpoint, responseAddressingProperties, instanceIdentifier) ;
+ final MAP responseMAP = AddressingHelper.createNotificationContext(messageId) ;
+ TerminationParticipantClient.getClient().sendCancelled(endpoint, responseMAP, instanceIdentifier) ;
}
else
{
@@ -168,11 +166,11 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_4", new Object[] {instanceIdentifier}) ;
}
- final AddressingProperties faultAddressingProperties =
- AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
+ final MAP faultMAP =
+ AddressingHelper.createFaultContext(map, MessageId.getMessageId()) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_5")) ;
- TerminationParticipantClient.getClient().sendSoapFault(soapFault, faultAddressingProperties, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(soapFault, faultMAP, instanceIdentifier) ;
}
}
catch (Throwable throwable)
@@ -184,10 +182,10 @@
/**
* Close.
* @param close The close notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void close(final NotificationType close, final AddressingProperties addressingProperties,
+ public void close(final NotificationType close, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -206,27 +204,27 @@
}
catch (final UnknownTransactionException ute)
{
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_6")) ;
- TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultAddressingProperties, soapFault, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultMAP, soapFault, instanceIdentifier) ;
return ;
}
catch (final TransactionRolledBackException trbe)
{
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.TRANSACTIONROLLEDBACK_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_7")) ;
- TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultAddressingProperties, soapFault, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultMAP, soapFault, instanceIdentifier) ;
return ;
}
catch (final SystemException se)
{
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
final String pattern = WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_8") ;
final String message = MessageFormat.format(pattern, new Object[] {se}) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME, message) ;
- TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultAddressingProperties, soapFault, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultMAP, soapFault, instanceIdentifier) ;
return ;
}
catch (final Throwable th)
@@ -235,13 +233,13 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_9", th) ;
}
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, MessageId.getMessageId()) ;
final SoapFault soapFault = new SoapFault11(th) ;
- TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultAddressingProperties, soapFault, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultMAP, soapFault, instanceIdentifier) ;
return ;
}
- final AddressingProperties responseAddressingProperties = AddressingHelper.createNotificationContext(messageId) ;
- TerminationParticipantClient.getClient().sendClosed(endpoint, responseAddressingProperties, instanceIdentifier) ;
+ final MAP responseMAP = AddressingHelper.createNotificationContext(messageId) ;
+ TerminationParticipantClient.getClient().sendClosed(endpoint, responseMAP, instanceIdentifier) ;
}
else
{
@@ -249,11 +247,11 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_10", new Object[] {instanceIdentifier}) ;
}
- final AddressingProperties faultAddressingProperties =
- AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
+ final MAP faultMAP =
+ AddressingHelper.createFaultContext(map, MessageId.getMessageId()) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_11")) ;
- TerminationParticipantClient.getClient().sendSoapFault(soapFault, faultAddressingProperties, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(soapFault, faultMAP, instanceIdentifier) ;
}
}
catch (Throwable throwable)
@@ -265,10 +263,10 @@
/**
* Complete.
* @param complete The complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void complete(final NotificationType complete, final AddressingProperties addressingProperties,
+ public void complete(final NotificationType complete, final MAP map,
final ArjunaContext arjunaContext)
{
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
@@ -287,24 +285,24 @@
}
catch (final FaultedException fe)
{
- final AddressingProperties responseAddressingProperties = AddressingHelper.createNotificationContext(messageId) ;
- TerminationParticipantClient.getClient().sendFaulted(endpoint, responseAddressingProperties, instanceIdentifier) ;
+ final MAP responseMAP = AddressingHelper.createNotificationContext(messageId) ;
+ TerminationParticipantClient.getClient().sendFaulted(endpoint, responseMAP, instanceIdentifier) ;
}
catch (final UnknownTransactionException ute)
{
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_12")) ;
- TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultAddressingProperties, soapFault, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultMAP, soapFault, instanceIdentifier) ;
return ;
}
catch (final SystemException se)
{
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
final String pattern = WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_13") ;
final String message = MessageFormat.format(pattern, new Object[] {se}) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME, message) ;
- TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultAddressingProperties, soapFault, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultMAP, soapFault, instanceIdentifier) ;
return ;
}
catch (final Throwable th)
@@ -313,13 +311,13 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_14", th) ;
}
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, messageId) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, messageId) ;
final SoapFault soapFault = new SoapFault11(th) ;
- TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultAddressingProperties, soapFault, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(endpoint, faultMAP, soapFault, instanceIdentifier) ;
return ;
}
- final AddressingProperties responseAddressingProperties = AddressingHelper.createNotificationContext(messageId) ;
- TerminationParticipantClient.getClient().sendCompleted(endpoint, responseAddressingProperties, instanceIdentifier) ;
+ final MAP responseMAP = AddressingHelper.createNotificationContext(messageId) ;
+ TerminationParticipantClient.getClient().sendCompleted(endpoint, responseMAP, instanceIdentifier) ;
}
else
{
@@ -327,12 +325,12 @@
{
WSTLogger.arjLoggerI18N.debug("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_15", new Object[] {instanceIdentifier}) ;
}
- final AddressingProperties faultAddressingProperties =
- AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
+ final MAP faultMAP =
+ AddressingHelper.createFaultContext(map, MessageId.getMessageId()) ;
final SoapFault soapFault =
new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_16")) ;
- TerminationParticipantClient.getClient().sendSoapFault(soapFault, faultAddressingProperties, instanceIdentifier) ;
+ TerminationParticipantClient.getClient().sendSoapFault(soapFault, faultMAP, instanceIdentifier) ;
}
}
catch (Throwable throwable)
@@ -347,11 +345,11 @@
* kev's code just prints a log message?
*
* @param soapFault The soap fault
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
* @message com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_17 [com.arjuna.wst11.messaging.TerminationCoordinatorProcessorImpl_17] - Service {0} received unexpected fault: {1}
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext)
{
// in this case all we do is log a message
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,6 +25,7 @@
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices.util.TransportTimer;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
@@ -41,11 +42,7 @@
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.AddressingBuilder;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import java.net.URISyntaxException;
/**
* The coordinator completion coordinator state engine
@@ -128,7 +125,7 @@
/**
* Handle the cancelled event.
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -146,7 +143,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended
*/
- public void cancelled(final NotificationType cancelled, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void cancelled(final NotificationType cancelled, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -163,7 +160,7 @@
/**
* Handle the closed event.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -181,7 +178,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended
*/
- public void closed(final NotificationType closed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void closed(final NotificationType closed, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -197,7 +194,7 @@
/**
* Handle the compensated event.
* @param compensated The compensated notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -215,7 +212,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended
*/
- public void compensated(final NotificationType compensated, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void compensated(final NotificationType compensated, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -231,7 +228,7 @@
/**
* Handle the completed event.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -249,7 +246,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended
*/
- public void completed(final NotificationType completed, final AddressingProperties addressingProperties,
+ public void completed(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext)
{
final State current ;
@@ -283,7 +280,7 @@
/**
* Handle the exit event.
* @param exit The exit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Exiting
@@ -300,7 +297,7 @@
* Exiting -> Exiting
* Ended -> Ended (resend Exited)
*/
- public void exit(final NotificationType exit, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void exit(final NotificationType exit, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -327,7 +324,7 @@
/**
* Handle the fail event.
* @param fail The fail exception.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Failing-Active
@@ -374,7 +371,7 @@
* next time the coordinator calls cancel, compensate or close it receives a fault indicating a failure
* rather than just detecting that the pariticpant has ended.
*/
- public void fail(final ExceptionType fail, final AddressingProperties addressingProperties,
+ public void fail(final ExceptionType fail, final MAP map,
final ArjunaContext arjunaContext)
{
final State current ;
@@ -417,7 +414,7 @@
/**
* Handle the cannot complete event.
* @param cannotComplete The cannotComplete exception.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> NotComleting
@@ -435,7 +432,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended (resend NotCompleted)
*/
- public void cannotComplete(final NotificationType cannotComplete, final AddressingProperties addressingProperties,
+ public void cannotComplete(final NotificationType cannotComplete, final MAP map,
final ArjunaContext arjunaContext)
{
final State current ;
@@ -463,10 +460,10 @@
/**
* Handle the getStatus event.
* @param getStatus The getStatus notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -479,10 +476,10 @@
/**
* Handle the status event.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext)
{
// KEV - implement
}
@@ -714,10 +711,10 @@
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext)
{
ended() ;
try
@@ -736,10 +733,10 @@
*/
private void sendClose()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionParticipantClient.getClient().sendClose(participant, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionParticipantClient.getClient().sendClose(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -757,10 +754,10 @@
*/
private void sendCompensate()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionParticipantClient.getClient().sendCompensate(participant, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionParticipantClient.getClient().sendCompensate(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -778,10 +775,10 @@
*/
private void sendComplete()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionParticipantClient.getClient().sendComplete(participant, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionParticipantClient.getClient().sendComplete(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -799,10 +796,10 @@
*/
private void sendCancel()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionParticipantClient.getClient().sendCancel(participant, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionParticipantClient.getClient().sendCancel(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -820,10 +817,10 @@
*/
private void sendExited()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionParticipantClient.getClient().sendExited(participant, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionParticipantClient.getClient().sendExited(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -841,10 +838,10 @@
*/
private void sendFailed()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionParticipantClient.getClient().sendFailed(participant, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionParticipantClient.getClient().sendFailed(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -862,10 +859,10 @@
*/
private void sendNotCompleted()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionParticipantClient.getClient().sendNotCompleted(participant, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionParticipantClient.getClient().sendNotCompleted(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -883,10 +880,10 @@
*/
private void sendStatus(final State state)
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionParticipantClient.getClient().sendStatus(participant, addressingProperties, instanceIdentifier, state.getValue()) ;
+ CoordinatorCompletionParticipantClient.getClient().sendStatus(participant, map, instanceIdentifier, state.getValue()) ;
}
catch (final Throwable th)
{
@@ -905,13 +902,13 @@
*/
private void sendInvalidStateFault()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
final SoapFault11 soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_STATE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.engines.CoordinatorCompletionCoordinatorEngine.sendInvalidStateFault_2")) ;
- AddressingHelper.installNoneReplyTo(addressingProperties);
- SoapFaultClient.sendSoapFault(soapFault, participant, addressingProperties, getFaultAction()) ;
+ AddressingHelper.installNoneReplyTo(map);
+ SoapFaultClient.sendSoapFault(soapFault, participant, map, getFaultAction()) ;
}
catch (final Throwable th)
{
@@ -1118,27 +1115,15 @@
* Create a context for the outgoing message.
* @return The addressing context.
*/
- private AddressingProperties createContext()
+ private MAP createContext()
{
final String messageId = MessageId.getMessageId() ;
return AddressingHelper.createNotificationContext(messageId) ;
}
- private static AttributedURI faultAction = null;
-
- private static synchronized AttributedURI getFaultAction()
+ private static String getFaultAction()
{
- if (faultAction == null) {
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
-
- try {
- faultAction = builder.newURI(CoordinationConstants.WSCOOR_ACTION_FAULT);
- } catch (URISyntaxException e) {
- // TODO log error here
- }
- }
-
- return faultAction;
+ return CoordinationConstants.WSCOOR_ACTION_FAULT;
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionParticipantEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionParticipantEngine.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionParticipantEngine.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -24,6 +24,7 @@
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices.util.TransportTimer;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.CoordinatorCompletionParticipantInboundEvents;
@@ -41,7 +42,6 @@
import org.jboss.jbossts.xts11.recovery.participant.ba.BAParticipantRecoveryRecord;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.util.TimerTask;
@@ -157,7 +157,7 @@
/**
* Handle the cancel event.
* @param cancel The cancel notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Canceling
@@ -174,7 +174,7 @@
* Exiting -> Exiting (resend Exit)
* Ended -> Ended (send Canceled)
*/
- public void cancel(final NotificationType cancel, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void cancel(final NotificationType cancel, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -220,7 +220,7 @@
/**
* Handle the close event.
* @param close The close notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -237,7 +237,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended (send Closed)
*/
- public void close(final NotificationType close, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void close(final NotificationType close, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -266,7 +266,7 @@
/**
* Handle the compensate event.
* @param compensate The compensate notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -283,7 +283,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended (send Compensated)
*/
- public void compensate(final NotificationType compensate, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void compensate(final NotificationType compensate, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -316,7 +316,7 @@
/**
* Handle the complete event.
* @param complete The complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Completing
@@ -333,7 +333,7 @@
* Exiting -> Exiting (resend Exit)
* Ended -> Ended (send Fail)
*/
- public void complete(final NotificationType complete, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void complete(final NotificationType complete, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -371,7 +371,7 @@
/**
* Handle the exited event.
* @param exited The exited notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -388,7 +388,7 @@
* Exiting -> Ended
* Ended -> Ended
*/
- public void exited(final NotificationType exited, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void exited(final NotificationType exited, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -404,7 +404,7 @@
/**
* Handle the failed event.
* @param failed The failed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -422,7 +422,7 @@
* Ended -> Ended
* @message com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine.failed_1 [com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine.failed_1] - Unable to delete recovery record during failed for WS-BA participant {0}
*/
- public void failed(final NotificationType failed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void failed(final NotificationType failed, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
boolean deleteRequired = false;
@@ -452,7 +452,7 @@
/**
* Handle the not completed event.
* @param notCompleted The not completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -469,7 +469,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended
*/
- public void notCompleted(final NotificationType notCompleted, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void notCompleted(final NotificationType notCompleted, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -485,12 +485,12 @@
/**
* Handle the getStatus event.
* @param getStatus The getStatus notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine.getStatus_1 [com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine.getStatus_1] - Unknown error: {0}
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -503,10 +503,10 @@
/**
* Handle the status event.
* @param status The status type.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext)
{
// TODO -- check that the status is actually what we expect
@@ -547,13 +547,13 @@
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
* @message com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine.soapFault_1 [com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine.soapFault_1] - Unable to delete recovery record during soapFault processing for WS-BA participant {0}
* @message com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine.soapFault_2 [com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine.soapFault_2] - Cancelling participant {0}
* @message com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine.soapFault_3 [com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine.soapFault_3] - Notifying unexpected error for participant {0}
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext)
{
boolean deleteRequired;
boolean checkingStatus;
@@ -858,10 +858,10 @@
*/
private void sendExit()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionCoordinatorClient.getClient().sendExit(coordinator, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendExit(coordinator, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -888,14 +888,14 @@
*/
private void sendCompleted(boolean timedOut)
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
// if we are trying to reestablish the participant state then send getStatus otherwise send completed
if (timedOut && checkStatus) {
- CoordinatorCompletionCoordinatorClient.getClient().sendGetStatus(coordinator, addressingProperties, instanceIdentifier); ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendGetStatus(coordinator, map, instanceIdentifier); ;
} else {
- CoordinatorCompletionCoordinatorClient.getClient().sendCompleted(coordinator, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendCompleted(coordinator, map, instanceIdentifier) ;
}
}
catch (final Throwable th)
@@ -950,10 +950,10 @@
*/
private void sendFail(final QName message)
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionCoordinatorClient.getClient().sendFail(coordinator, addressingProperties, instanceIdentifier, message) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendFail(coordinator, map, instanceIdentifier, message) ;
}
catch (final Throwable th)
{
@@ -971,10 +971,10 @@
*/
private void sendCancelled()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionCoordinatorClient.getClient().sendCancelled(coordinator, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendCancelled(coordinator, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -992,10 +992,10 @@
*/
private void sendClosed()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionCoordinatorClient.getClient().sendClosed(coordinator, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendClosed(coordinator, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -1013,10 +1013,10 @@
*/
private void sendCompensated()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionCoordinatorClient.getClient().sendCompensated(coordinator, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendCompensated(coordinator, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -1035,10 +1035,10 @@
*/
private void sendStatus(final State state)
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionCoordinatorClient.getClient().sendStatus(coordinator, addressingProperties, instanceIdentifier, state.getValue()) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendStatus(coordinator, map, instanceIdentifier, state.getValue()) ;
}
catch (final Throwable th)
{
@@ -1056,10 +1056,10 @@
*/
private void sendCannotComplete()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- CoordinatorCompletionCoordinatorClient.getClient().sendCannotComplete(coordinator, addressingProperties, instanceIdentifier) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendCannotComplete(coordinator, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -1460,7 +1460,7 @@
* Create a context for the outgoing message.
* @return The addressing context.
*/
- private AddressingProperties createContext()
+ private MAP createContext()
{
final String messageId = MessageId.getMessageId() ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorEngine.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorEngine.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,6 +6,7 @@
import com.arjuna.webservices.util.TransportTimer;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.CoordinatorInboundEvents;
@@ -17,7 +18,6 @@
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.util.TimerTask;
@@ -101,7 +101,7 @@
/**
* Handle the aborted event.
* @param aborted The aborted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* None -> None (ignore)
@@ -111,7 +111,7 @@
* Committing -> Committing (invalid state)
* Aborting -> Aborting (forget)
*/
- public synchronized void aborted(final Notification aborted, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public synchronized void aborted(final Notification aborted, final MAP map, final ArjunaContext arjunaContext)
{
final State current = state ;
if (current == State.STATE_ACTIVE)
@@ -127,7 +127,7 @@
/**
* Handle the committed event.
* @param committed The committed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* None -> None (ignore)
@@ -137,7 +137,7 @@
* Committing -> Committing (forget)
* Aborting -> Aborting (invalid state)
*/
- public synchronized void committed(final Notification committed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public synchronized void committed(final Notification committed, final MAP map, final ArjunaContext arjunaContext)
{
final State current = state ;
if (current == State.STATE_ACTIVE)
@@ -153,7 +153,7 @@
/**
* Handle the prepared event.
* @param prepared The prepared notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* None -> Durable: (send rollback), Volatile: Invalid state: none
@@ -163,7 +163,7 @@
* Committing -> Committing (resend Commit)
* Aborting -> Aborting (resend Rollback and forget)
*/
- public void prepared(final Notification prepared, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void prepared(final Notification prepared, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -187,7 +187,7 @@
if (durable) {
sendRollback();
} else {
- sendUnknownTransaction(addressingProperties, arjunaContext) ;
+ sendUnknownTransaction(map, arjunaContext) ;
}
forget();
}
@@ -199,7 +199,7 @@
}
else
{
- sendUnknownTransaction(addressingProperties, arjunaContext) ;
+ sendUnknownTransaction(map, arjunaContext) ;
}
}
}
@@ -207,7 +207,7 @@
/**
* Handle the readOnly event.
* @param readOnly The readOnly notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* None -> None (ignore)
@@ -217,7 +217,7 @@
* Committing -> Committing (invalid state)
* Aborting -> Aborting (forget)
*/
- public synchronized void readOnly(final Notification readOnly, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public synchronized void readOnly(final Notification readOnly, final MAP map, final ArjunaContext arjunaContext)
{
final State current = state ;
if ((current == State.STATE_ACTIVE) || (current == State.STATE_PREPARING) ||
@@ -234,12 +234,12 @@
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.engines.CoordinatorEngine.soapFault_1 [com.arjuna.wst11.messaging.engines.CoordinatorEngine.soapFault_1] - Unexpected SOAP fault for coordinator {0}: {1} {2}
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext)
{
if (WSTLogger.arjLoggerI18N.isDebugEnabled())
{
@@ -692,16 +692,16 @@
* @message com.arjuna.wst11.messaging.engines.CoordinatorEngine.sendUnknownTransaction_1 [com.arjuna.wst11.messaging.engines.CoordinatorEngine.sendUnknownTransaction_1] - Unknown transaction
* @message com.arjuna.wst11.messaging.engines.CoordinatorEngine.sendUnknownTransaction_2 [com.arjuna.wst11.messaging.engines.CoordinatorEngine.sendUnknownTransaction_2] - Unexpected exception while sending UnknownTransaction for participant {0}
*/
- private void sendUnknownTransaction(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ private void sendUnknownTransaction(final MAP map, final ArjunaContext arjunaContext)
{
try
{
- final AddressingProperties faultAddressingProperties = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
+ final MAP faultMAP = AddressingHelper.createFaultContext(map, MessageId.getMessageId()) ;
final InstanceIdentifier instanceIdentifier = arjunaContext.getInstanceIdentifier() ;
final String message = WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.engines.CoordinatorEngine.sendUnknownTransaction_1") ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, AtomicTransactionConstants.WSAT_ERROR_CODE_UNKNOWN_TRANSACTION_QNAME, message) ;
- ParticipantClient.getClient().sendSoapFault(faultAddressingProperties, soapFault, instanceIdentifier) ;
+ ParticipantClient.getClient().sendSoapFault(faultMAP, soapFault, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -764,7 +764,7 @@
* Create a context for the outgoing message.
* @return The addressing context.
*/
- private AddressingProperties createContext()
+ private MAP createContext()
{
final String messageId = MessageId.getMessageId() ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -24,6 +24,7 @@
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices.util.TransportTimer;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.ParticipantCompletionCoordinatorInboundEvents;
@@ -37,7 +38,6 @@
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
/**
@@ -121,7 +121,7 @@
/**
* Handle the cancelled event.
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -136,7 +136,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended
*/
- public void cancelled(final NotificationType cancelled, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void cancelled(final NotificationType cancelled, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -152,7 +152,7 @@
/**
* Handle the closed event.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -167,7 +167,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended
*/
- public void closed(final NotificationType closed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void closed(final NotificationType closed, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -183,7 +183,7 @@
/**
* Handle the compensated event.
* @param compensated The compensated notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -198,7 +198,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended
*/
- public void compensated(final NotificationType compensated, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void compensated(final NotificationType compensated, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -214,7 +214,7 @@
/**
* Handle the completed event.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Completed
@@ -229,7 +229,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended
*/
- public void completed(final NotificationType completed, final AddressingProperties addressingProperties,
+ public void completed(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext)
{
final State current ;
@@ -259,7 +259,7 @@
/**
* Handle the exit event.
* @param exit The exit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Exiting
@@ -274,7 +274,7 @@
* Exiting -> Exiting
* Ended -> Ended (resend Exited)
*/
- public void exit(final NotificationType exit, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void exit(final NotificationType exit, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -299,7 +299,7 @@
/**
* Handle the fail event.
* @param fail The fail exception.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Failing-Active
@@ -343,7 +343,7 @@
* next time the coordinator calls cancel, compensate or close it receives a fault indicating a failure
* rather than just detecting that the pariticpant has ended.
*/
- public void fail(final ExceptionType fail, final AddressingProperties addressingProperties,
+ public void fail(final ExceptionType fail, final MAP map,
final ArjunaContext arjunaContext)
{
final State current ;
@@ -380,7 +380,7 @@
/**
* Handle the cannot complete event.
* @param cannotComplete The cannotComplete exception.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> NotCompleting
@@ -395,7 +395,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended (resend NotCompleted)
*/
- public void cannotComplete(final NotificationType cannotComplete, final AddressingProperties addressingProperties,
+ public void cannotComplete(final NotificationType cannotComplete, final MAP map,
final ArjunaContext arjunaContext)
{
final State current ;
@@ -420,10 +420,10 @@
/**
* Handle the getStatus event.
* @param getStatus The getStatus notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -436,10 +436,10 @@
/**
* Handle the status event.
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext)
{
// TODO - is this correct?
@@ -621,10 +621,10 @@
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext)
{
ended() ;
try
@@ -641,10 +641,10 @@
*/
private void sendClose()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionParticipantClient.getClient().sendClose(participant, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionParticipantClient.getClient().sendClose(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -662,10 +662,10 @@
*/
private void sendCompensate()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionParticipantClient.getClient().sendCompensate(participant, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionParticipantClient.getClient().sendCompensate(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -683,10 +683,10 @@
*/
private void sendCancel()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionParticipantClient.getClient().sendCancel(participant, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionParticipantClient.getClient().sendCancel(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -704,10 +704,10 @@
*/
private void sendExited()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionParticipantClient.getClient().sendExited(participant, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionParticipantClient.getClient().sendExited(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -725,10 +725,10 @@
*/
private void sendFailed()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionParticipantClient.getClient().sendFailed(participant, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionParticipantClient.getClient().sendFailed(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -746,10 +746,10 @@
*/
private void sendNotCompleted()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionParticipantClient.getClient().sendNotCompleted(participant, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionParticipantClient.getClient().sendNotCompleted(participant, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -768,10 +768,10 @@
*/
private void sendStatus(final State state)
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionParticipantClient.getClient().sendStatus(participant, addressingProperties, instanceIdentifier, state.getValue()) ;
+ ParticipantCompletionParticipantClient.getClient().sendStatus(participant, map, instanceIdentifier, state.getValue()) ;
}
catch (final Throwable th)
{
@@ -976,7 +976,7 @@
* Create a context for the outgoing message.
* @return The addressing context.
*/
- private AddressingProperties createContext()
+ private MAP createContext()
{
final String messageId = MessageId.getMessageId() ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionParticipantEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionParticipantEngine.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionParticipantEngine.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -24,6 +24,7 @@
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices.util.TransportTimer;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.ParticipantCompletionParticipantInboundEvents;
@@ -41,7 +42,6 @@
import org.jboss.jbossts.xts.recovery.participant.ba.XTSBARecoveryManager;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.util.TimerTask;
@@ -157,7 +157,7 @@
/**
* Handle the cancel event.
* @param cancel The cancel notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Canceling
@@ -172,7 +172,7 @@
* Exiting -> Exiting (resend Exit)
* Ended -> Ended (resend Cancelled)
*/
- public void cancel(final NotificationType cancel, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void cancel(final NotificationType cancel, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -213,7 +213,7 @@
/**
* Handle the close event.
* @param close The close notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -228,7 +228,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended (send Closed)
*/
- public void close(final NotificationType close, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void close(final NotificationType close, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -257,7 +257,7 @@
/**
* Handle the compensate event.
* @param compensate The compensate notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -272,7 +272,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended (send Compensated)
*/
- public void compensate(final NotificationType compensate, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void compensate(final NotificationType compensate, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -305,7 +305,7 @@
/**
* Handle the exited event.
* @param exited The exited notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -320,7 +320,7 @@
* Exiting -> Ended
* Ended -> Ended
*/
- public void exited(final NotificationType exited, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void exited(final NotificationType exited, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -336,7 +336,7 @@
/**
* Handle the failed event.
* @param failed The failed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -352,7 +352,7 @@
* Ended -> Ended
* @message com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine.failed_1 [com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine.failed_1] - Unable to delete recovery record during failed for WS-BA participant {0}
*/
- public void failed(final NotificationType failed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void failed(final NotificationType failed, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
boolean deleteRequired = false;
@@ -382,7 +382,7 @@
/**
* Handle the not completed event.
* @param notCompleted The notCompleted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* Active -> Active (invalid state)
@@ -397,7 +397,7 @@
* Exiting -> Exiting (invalid state)
* Ended -> Ended
*/
- public void notCompleted(final NotificationType notCompleted, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void notCompleted(final NotificationType notCompleted, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -413,12 +413,12 @@
/**
* Handle the getStatus event.
* @param getStatus The getStatus notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine.getStatus_1 [com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine.getStatus_1] - Unknown error: {0}
*/
- public void getStatus(final NotificationType getStatus, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void getStatus(final NotificationType getStatus, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -431,10 +431,10 @@
/**
* Handle the status event.
* @param status The status type.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(final StatusType status, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void status(final StatusType status, final MAP map, final ArjunaContext arjunaContext)
{
// TODO -- check that the status is actually what we expect
@@ -475,13 +475,13 @@
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
* @message com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine.soapFault_1 [com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine.soapFault_1] - Unable to delete recovery record during soapFault processing for WS-BA participant {0}
* @message com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine.soapFault_2 [com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine.soapFault_2] - Cancelling participant {0}
* @message com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine.soapFault_3 [com.arjuna.wst11.messaging.engines.ParticipantCompletionParticipantEngine.soapFault_3] - Notifying unexpected error for participant {0}
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext)
{
boolean deleteRequired;
boolean checkingStatus;
@@ -768,10 +768,10 @@
*/
private void sendExit()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionCoordinatorClient.getClient().sendExit(coordinator, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendExit(coordinator, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -799,14 +799,14 @@
*/
private void sendCompleted(boolean timedOut)
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
// if we are trying to reestablish the participant state then send getStatus otherwise send completed
if (timedOut && checkStatus) {
- ParticipantCompletionCoordinatorClient.getClient().sendGetStatus(coordinator, addressingProperties, instanceIdentifier); ;
+ ParticipantCompletionCoordinatorClient.getClient().sendGetStatus(coordinator, map, instanceIdentifier); ;
} else {
- ParticipantCompletionCoordinatorClient.getClient().sendCompleted(coordinator, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendCompleted(coordinator, map, instanceIdentifier) ;
}
}
catch (final Throwable th)
@@ -861,10 +861,10 @@
*/
private void sendFail(final QName message)
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionCoordinatorClient.getClient().sendFail(coordinator, addressingProperties, instanceIdentifier, message) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendFail(coordinator, map, instanceIdentifier, message) ;
}
catch (final Throwable th)
{
@@ -882,10 +882,10 @@
*/
private void sendCancelled()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionCoordinatorClient.getClient().sendCancelled(coordinator, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendCancelled(coordinator, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -903,10 +903,10 @@
*/
private void sendClosed()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionCoordinatorClient.getClient().sendClosed(coordinator, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendClosed(coordinator, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -924,10 +924,10 @@
*/
private void sendCompensated()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionCoordinatorClient.getClient().sendCompensated(coordinator, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendCompensated(coordinator, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -946,10 +946,10 @@
*/
private void sendStatus(final State state)
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionCoordinatorClient.getClient().sendStatus(coordinator, addressingProperties, instanceIdentifier, state.getValue()) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendStatus(coordinator, map, instanceIdentifier, state.getValue()) ;
}
catch (final Throwable th)
{
@@ -967,10 +967,10 @@
*/
private void sendCannotComplete()
{
- final AddressingProperties addressingProperties = createContext() ;
+ final MAP map = createContext() ;
try
{
- ParticipantCompletionCoordinatorClient.getClient().sendCannotComplete(coordinator, addressingProperties, instanceIdentifier) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendCannotComplete(coordinator, map, instanceIdentifier) ;
}
catch (final Throwable th)
{
@@ -1266,7 +1266,7 @@
* Create a context for the outgoing message.
* @return The addressing context.
*/
- private AddressingProperties createContext()
+ private MAP createContext()
{
final String messageId = MessageId.getMessageId() ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantEngine.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantEngine.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -5,6 +5,7 @@
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices.util.TransportTimer;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
@@ -20,7 +21,6 @@
import org.jboss.jbossts.xts.recovery.participant.at.XTSATRecoveryManager;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.util.TimerTask;
@@ -114,7 +114,7 @@
/**
* Handle the commit event.
* @param commit The commit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* None -> None (send committed)
@@ -124,7 +124,7 @@
* Committing -> Committing (do nothing)
* Aborting -> Aborting (do nothing)
*/
- public void commit(final Notification commit, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void commit(final Notification commit, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -157,7 +157,7 @@
/**
* Handle the prepare event.
* @param prepare The prepare notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* None -> None (send aborted)
@@ -167,7 +167,7 @@
* Committing -> Committing (ignore)
* Aborting -> Aborting (send aborted and forget)
*/
- public void prepare(final Notification prepare, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void prepare(final Notification prepare, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -197,7 +197,7 @@
/**
* Handle the rollback event.
* @param rollback The rollback notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* None -> None (send aborted)
@@ -209,7 +209,7 @@
*
* @message com.arjuna.wst11.messaging.engines.ParticipantEngine.rollback_1 [com.arjuna.wst11.messaging.engines.ParticipantEngine.rollback_1] could not delete recovery record for participant {0}
*/
- public void rollback(final Notification rollback, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void rollback(final Notification rollback, final MAP map, final ArjunaContext arjunaContext)
{
final State current ;
synchronized(this)
@@ -324,14 +324,14 @@
/**
* Handle the soap fault event.
* @param soapFault The soap fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*
* @message com.arjuna.wst11.messaging.engines.ParticipantEngine.soapFault_1 [com.arjuna.wst11.messaging.engines.ParticipantEngine.soapFault_1] - Unexpected SOAP fault for participant {0}: {1} {2}
* @message com.arjuna.wst11.messaging.engines.ParticipantEngine.soapFault_2 [com.arjuna.wst11.messaging.engines.ParticipantEngine.soapFault_2] - Unrecoverable error for participant {0} : {1} {2}
* @message com.arjuna.wst11.messaging.engines.ParticipantEngine.soapFault_3 [com.arjuna.wst11.messaging.engines.ParticipantEngine.soapFault_3] - Unable to delete recovery record at commit for participant {0}
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext)
{
if (WSTLogger.arjLoggerI18N.isDebugEnabled())
{
@@ -718,7 +718,7 @@
*/
private void sendCommitted()
{
- final AddressingProperties responseAddressingContext = createContext() ;
+ final MAP responseAddressingContext = createContext() ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier(id) ;
try
{
@@ -750,7 +750,7 @@
*/
private void sendPrepared(boolean timedOut)
{
- final AddressingProperties responseAddressingContext = createContext() ;
+ final MAP responseAddressingContext = createContext() ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier(id) ;
try
{
@@ -797,7 +797,7 @@
*/
private void sendAborted()
{
- final AddressingProperties responseAddressingContext = createContext() ;
+ final MAP responseAddressingContext = createContext() ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier(id) ;
try
{
@@ -819,7 +819,7 @@
*/
private void sendReadOnly()
{
- final AddressingProperties responseAddressingContext = createContext() ;
+ final MAP responseAddressingContext = createContext() ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier(id) ;
try
{
@@ -863,7 +863,7 @@
* Create a response context from the incoming context.
* @return The addressing context.
*/
- private AddressingProperties createContext()
+ private MAP createContext()
{
final String messageId = MessageId.getMessageId() ;
return AddressingHelper.createNotificationContext(messageId) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -32,14 +32,13 @@
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsarjtx.client.TerminationCoordinatorClient;
import com.arjuna.webservices11.wsarjtx.processors.TerminationParticipantCallback;
import com.arjuna.webservices11.wsarjtx.processors.TerminationParticipantProcessor;
-import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
import com.arjuna.wsc11.messaging.MessageId;
import com.arjuna.wst.FaultedException;
import com.arjuna.wst.SystemException;
@@ -48,7 +47,6 @@
import com.arjuna.wst11.BusinessActivityTerminator;
import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
public class BusinessActivityTerminatorStub implements BusinessActivityTerminator
@@ -66,14 +64,14 @@
public void close ()
throws TransactionRolledBackException, UnknownTransactionException, SystemException
{
- final AddressingProperties addressingProperties = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
+ final MAP map = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
final RequestCallback callback = new RequestCallback() ;
final TerminationParticipantProcessor terminationParticipantProcessor = TerminationParticipantProcessor.getProcessor() ;
terminationParticipantProcessor.registerCallback(_id, callback) ;
try
{
- TerminationCoordinatorClient.getClient().sendClose(_terminationCoordinator, addressingProperties, new InstanceIdentifier(_id)) ;
+ TerminationCoordinatorClient.getClient().sendClose(_terminationCoordinator, map, new InstanceIdentifier(_id)) ;
callback.waitUntilTriggered() ;
}
catch (final Throwable th)
@@ -111,14 +109,14 @@
public void cancel ()
throws FaultedException, UnknownTransactionException, SystemException
{
- final AddressingProperties addressingProperties = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
+ final MAP map = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
final RequestCallback callback = new RequestCallback() ;
final TerminationParticipantProcessor terminationParticipantProcessor = TerminationParticipantProcessor.getProcessor() ;
terminationParticipantProcessor.registerCallback(_id, callback) ;
try
{
- TerminationCoordinatorClient.getClient().sendCancel(_terminationCoordinator, addressingProperties, new InstanceIdentifier(_id)) ;
+ TerminationCoordinatorClient.getClient().sendCancel(_terminationCoordinator, map, new InstanceIdentifier(_id)) ;
callback.waitUntilTriggered() ;
}
catch (final Throwable th)
@@ -156,14 +154,14 @@
public void complete ()
throws FaultedException, UnknownTransactionException, SystemException
{
- final AddressingProperties addressingProperties = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
+ final MAP map = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
final RequestCallback callback = new RequestCallback() ;
final TerminationParticipantProcessor terminationParticipantProcessor = TerminationParticipantProcessor.getProcessor() ;
terminationParticipantProcessor.registerCallback(_id, callback) ;
try
{
- TerminationCoordinatorClient.getClient().sendComplete(_terminationCoordinator, addressingProperties, new InstanceIdentifier(_id)) ;
+ TerminationCoordinatorClient.getClient().sendComplete(_terminationCoordinator, map, new InstanceIdentifier(_id)) ;
callback.waitUntilTriggered() ;
}
catch (final Throwable th)
@@ -220,12 +218,12 @@
public void error ()
throws SystemException
{
- final AddressingProperties addressingProperties = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
+ final MAP map = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME,
WSTLogger.log_mesg.getString("com.arjuna.wst11.stub.BusinessActivityTerminatorStub_1")) ;
try
{
- TerminationCoordinatorClient.getClient().sendSoapFault(_terminationCoordinator, addressingProperties, soapFault, new InstanceIdentifier(_id)) ;
+ TerminationCoordinatorClient.getClient().sendSoapFault(_terminationCoordinator, map, soapFault, new InstanceIdentifier(_id)) ;
}
catch (final Throwable th)
{
@@ -238,7 +236,7 @@
/**
* The addressing context.
*/
- private AddressingProperties addressingProperties ;
+ private MAP map ;
/**
* The arjuna context.
*/
@@ -268,9 +266,9 @@
* Get the addressing context.
* @return The addressing context.
*/
- AddressingProperties getAddressingProperties()
+ MAP getAddressingProperties()
{
- return addressingProperties ;
+ return map ;
}
/**
@@ -330,72 +328,72 @@
/**
* A completed response.
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void completed(final NotificationType completed, final AddressingProperties addressingProperties,
+ public void completed(final NotificationType completed, final MAP map,
final ArjunaContext arjunaContext)
{
this.completed = true ;
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
/**
* A cancelled response.
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cancelled(final NotificationType cancelled, final AddressingProperties addressingProperties,
+ public void cancelled(final NotificationType cancelled, final MAP map,
final ArjunaContext arjunaContext)
{
this.cancelled = true ;
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
/**
* A closed response.
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void closed(final NotificationType closed, final AddressingProperties addressingProperties,
+ public void closed(final NotificationType closed, final MAP map,
final ArjunaContext arjunaContext)
{
this.closed = true ;
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
/**
* A faulted response.
* @param faulted The faulted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void faulted(final NotificationType faulted, final AddressingProperties addressingProperties,
+ public void faulted(final NotificationType faulted, final MAP map,
final ArjunaContext arjunaContext)
{
// TODO - convert wsdl to use NotificationType instead of ExceptionType
this.faulted = true ;
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
/**
* A SOAP fault response.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext)
{
// TODO - pass soap fault to this callback
this.soapFault = soapFault ;
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessAgreementWithCoordinatorCompletionStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessAgreementWithCoordinatorCompletionStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessAgreementWithCoordinatorCompletionStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -48,7 +48,6 @@
import com.arjuna.wst.SystemException;
import com.arjuna.wst.WrongStateException;
import com.arjuna.wst11.messaging.engines.CoordinatorCompletionCoordinatorEngine;
-import com.arjuna.wst11.messaging.CoordinatorCompletionCoordinatorProcessorImpl;
public class BusinessAgreementWithCoordinatorCompletionStub implements BusinessAgreementWithCoordinatorCompletionParticipant, PersistableParticipant
{
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessAgreementWithParticipantCompletionStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessAgreementWithParticipantCompletionStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessAgreementWithParticipantCompletionStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -48,7 +48,6 @@
import com.arjuna.wst.SystemException;
import com.arjuna.wst.WrongStateException;
import com.arjuna.wst11.messaging.engines.ParticipantCompletionCoordinatorEngine;
-import com.arjuna.wst11.messaging.ParticipantCompletionCoordinatorProcessorImpl;
public class BusinessAgreementWithParticipantCompletionStub implements BusinessAgreementWithParticipantCompletionParticipant, PersistableParticipant
{
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/CompletionStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/CompletionStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/CompletionStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -3,13 +3,12 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.client.CompletionCoordinatorClient;
import com.arjuna.webservices11.wsat.processors.CompletionInitiatorCallback;
import com.arjuna.webservices11.wsat.processors.CompletionInitiatorProcessor;
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.wsc11.messaging.MessageId;
import com.arjuna.wst.SystemException;
import com.arjuna.wst.TransactionRolledBackException;
@@ -17,7 +16,6 @@
import com.arjuna.wst.CompletionCoordinatorParticipant;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
public class CompletionStub implements
@@ -36,14 +34,14 @@
public void commit () throws TransactionRolledBackException,
UnknownTransactionException, SystemException
{
- final AddressingProperties addressingProperties = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
+ final MAP map = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
final CompletionStub.RequestCallback callback = new CompletionStub.RequestCallback() ;
final CompletionInitiatorProcessor completionInitiator = CompletionInitiatorProcessor.getProcessor() ;
completionInitiator.registerCallback(_id, callback) ;
try
{
- CompletionCoordinatorClient.getClient().sendCommit(_completionCoordinator, addressingProperties, new InstanceIdentifier(_id)) ;
+ CompletionCoordinatorClient.getClient().sendCommit(_completionCoordinator, map, new InstanceIdentifier(_id)) ;
callback.waitUntilTriggered() ;
}
catch (final Throwable th)
@@ -78,14 +76,14 @@
public void rollback () throws UnknownTransactionException, SystemException
{
- final AddressingProperties addressingProperties = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
+ final MAP map = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
final CompletionStub.RequestCallback callback = new CompletionStub.RequestCallback() ;
final CompletionInitiatorProcessor completionInitiator = CompletionInitiatorProcessor.getProcessor() ;
completionInitiator.registerCallback(_id, callback) ;
try
{
- CompletionCoordinatorClient.getClient().sendRollback(_completionCoordinator, addressingProperties, new InstanceIdentifier(_id)) ;
+ CompletionCoordinatorClient.getClient().sendRollback(_completionCoordinator, map, new InstanceIdentifier(_id)) ;
callback.waitUntilTriggered() ;
}
catch (final Throwable th)
@@ -119,7 +117,7 @@
/**
* The addressing context.
*/
- private AddressingProperties addressingProperties ;
+ private MAP map ;
/**
* The arjuna context.
*/
@@ -141,9 +139,9 @@
* Get the addressing context.
* @return The addressing context.
*/
- AddressingProperties getAddressingProperties()
+ MAP getMAP()
{
- return addressingProperties ;
+ return map ;
}
/**
@@ -185,42 +183,42 @@
/**
* A aborted response.
* @param aborted The aborted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void aborted(final Notification aborted, final AddressingProperties addressingProperties,
+ public void aborted(final Notification aborted, final MAP map,
final ArjunaContext arjunaContext)
{
this.aborted = true ;
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
/**
* An committed response.
* @param committed The committed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void committed(final Notification committed, final AddressingProperties addressingProperties,
+ public void committed(final Notification committed, final MAP map,
final ArjunaContext arjunaContext)
{
this.committed = true ;
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
/**
* A SOAP fault response.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext)
{
this.soapFault = soapFault ;
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/Durable2PCStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/Durable2PCStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/Durable2PCStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,7 +1,6 @@
package com.arjuna.wst11.stub;
import com.arjuna.wst.Durable2PCParticipant;
-import com.arjuna.wst11.stub.ParticipantStub;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/ParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/ParticipantStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/ParticipantStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -5,7 +5,6 @@
import com.arjuna.wst11.messaging.engines.CoordinatorEngine;
import com.arjuna.wst11.messaging.CoordinatorProcessorImpl;
import com.arjuna.webservices11.wsat.State;
-import com.arjuna.webservices11.wsat.processors.CoordinatorProcessor;
import com.arjuna.webservices11.util.StreamHelper;
import com.arjuna.webservices.soap.SoapUtils;
import com.arjuna.webservices.logging.WSTLogger;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/Volatile2PCStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/Volatile2PCStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/Volatile2PCStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,7 +1,6 @@
package com.arjuna.wst11.stub;
import com.arjuna.wst.Volatile2PCParticipant;
-import com.arjuna.wst11.stub.ParticipantStub;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionCoordinatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionCoordinatorPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionCoordinatorPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "CompletionCoordinatorPortType", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface CompletionCoordinatorPortType {
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionCoordinatorService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionCoordinatorService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionCoordinatorService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "CompletionCoordinatorService", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06", wsdlLocation = "wsdl/wsat-completion-coordinator-binding.wsdl")
public class CompletionCoordinatorService
- extends Service21
+ extends Service
{
private final static URL COMPLETIONCOORDINATORSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CompletionCoordinatorPortType"), CompletionCoordinatorPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns CompletionCoordinatorPortType
+ */
+ @WebEndpoint(name = "CompletionCoordinatorPortType")
+ public CompletionCoordinatorPortType getCompletionCoordinatorPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CompletionCoordinatorPortType"), CompletionCoordinatorPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "CompletionInitiatorPortType", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface CompletionInitiatorPortType {
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "CompletionInitiatorService", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06", wsdlLocation = "wsdl/wsat-completion-initiator-binding.wsdl")
public class CompletionInitiatorService
- extends Service21
+ extends Service
{
private final static URL COMPLETIONINITIATORSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CompletionInitiatorPortType"), CompletionInitiatorPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns CompletionInitiatorPortType
+ */
+ @WebEndpoint(name = "CompletionInitiatorPortType")
+ public CompletionInitiatorPortType getCompletionInitiatorPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CompletionInitiatorPortType"), CompletionInitiatorPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "CoordinatorPortType", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface CoordinatorPortType {
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "CoordinatorService", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06", wsdlLocation = "wsdl/wsat-coordinator-binding.wsdl")
public class CoordinatorService
- extends Service21
+ extends Service
{
private final static URL COORDINATORSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CoordinatorPortType"), CoordinatorPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns CoordinatorPortType
+ */
+ @WebEndpoint(name = "CoordinatorPortType")
+ public CoordinatorPortType getCoordinatorPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CoordinatorPortType"), CoordinatorPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ObjectFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ObjectFactory.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ObjectFactory.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -40,19 +40,19 @@
}
/**
- * Create an instance of {@link ATAssertion }
+ * Create an instance of {@link Notification }
*
*/
- public ATAssertion createATAssertion() {
- return new ATAssertion();
+ public Notification createNotification() {
+ return new Notification();
}
/**
- * Create an instance of {@link Notification }
+ * Create an instance of {@link ATAssertion }
*
*/
- public Notification createNotification() {
- return new Notification();
+ public ATAssertion createATAssertion() {
+ return new ATAssertion();
}
/**
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "ParticipantPortType", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface ParticipantPortType {
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "ParticipantService", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06", wsdlLocation = "wsdl/wsat-participant-binding.wsdl")
public class ParticipantService
- extends Service21
+ extends Service
{
private final static URL PARTICIPANTSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "ParticipantPortType"), ParticipantPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns ParticipantPortType
+ */
+ @WebEndpoint(name = "ParticipantPortType")
+ public ParticipantPortType getParticipantPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "ParticipantPortType"), ParticipantPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BAAtomicOutcomeAssertion.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BAAtomicOutcomeAssertion.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BAAtomicOutcomeAssertion.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -64,8 +64,8 @@
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link Object }
* {@link Element }
- * {@link Object }
*
*
*/
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BAMixedOutcomeAssertion.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BAMixedOutcomeAssertion.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BAMixedOutcomeAssertion.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -64,8 +64,8 @@
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link Object }
* {@link Element }
- * {@link Object }
*
*
*/
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "BusinessAgreementWithCoordinatorCompletionCoordinatorPortType", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface BusinessAgreementWithCoordinatorCompletionCoordinatorPortType {
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "BusinessAgreementWithCoordinatorCompletionCoordinatorService", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06", wsdlLocation = "wsdl/wsba-coordinator-completion-coordinator-binding.wsdl")
public class BusinessAgreementWithCoordinatorCompletionCoordinatorService
- extends Service21
+ extends Service
{
private final static URL BUSINESSAGREEMENTWITHCOORDINATORCOMPLETIONCOORDINATORSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithCoordinatorCompletionCoordinatorPortType"), BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns BusinessAgreementWithCoordinatorCompletionCoordinatorPortType
+ */
+ @WebEndpoint(name = "BusinessAgreementWithCoordinatorCompletionCoordinatorPortType")
+ public BusinessAgreementWithCoordinatorCompletionCoordinatorPortType getBusinessAgreementWithCoordinatorCompletionCoordinatorPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithCoordinatorCompletionCoordinatorPortType"), BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "BusinessAgreementWithCoordinatorCompletionParticipantPortType", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface BusinessAgreementWithCoordinatorCompletionParticipantPortType {
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "BusinessAgreementWithCoordinatorCompletionParticipantService", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06", wsdlLocation = "wsdl/wsba-coordinator-completion-participant-binding.wsdl")
public class BusinessAgreementWithCoordinatorCompletionParticipantService
- extends Service21
+ extends Service
{
private final static URL BUSINESSAGREEMENTWITHCOORDINATORCOMPLETIONPARTICIPANTSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithCoordinatorCompletionParticipantPortType"), BusinessAgreementWithCoordinatorCompletionParticipantPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns BusinessAgreementWithCoordinatorCompletionParticipantPortType
+ */
+ @WebEndpoint(name = "BusinessAgreementWithCoordinatorCompletionParticipantPortType")
+ public BusinessAgreementWithCoordinatorCompletionParticipantPortType getBusinessAgreementWithCoordinatorCompletionParticipantPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithCoordinatorCompletionParticipantPortType"), BusinessAgreementWithCoordinatorCompletionParticipantPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "BusinessAgreementWithParticipantCompletionCoordinatorPortType", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface BusinessAgreementWithParticipantCompletionCoordinatorPortType {
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "BusinessAgreementWithParticipantCompletionCoordinatorService", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06", wsdlLocation = "wsdl/wsba-participant-completion-coordinator-binding.wsdl")
public class BusinessAgreementWithParticipantCompletionCoordinatorService
- extends Service21
+ extends Service
{
private final static URL BUSINESSAGREEMENTWITHPARTICIPANTCOMPLETIONCOORDINATORSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithParticipantCompletionCoordinatorPortType"), BusinessAgreementWithParticipantCompletionCoordinatorPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns BusinessAgreementWithParticipantCompletionCoordinatorPortType
+ */
+ @WebEndpoint(name = "BusinessAgreementWithParticipantCompletionCoordinatorPortType")
+ public BusinessAgreementWithParticipantCompletionCoordinatorPortType getBusinessAgreementWithParticipantCompletionCoordinatorPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithParticipantCompletionCoordinatorPortType"), BusinessAgreementWithParticipantCompletionCoordinatorPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantPortType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantPortType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -6,16 +6,20 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebService(name = "BusinessAgreementWithParticipantCompletionParticipantPortType", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ at XmlSeeAlso({
+ ObjectFactory.class
+})
public interface BusinessAgreementWithParticipantCompletionParticipantPortType {
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantService.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantService.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantService.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -8,18 +8,18 @@
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.Service21;
+import javax.xml.ws.WebServiceFeature;
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.2-hudson-182-RC1
- * Generated source version: 2.0
+ * Generated source version: 2.1
*
*/
@WebServiceClient(name = "BusinessAgreementWithParticipantCompletionParticipantService", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06", wsdlLocation = "wsdl/wsba-participant-completion-participant-binding.wsdl")
public class BusinessAgreementWithParticipantCompletionParticipantService
- extends Service21
+ extends Service
{
private final static URL BUSINESSAGREEMENTWITHPARTICIPANTCOMPLETIONPARTICIPANTSERVICE_WSDL_LOCATION;
@@ -56,4 +56,16 @@
return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithParticipantCompletionParticipantPortType"), BusinessAgreementWithParticipantCompletionParticipantPortType.class);
}
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns BusinessAgreementWithParticipantCompletionParticipantPortType
+ */
+ @WebEndpoint(name = "BusinessAgreementWithParticipantCompletionParticipantPortType")
+ public BusinessAgreementWithParticipantCompletionParticipantPortType getBusinessAgreementWithParticipantCompletionParticipantPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithParticipantCompletionParticipantPortType"), BusinessAgreementWithParticipantCompletionParticipantPortType.class, features);
+ }
+
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/ExceptionType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/ExceptionType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/ExceptionType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -91,8 +91,8 @@
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link Object }
* {@link Element }
- * {@link Object }
*
*
*/
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/NotificationType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/NotificationType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/NotificationType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -62,8 +62,8 @@
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link Object }
* {@link Element }
- * {@link Object }
*
*
*/
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/ObjectFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/ObjectFactory.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/ObjectFactory.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -49,43 +49,43 @@
}
/**
- * Create an instance of {@link StatusType }
+ * Create an instance of {@link ExceptionType }
*
*/
- public StatusType createStatusType() {
- return new StatusType();
+ public ExceptionType createExceptionType() {
+ return new ExceptionType();
}
/**
- * Create an instance of {@link BAAtomicOutcomeAssertion }
+ * Create an instance of {@link BAMixedOutcomeAssertion }
*
*/
- public BAAtomicOutcomeAssertion createBAAtomicOutcomeAssertion() {
- return new BAAtomicOutcomeAssertion();
+ public BAMixedOutcomeAssertion createBAMixedOutcomeAssertion() {
+ return new BAMixedOutcomeAssertion();
}
/**
- * Create an instance of {@link ExceptionType }
+ * Create an instance of {@link StatusType }
*
*/
- public ExceptionType createExceptionType() {
- return new ExceptionType();
+ public StatusType createStatusType() {
+ return new StatusType();
}
/**
- * Create an instance of {@link BAMixedOutcomeAssertion }
+ * Create an instance of {@link NotificationType }
*
*/
- public BAMixedOutcomeAssertion createBAMixedOutcomeAssertion() {
- return new BAMixedOutcomeAssertion();
+ public NotificationType createNotificationType() {
+ return new NotificationType();
}
/**
- * Create an instance of {@link NotificationType }
+ * Create an instance of {@link BAAtomicOutcomeAssertion }
*
*/
- public NotificationType createNotificationType() {
- return new NotificationType();
+ public BAAtomicOutcomeAssertion createBAAtomicOutcomeAssertion() {
+ return new BAAtomicOutcomeAssertion();
}
/**
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/StatusType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/StatusType.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/StatusType.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -91,8 +91,8 @@
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link Object }
* {@link Element }
- * {@link Object }
*
*
*/
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -33,7 +33,7 @@
</listener>
<servlet>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.TestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -43,7 +43,7 @@
</servlet>
<servlet>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.TestRunnerXMLServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -54,12 +54,12 @@
<!-- servlet mappings -->
<servlet-mapping>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<url-pattern>/index.xml</url-pattern>
</servlet-mapping>
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -33,7 +33,7 @@
</listener>
<servlet>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.TestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -43,7 +43,7 @@
</servlet>
<servlet>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.TestRunnerXMLServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -54,12 +54,12 @@
<!-- servlet mappings -->
<servlet-mapping>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<url-pattern>/index.xml</url-pattern>
</servlet-mapping>
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -26,17 +26,13 @@
package com.arjuna.wst11.tests;
-import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.AddressingBuilder;
import javax.xml.namespace.QName;
-import java.net.URISyntaxException;
public class TestUtil
{
@@ -67,40 +63,22 @@
public static String coordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/CoordinatorService";
public static String completionInitiatorServiceURI = "http://" + bindHost + ":8080/ws-t11/CompletionInitiatorService";
public static String completionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/CompletionCoordinatorService";
- private static AttributedURI atomicTransactionFaultAction = null;
- private static AttributedURI businessActivityFaultAction = null;
+ private final static String ATOMIC_TRANSACTION_FAULT_ACTION = "http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault";
+ private final static String BUSINESS_ACTIVITY_FAULT_ACTION = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault";
public static String participantCompletionParticipantServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithParticipantCompletionParticipantService";
public static String participantCompletionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithParticipantCompletionCoordinatorService";
public static String coordinatorCompletionParticipantServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithCoordinatorCompletionParticipantService";
public static String coordinatorCompletionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithCoordinatorCompletionCoordinatorService";
- public static synchronized AttributedURI getAtomicTransactionFaultAction()
+ public static synchronized String getAtomicTransactionFaultAction()
{
- if (atomicTransactionFaultAction == null) {
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- atomicTransactionFaultAction = builder.newURI("http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault");
- } catch (URISyntaxException use) {
- // not going to happen
- }
- }
-
- return atomicTransactionFaultAction;
+ return ATOMIC_TRANSACTION_FAULT_ACTION;
}
- public static synchronized AttributedURI getBusinessActivityFaultAction()
+ public static synchronized String getBusinessActivityFaultAction()
{
- if (businessActivityFaultAction == null) {
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
- try {
- businessActivityFaultAction = builder.newURI("http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault");
- } catch (URISyntaxException use) {
- // not going to happen
- }
- }
-
- return businessActivityFaultAction;
+ return BUSINESS_ACTIVITY_FAULT_ACTION;
}
public static W3CEndpointReference getParticipantEndpoint(String id)
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionCoordinatorTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionCoordinatorTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,7 +28,6 @@
import javax.xml.namespace.QName;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.addressing.AddressingProperties;
import junit.framework.TestCase;
@@ -36,6 +35,7 @@
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
@@ -43,7 +43,6 @@
import com.arjuna.webservices11.wsba.client.CoordinatorCompletionParticipantClient;
import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionParticipantProcessor;
import com.arjuna.wst11.tests.junit.TestCoordinatorCompletionParticipantProcessor.CoordinatorCompletionParticipantDetails;
-import com.arjuna.wst11.tests.junit.TestCoordinatorCompletionParticipantProcessor;
import com.arjuna.wst11.tests.TestUtil;
public class BusinessAgreementWithCoordinatorCompletionCoordinatorTestCase extends TestCase
@@ -63,9 +62,9 @@
final String messageId = "testSendClose" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("1") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
- CoordinatorCompletionParticipantClient.getClient().sendClose(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionParticipantClient.getClient().sendClose(endpoint, map, new InstanceIdentifier("sender")) ;
final CoordinatorCompletionParticipantDetails details = testCoordinatorCompletionParticipantProcessor.getCoordinatorCompletionParticipantDetails(messageId, 10000) ;
@@ -80,9 +79,9 @@
final String messageId = "testSendCancel" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("2") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
- CoordinatorCompletionParticipantClient.getClient().sendCancel(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionParticipantClient.getClient().sendCancel(endpoint, map, new InstanceIdentifier("sender")) ;
final CoordinatorCompletionParticipantDetails details = testCoordinatorCompletionParticipantProcessor.getCoordinatorCompletionParticipantDetails(messageId, 10000) ;
@@ -97,9 +96,9 @@
final String messageId = "testSendCompensate" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("3") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
- CoordinatorCompletionParticipantClient.getClient().sendCompensate(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionParticipantClient.getClient().sendCompensate(endpoint, map, new InstanceIdentifier("sender")) ;
final CoordinatorCompletionParticipantDetails details = testCoordinatorCompletionParticipantProcessor.getCoordinatorCompletionParticipantDetails(messageId, 10000) ;
@@ -114,9 +113,9 @@
final String messageId = "testSendFaulted" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("4") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
- CoordinatorCompletionParticipantClient.getClient().sendFailed(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionParticipantClient.getClient().sendFailed(endpoint, map, new InstanceIdentifier("sender")) ;
final CoordinatorCompletionParticipantDetails details = testCoordinatorCompletionParticipantProcessor.getCoordinatorCompletionParticipantDetails(messageId, 10000) ;
@@ -131,9 +130,9 @@
final String messageId = "testSendExited" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("5") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
- CoordinatorCompletionParticipantClient.getClient().sendExited(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionParticipantClient.getClient().sendExited(endpoint, map, new InstanceIdentifier("sender")) ;
final CoordinatorCompletionParticipantDetails details = testCoordinatorCompletionParticipantProcessor.getCoordinatorCompletionParticipantDetails(messageId, 10000) ;
@@ -148,11 +147,11 @@
final String messageId = "testSendStatus" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("6") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
final State state = State.STATE_ACTIVE ;
- CoordinatorCompletionParticipantClient.getClient().sendStatus(endpoint, addressingProperties, new InstanceIdentifier("sender"), state.getValue()) ;
+ CoordinatorCompletionParticipantClient.getClient().sendStatus(endpoint, map, new InstanceIdentifier("sender"), state.getValue()) ;
final CoordinatorCompletionParticipantDetails details = testCoordinatorCompletionParticipantProcessor.getCoordinatorCompletionParticipantDetails(messageId, 10000) ;
@@ -168,9 +167,9 @@
final String messageId = "testSendComplete" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("7") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
- CoordinatorCompletionParticipantClient.getClient().sendComplete(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionParticipantClient.getClient().sendComplete(endpoint, map, new InstanceIdentifier("sender")) ;
final CoordinatorCompletionParticipantDetails details = testCoordinatorCompletionParticipantProcessor.getCoordinatorCompletionParticipantDetails(messageId, 10000) ;
@@ -185,9 +184,9 @@
final String messageId = "testSendGetStatus" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("8") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
- CoordinatorCompletionParticipantClient.getClient().sendGetStatus(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionParticipantClient.getClient().sendGetStatus(endpoint, map, new InstanceIdentifier("sender")) ;
final CoordinatorCompletionParticipantDetails details = testCoordinatorCompletionParticipantProcessor.getCoordinatorCompletionParticipantDetails(messageId, 10000) ;
@@ -200,7 +199,7 @@
throws Exception
{
final String messageId = "testSendError" ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("9") ;
final String reason = "testSendErrorReason" ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
@@ -208,8 +207,8 @@
final SoapFault11 soapFault = new SoapFault11(soapFaultType, subcode, reason) ;
// this would be a better test if we could set the identifier as a reference parameter here
- AddressingHelper.installNoneReplyTo(addressingProperties);
- SoapFaultClient.sendSoapFault(soapFault, addressingProperties, TestUtil.getBusinessActivityFaultAction()) ;
+ AddressingHelper.installNoneReplyTo(map);
+ SoapFaultClient.sendSoapFault(soapFault, map, TestUtil.getBusinessActivityFaultAction()) ;
final CoordinatorCompletionParticipantDetails details = testCoordinatorCompletionParticipantProcessor.getCoordinatorCompletionParticipantDetails(messageId, 10000) ;
@@ -227,9 +226,9 @@
final String messageId = "testSendNotCompleted" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("10") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionParticipantServiceURI, messageId) ;
- CoordinatorCompletionParticipantClient.getClient().sendNotCompleted(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionParticipantClient.getClient().sendNotCompleted(endpoint, map, new InstanceIdentifier("sender")) ;
final CoordinatorCompletionParticipantDetails details = testCoordinatorCompletionParticipantProcessor.getCoordinatorCompletionParticipantDetails(messageId, 10000) ;
@@ -254,26 +253,26 @@
private void checkDetails(CoordinatorCompletionParticipantDetails details, boolean hasFrom, boolean hasFaultTo, String messageId, InstanceIdentifier instanceIdentifier)
{
- AddressingProperties inAddressingProperties = details.getAddressingProperties();
+ MAP inMAP = details.getMAP();
ArjunaContext inArjunaContext = details.getArjunaContext();
- assertEquals(inAddressingProperties.getTo().getURI().toString(), TestUtil.coordinatorCompletionParticipantServiceURI);
- assertNotNull(inAddressingProperties.getReplyTo());
- assertTrue(AddressingHelper.isNoneReplyTo(inAddressingProperties));
+ assertEquals(inMAP.getTo(), TestUtil.coordinatorCompletionParticipantServiceURI);
+ assertNotNull(inMAP.getReplyTo());
+ assertTrue(AddressingHelper.isNoneReplyTo(inMAP));
if (hasFrom) {
- assertNotNull(inAddressingProperties.getFrom());
- assertEquals(inAddressingProperties.getFrom().getAddress().getURI().toString(), TestUtil.coordinatorCompletionCoordinatorServiceURI);
+ assertNotNull(inMAP.getFrom());
+ assertEquals(inMAP.getFrom().getAddress(), TestUtil.coordinatorCompletionCoordinatorServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
if (hasFaultTo) {
- assertNotNull(inAddressingProperties.getFaultTo());
- assertEquals(inAddressingProperties.getFaultTo().getAddress().getURI().toString(), TestUtil.coordinatorCompletionCoordinatorServiceURI);
+ assertNotNull(inMAP.getFaultTo());
+ assertEquals(inMAP.getFaultTo().getAddress(), TestUtil.coordinatorCompletionCoordinatorServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
- assertNotNull(inAddressingProperties.getMessageID());
- assertEquals(inAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertNotNull(inMAP.getMessageID());
+ assertEquals(inMAP.getMessageID(), messageId);
if (instanceIdentifier == null) {
assertNull(inArjunaContext);
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionParticipantTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithCoordinatorCompletionParticipantTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,24 +28,21 @@
import junit.framework.TestCase;
-import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.wsba.State;
import com.arjuna.webservices11.wsba.client.CoordinatorCompletionCoordinatorClient;
import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionCoordinatorProcessor;
import com.arjuna.wst11.tests.junit.TestCoordinatorCompletionCoordinatorProcessor.CoordinatorCompletionCoordinatorDetails;
-import com.arjuna.wst11.tests.junit.TestCoordinatorCompletionCoordinatorProcessor;
import com.arjuna.wst11.tests.TestUtil;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.namespace.QName;
public class BusinessAgreementWithCoordinatorCompletionParticipantTestCase extends TestCase
@@ -65,9 +62,9 @@
final String messageId = "testSendClosed" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("1") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
- CoordinatorCompletionCoordinatorClient.getClient().sendClosed(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendClosed(endpoint, map, new InstanceIdentifier("sender")) ;
CoordinatorCompletionCoordinatorDetails details = testCoordinatorCompletionCoordinatorProcessor.getCoordinatorCompletionCoordinatorDetails(messageId, 10000) ;
@@ -82,9 +79,9 @@
final String messageId = "testSendCancelled" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("2") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
- CoordinatorCompletionCoordinatorClient.getClient().sendCancelled(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendCancelled(endpoint, map, new InstanceIdentifier("sender")) ;
CoordinatorCompletionCoordinatorDetails details = testCoordinatorCompletionCoordinatorProcessor.getCoordinatorCompletionCoordinatorDetails(messageId, 10000) ;
@@ -99,9 +96,9 @@
final String messageId = "testSendCompensated" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("3") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
- CoordinatorCompletionCoordinatorClient.getClient().sendCompensated(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendCompensated(endpoint, map, new InstanceIdentifier("sender")) ;
CoordinatorCompletionCoordinatorDetails details = testCoordinatorCompletionCoordinatorProcessor.getCoordinatorCompletionCoordinatorDetails(messageId, 10000) ;
@@ -116,11 +113,11 @@
final String messageId = "testSendFault" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("4") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
final State state = State.STATE_FAILING_COMPENSATING ;
- CoordinatorCompletionCoordinatorClient.getClient().sendFail(endpoint, addressingProperties, new InstanceIdentifier("sender"), state.getValue()) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendFail(endpoint, map, new InstanceIdentifier("sender"), state.getValue()) ;
CoordinatorCompletionCoordinatorDetails details = testCoordinatorCompletionCoordinatorProcessor.getCoordinatorCompletionCoordinatorDetails(messageId, 10000) ;
@@ -136,9 +133,9 @@
final String messageId = "testSendCompleted" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("5") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
- CoordinatorCompletionCoordinatorClient.getClient().sendCompleted(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendCompleted(endpoint, map, new InstanceIdentifier("sender")) ;
CoordinatorCompletionCoordinatorDetails details = testCoordinatorCompletionCoordinatorProcessor.getCoordinatorCompletionCoordinatorDetails(messageId, 10000) ;
@@ -153,11 +150,11 @@
final String messageId = "testSendStatus" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("6") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
final State state = State.STATE_COMPENSATING;
- CoordinatorCompletionCoordinatorClient.getClient().sendStatus(endpoint, addressingProperties, new InstanceIdentifier("sender"), state.getValue()) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendStatus(endpoint, map, new InstanceIdentifier("sender"), state.getValue()) ;
CoordinatorCompletionCoordinatorDetails details = testCoordinatorCompletionCoordinatorProcessor.getCoordinatorCompletionCoordinatorDetails(messageId, 10000) ;
@@ -171,7 +168,7 @@
throws Exception
{
final String messageId = "testSendError" ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("7") ;
final String reason = "testSendErrorReason" ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
@@ -179,8 +176,8 @@
final SoapFault11 soapFault = new SoapFault11(soapFaultType, subcode, reason) ;
// this would be a better test if we could set the identifier as a reference parameter here
- AddressingHelper.installNoneReplyTo(addressingProperties);
- SoapFaultClient.sendSoapFault(soapFault, addressingProperties, TestUtil.getBusinessActivityFaultAction()) ;
+ AddressingHelper.installNoneReplyTo(map);
+ SoapFaultClient.sendSoapFault(soapFault, map, TestUtil.getBusinessActivityFaultAction()) ;
final CoordinatorCompletionCoordinatorDetails details = testCoordinatorCompletionCoordinatorProcessor.getCoordinatorCompletionCoordinatorDetails(messageId, 10000) ;
@@ -198,9 +195,9 @@
final String messageId = "testSendExit" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("8") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
- CoordinatorCompletionCoordinatorClient.getClient().sendExit(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendExit(endpoint, map, new InstanceIdentifier("sender")) ;
final CoordinatorCompletionCoordinatorDetails details = testCoordinatorCompletionCoordinatorProcessor.getCoordinatorCompletionCoordinatorDetails(messageId, 10000) ;
@@ -215,9 +212,9 @@
final String messageId = "testSendGetStatus" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("9") ;
W3CEndpointReference endpoint = TestUtil.getCoordinatorCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorCompletionCoordinatorServiceURI, messageId) ;
- CoordinatorCompletionCoordinatorClient.getClient().sendGetStatus(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CoordinatorCompletionCoordinatorClient.getClient().sendGetStatus(endpoint, map, new InstanceIdentifier("sender")) ;
final CoordinatorCompletionCoordinatorDetails details = testCoordinatorCompletionCoordinatorProcessor.getCoordinatorCompletionCoordinatorDetails(messageId, 10000) ;
@@ -243,26 +240,26 @@
private void checkDetails(CoordinatorCompletionCoordinatorDetails details, boolean hasFrom, boolean hasFaultTo, String messageId, InstanceIdentifier instanceIdentifier)
{
- AddressingProperties inAddressingProperties = details.getAddressingProperties();
+ MAP inMAP = details.getMAP();
ArjunaContext inArjunaContext = details.getArjunaContext();
- assertEquals(inAddressingProperties.getTo().getURI().toString(), TestUtil.coordinatorCompletionCoordinatorServiceURI);
- assertNotNull(inAddressingProperties.getReplyTo());
- assertTrue(AddressingHelper.isNoneReplyTo(inAddressingProperties));
+ assertEquals(inMAP.getTo(), TestUtil.coordinatorCompletionCoordinatorServiceURI);
+ assertNotNull(inMAP.getReplyTo());
+ assertTrue(AddressingHelper.isNoneReplyTo(inMAP));
if (hasFrom) {
- assertNotNull(inAddressingProperties.getFrom());
- assertEquals(inAddressingProperties.getFrom().getAddress().getURI().toString(), TestUtil.coordinatorCompletionParticipantServiceURI);
+ assertNotNull(inMAP.getFrom());
+ assertEquals(inMAP.getFrom().getAddress(), TestUtil.coordinatorCompletionParticipantServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
if (hasFaultTo) {
- assertNotNull(inAddressingProperties.getFaultTo());
- assertEquals(inAddressingProperties.getFaultTo().getAddress().getURI().toString(), TestUtil.coordinatorCompletionParticipantServiceURI);
+ assertNotNull(inMAP.getFaultTo());
+ assertEquals(inMAP.getFaultTo().getAddress(), TestUtil.coordinatorCompletionParticipantServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
- assertNotNull(inAddressingProperties.getMessageID());
- assertEquals(inAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertNotNull(inMAP.getMessageID());
+ assertEquals(inMAP.getMessageID(), messageId);
if (instanceIdentifier == null) {
assertNull(inArjunaContext);
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionCoordinatorTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionCoordinatorTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,25 +28,22 @@
import javax.xml.namespace.QName;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.addressing.AddressingProperties;
import junit.framework.TestCase;
-import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.wsba.State;
import com.arjuna.webservices11.wsba.client.ParticipantCompletionParticipantClient;
import com.arjuna.webservices11.wsba.processors.ParticipantCompletionParticipantProcessor;
import com.arjuna.wst11.tests.junit.TestParticipantCompletionParticipantProcessor.ParticipantCompletionParticipantDetails;
-import com.arjuna.wst11.tests.junit.TestParticipantCompletionParticipantProcessor;
import com.arjuna.wst11.tests.TestUtil;
public class BusinessAgreementWithParticipantCompletionCoordinatorTestCase extends TestCase
@@ -67,9 +64,9 @@
final String messageId = "testSendClose" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("1") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
- ParticipantCompletionParticipantClient.getClient().sendClose(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionParticipantClient.getClient().sendClose(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionParticipantDetails details = testParticipantCompletionParticipantProcessor.getParticipantCompletionParticipantDetails(messageId, 10000) ;
@@ -84,9 +81,9 @@
final String messageId = "testSendCancel" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("2") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
- ParticipantCompletionParticipantClient.getClient().sendCancel(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionParticipantClient.getClient().sendCancel(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionParticipantDetails details = testParticipantCompletionParticipantProcessor.getParticipantCompletionParticipantDetails(messageId, 10000) ;
@@ -101,9 +98,9 @@
final String messageId = "testSendCompensate" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("3") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
- ParticipantCompletionParticipantClient.getClient().sendCompensate(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionParticipantClient.getClient().sendCompensate(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionParticipantDetails details = testParticipantCompletionParticipantProcessor.getParticipantCompletionParticipantDetails(messageId, 10000) ;
@@ -118,9 +115,9 @@
final String messageId = "testSendFaulted" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("4") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
- ParticipantCompletionParticipantClient.getClient().sendFailed(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionParticipantClient.getClient().sendFailed(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionParticipantDetails details = testParticipantCompletionParticipantProcessor.getParticipantCompletionParticipantDetails(messageId, 10000) ;
@@ -135,9 +132,9 @@
final String messageId = "testSendExited" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("5") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
- ParticipantCompletionParticipantClient.getClient().sendExited(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionParticipantClient.getClient().sendExited(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionParticipantDetails details = testParticipantCompletionParticipantProcessor.getParticipantCompletionParticipantDetails(messageId, 10000) ;
@@ -152,11 +149,11 @@
final String messageId = "testSendStatus" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("6") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
final State state = State.STATE_ACTIVE ;
- ParticipantCompletionParticipantClient.getClient().sendStatus(endpoint, addressingProperties, new InstanceIdentifier("sender"), state.getValue()) ;
+ ParticipantCompletionParticipantClient.getClient().sendStatus(endpoint, map, new InstanceIdentifier("sender"), state.getValue()) ;
final ParticipantCompletionParticipantDetails details = testParticipantCompletionParticipantProcessor.getParticipantCompletionParticipantDetails(messageId, 10000) ;
@@ -172,9 +169,9 @@
final String messageId = "testSendGetStatus" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("7") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
- ParticipantCompletionParticipantClient.getClient().sendGetStatus(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionParticipantClient.getClient().sendGetStatus(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionParticipantDetails details = testParticipantCompletionParticipantProcessor.getParticipantCompletionParticipantDetails(messageId, 10000) ;
@@ -187,15 +184,15 @@
throws Exception
{
final String messageId = "testSendGetStatus" ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("8") ;
final String reason = "testSendErrorReason" ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME ;
final SoapFault11 soapFault = new SoapFault11(soapFaultType, subcode, reason) ;
- AddressingHelper.installNoneReplyTo(addressingProperties);
- SoapFaultClient.sendSoapFault(soapFault, addressingProperties, TestUtil.getBusinessActivityFaultAction()) ;
+ AddressingHelper.installNoneReplyTo(map);
+ SoapFaultClient.sendSoapFault(soapFault, map, TestUtil.getBusinessActivityFaultAction()) ;
final ParticipantCompletionParticipantDetails details = testParticipantCompletionParticipantProcessor.getParticipantCompletionParticipantDetails(messageId, 10000) ;
@@ -213,9 +210,9 @@
final String messageId = "testSendNotCompleted" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("9") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionParticipantEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionParticipantServiceURI, messageId) ;
- ParticipantCompletionParticipantClient.getClient().sendNotCompleted(endpoint, addressingProperties, new InstanceIdentifier("sender")); ;
+ ParticipantCompletionParticipantClient.getClient().sendNotCompleted(endpoint, map, new InstanceIdentifier("sender")); ;
final ParticipantCompletionParticipantDetails details = testParticipantCompletionParticipantProcessor.getParticipantCompletionParticipantDetails(messageId, 10000) ;
@@ -241,26 +238,26 @@
private void checkDetails(ParticipantCompletionParticipantDetails details, boolean hasFrom, boolean hasFaultTo, String messageId, InstanceIdentifier instanceIdentifier)
{
- AddressingProperties inAddressingProperties = details.getAddressingProperties();
+ MAP inMAP = details.getMAP();
ArjunaContext inArjunaContext = details.getArjunaContext();
- assertEquals(inAddressingProperties.getTo().getURI().toString(), TestUtil.participantCompletionParticipantServiceURI);
- assertNotNull(inAddressingProperties.getReplyTo());
- assertTrue(AddressingHelper.isNoneReplyTo(inAddressingProperties));
+ assertEquals(inMAP.getTo(), TestUtil.participantCompletionParticipantServiceURI);
+ assertNotNull(inMAP.getReplyTo());
+ assertTrue(AddressingHelper.isNoneReplyTo(inMAP));
if (hasFrom) {
- assertNotNull(inAddressingProperties.getFrom());
- assertEquals(inAddressingProperties.getFrom().getAddress().getURI().toString(), TestUtil.participantCompletionCoordinatorServiceURI);
+ assertNotNull(inMAP.getFrom());
+ assertEquals(inMAP.getFrom().getAddress(), TestUtil.participantCompletionCoordinatorServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
if (hasFaultTo) {
- assertNotNull(inAddressingProperties.getFaultTo());
- assertEquals(inAddressingProperties.getFaultTo().getAddress().getURI().toString(), TestUtil.participantCompletionCoordinatorServiceURI);
+ assertNotNull(inMAP.getFaultTo());
+ assertEquals(inMAP.getFaultTo().getAddress(), TestUtil.participantCompletionCoordinatorServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
- assertNotNull(inAddressingProperties.getMessageID());
- assertEquals(inAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertNotNull(inMAP.getMessageID());
+ assertEquals(inMAP.getMessageID(), messageId);
if (instanceIdentifier == null) {
assertNull(inArjunaContext);
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionParticipantTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/BusinessAgreementWithParticipantCompletionParticipantTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,25 +28,21 @@
import javax.xml.namespace.QName;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.addressing.AddressingProperties;
import junit.framework.TestCase;
-import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
-import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
-import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.wsba.State;
import com.arjuna.webservices11.wsba.client.ParticipantCompletionCoordinatorClient;
import com.arjuna.webservices11.wsba.processors.ParticipantCompletionCoordinatorProcessor;
import com.arjuna.wst11.tests.junit.TestParticipantCompletionCoordinatorProcessor.ParticipantCompletionCoordinatorDetails;
-import com.arjuna.wst11.tests.junit.TestParticipantCompletionCoordinatorProcessor;
import com.arjuna.wst11.tests.TestUtil;
public class BusinessAgreementWithParticipantCompletionParticipantTestCase extends TestCase
@@ -66,9 +62,9 @@
final String messageId = "testSendClosed" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("1") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
- ParticipantCompletionCoordinatorClient.getClient().sendClosed(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendClosed(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionCoordinatorDetails details = testParticipantCompletionCoordinatorProcessor.getParticipantCompletionCoordinatorDetails(messageId, 10000) ;
@@ -83,9 +79,9 @@
final String messageId = "testSendCancelled" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("2") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
- ParticipantCompletionCoordinatorClient.getClient().sendCancelled(endpoint, addressingProperties, new InstanceIdentifier("sender")); ;
+ ParticipantCompletionCoordinatorClient.getClient().sendCancelled(endpoint, map, new InstanceIdentifier("sender")); ;
final ParticipantCompletionCoordinatorDetails details = testParticipantCompletionCoordinatorProcessor.getParticipantCompletionCoordinatorDetails(messageId, 10000) ;
@@ -100,9 +96,9 @@
final String messageId = "testSendCompensated" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("3") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
- ParticipantCompletionCoordinatorClient.getClient().sendCompensated(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendCompensated(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionCoordinatorDetails details = testParticipantCompletionCoordinatorProcessor.getParticipantCompletionCoordinatorDetails(messageId, 10000) ;
@@ -117,9 +113,9 @@
final String messageId = "testSendCompleted" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("4") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
- ParticipantCompletionCoordinatorClient.getClient().sendCompleted(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendCompleted(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionCoordinatorDetails details = testParticipantCompletionCoordinatorProcessor.getParticipantCompletionCoordinatorDetails(messageId, 10000) ;
@@ -134,11 +130,11 @@
final String messageId = "testSendStatus" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("5") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
final State state = State.STATE_ENDED ;
- ParticipantCompletionCoordinatorClient.getClient().sendStatus(endpoint, addressingProperties, new InstanceIdentifier("sender"), state.getValue()) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendStatus(endpoint, map, new InstanceIdentifier("sender"), state.getValue()) ;
final ParticipantCompletionCoordinatorDetails details = testParticipantCompletionCoordinatorProcessor.getParticipantCompletionCoordinatorDetails(messageId, 10000) ;
@@ -152,15 +148,15 @@
throws Exception
{
final String messageId = "testSendError" ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("6") ;
final String reason = "testSendErrorReason" ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME ;
final SoapFault11 soapFault = new SoapFault11(soapFaultType, subcode, reason) ;
- AddressingHelper.installNoneReplyTo(addressingProperties);
- SoapFaultClient.sendSoapFault(soapFault, addressingProperties, TestUtil.getBusinessActivityFaultAction()) ;
+ AddressingHelper.installNoneReplyTo(map);
+ SoapFaultClient.sendSoapFault(soapFault, map, TestUtil.getBusinessActivityFaultAction()) ;
final ParticipantCompletionCoordinatorDetails details = testParticipantCompletionCoordinatorProcessor.getParticipantCompletionCoordinatorDetails(messageId, 10000) ;
@@ -178,9 +174,9 @@
final String messageId = "testSendExit" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("7") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
- ParticipantCompletionCoordinatorClient.getClient().sendExit(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendExit(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionCoordinatorDetails details = testParticipantCompletionCoordinatorProcessor.getParticipantCompletionCoordinatorDetails(messageId, 10000) ;
@@ -195,11 +191,11 @@
final String messageId = "testSendFault" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("8") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
final State state = State.STATE_FAILING_ACTIVE;
- ParticipantCompletionCoordinatorClient.getClient().sendFail(endpoint, addressingProperties, new InstanceIdentifier("sender"), state.getValue()); ;
+ ParticipantCompletionCoordinatorClient.getClient().sendFail(endpoint, map, new InstanceIdentifier("sender"), state.getValue()); ;
final ParticipantCompletionCoordinatorDetails details = testParticipantCompletionCoordinatorProcessor.getParticipantCompletionCoordinatorDetails(messageId, 10000) ;
@@ -215,9 +211,9 @@
final String messageId = "testSendGetStatus" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("9") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
- ParticipantCompletionCoordinatorClient.getClient().sendGetStatus(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendGetStatus(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionCoordinatorDetails details = testParticipantCompletionCoordinatorProcessor.getParticipantCompletionCoordinatorDetails(messageId, 10000) ;
@@ -232,9 +228,9 @@
final String messageId = "testSendCannotComplete" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("10") ;
W3CEndpointReference endpoint = TestUtil.getParticipantCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantCompletionCoordinatorServiceURI, messageId) ;
- ParticipantCompletionCoordinatorClient.getClient().sendCannotComplete(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantCompletionCoordinatorClient.getClient().sendCannotComplete(endpoint, map, new InstanceIdentifier("sender")) ;
final ParticipantCompletionCoordinatorDetails details = testParticipantCompletionCoordinatorProcessor.getParticipantCompletionCoordinatorDetails(messageId, 10000) ;
@@ -261,26 +257,26 @@
private void checkDetails(ParticipantCompletionCoordinatorDetails details, boolean hasFrom, boolean hasFaultTo, String messageId, InstanceIdentifier instanceIdentifier)
{
- AddressingProperties inAddressingProperties = details.getAddressingProperties();
+ MAP inMAP = details.getMAP();
ArjunaContext inArjunaContext = details.getArjunaContext();
- assertEquals(inAddressingProperties.getTo().getURI().toString(), TestUtil.participantCompletionCoordinatorServiceURI);
- assertNotNull(inAddressingProperties.getReplyTo());
- assertTrue(AddressingHelper.isNoneReplyTo(inAddressingProperties));
+ assertEquals(inMAP.getTo(), TestUtil.participantCompletionCoordinatorServiceURI);
+ assertNotNull(inMAP.getReplyTo());
+ assertTrue(AddressingHelper.isNoneReplyTo(inMAP));
if (hasFrom) {
- assertNotNull(inAddressingProperties.getFrom());
- assertEquals(inAddressingProperties.getFrom().getAddress().getURI().toString(), TestUtil.participantCompletionParticipantServiceURI);
+ assertNotNull(inMAP.getFrom());
+ assertEquals(inMAP.getFrom().getAddress(), TestUtil.participantCompletionParticipantServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
if (hasFaultTo) {
- assertNotNull(inAddressingProperties.getFaultTo());
- assertEquals(inAddressingProperties.getFaultTo().getAddress().getURI().toString(), TestUtil.participantCompletionParticipantServiceURI);
+ assertNotNull(inMAP.getFaultTo());
+ assertEquals(inMAP.getFaultTo().getAddress(), TestUtil.participantCompletionParticipantServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
- assertNotNull(inAddressingProperties.getMessageID());
- assertEquals(inAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertNotNull(inMAP.getMessageID());
+ assertEquals(inMAP.getMessageID(), messageId);
if (instanceIdentifier == null) {
assertNull(inArjunaContext);
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,7 +28,6 @@
import javax.xml.namespace.QName;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.addressing.AddressingProperties;
import junit.framework.TestCase;
@@ -40,9 +39,9 @@
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.client.CompletionInitiatorClient;
import com.arjuna.webservices11.wsat.processors.CompletionInitiatorProcessor;
-import com.arjuna.wst11.tests.junit.TestCompletionInitiatorCallback;
import com.arjuna.wst11.tests.TestUtil;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
public class CompletionCoordinatorTestCase extends TestCase
@@ -58,18 +57,18 @@
final String messageId = "123456" ;
final String instanceIdentifier = "testSendCommitted" ;
final W3CEndpointReference completionInitiatorEndpoint = TestUtil.getCompletionInitiatorEndpoint(instanceIdentifier);
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.completionInitiatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.completionInitiatorServiceURI, messageId) ;
final TestCompletionInitiatorCallback callback = new TestCompletionInitiatorCallback() {
- public void committed(final Notification committed, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void committed(final Notification committed, final MAP map, final ArjunaContext arjunaContext)
{
- assertEquals(addressingProperties.getTo().getURI().toString(), TestUtil.completionInitiatorServiceURI);
- assertNull(addressingProperties.getFrom());
- assertNotNull(addressingProperties.getFaultTo());
- assertEquals(addressingProperties.getFaultTo().getAddress().getURI().toString(), TestUtil.completionCoordinatorServiceURI);
- assertNotNull(addressingProperties.getReplyTo());
- assertTrue(AddressingHelper.isNoneReplyTo(addressingProperties));
- assertEquals(addressingProperties.getMessageID().getURI().toString(), messageId);
+ assertEquals(map.getTo(), TestUtil.completionInitiatorServiceURI);
+ assertNull(map.getFrom());
+ assertNotNull(map.getFaultTo());
+ assertEquals(map.getFaultTo().getAddress(), TestUtil.completionCoordinatorServiceURI);
+ assertNotNull(map.getReplyTo());
+ assertTrue(AddressingHelper.isNoneReplyTo(map));
+ assertEquals(map.getMessageID(), messageId);
assertNotNull(arjunaContext) ;
assertEquals(instanceIdentifier, arjunaContext.getInstanceIdentifier().getInstanceIdentifier()) ;
@@ -80,7 +79,7 @@
try
{
- CompletionInitiatorClient.getClient().sendCommitted(completionInitiatorEndpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CompletionInitiatorClient.getClient().sendCommitted(completionInitiatorEndpoint, map, new InstanceIdentifier("sender")) ;
callback.waitUntilTriggered() ;
}
finally
@@ -98,19 +97,19 @@
final String messageId = "123456" ;
final String instanceIdentifier = "testSendAborted" ;
final W3CEndpointReference completionInitiatorEndpoint = TestUtil.getCompletionInitiatorEndpoint(instanceIdentifier);
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.completionInitiatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.completionInitiatorServiceURI, messageId) ;
final TestCompletionInitiatorCallback callback = new TestCompletionInitiatorCallback() {
- public void aborted(final Notification aborted, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void aborted(final Notification aborted, final MAP map, final ArjunaContext arjunaContext)
{
- assertEquals(addressingProperties.getTo().getURI().toString(), TestUtil.completionInitiatorServiceURI);
- assertNull(addressingProperties.getFrom());
- assertNotNull(addressingProperties.getFaultTo());
- assertEquals(addressingProperties.getFaultTo().getAddress().getURI().toString(), TestUtil.completionCoordinatorServiceURI);
- assertNotNull(addressingProperties.getReplyTo());
- assertTrue(AddressingHelper.isNoneReplyTo(addressingProperties));
- assertNotNull(addressingProperties.getMessageID());
- assertEquals(addressingProperties.getMessageID().getURI().toString(), messageId);
+ assertEquals(map.getTo(), TestUtil.completionInitiatorServiceURI);
+ assertNull(map.getFrom());
+ assertNotNull(map.getFaultTo());
+ assertEquals(map.getFaultTo().getAddress(), TestUtil.completionCoordinatorServiceURI);
+ assertNotNull(map.getReplyTo());
+ assertTrue(AddressingHelper.isNoneReplyTo(map));
+ assertNotNull(map.getMessageID());
+ assertEquals(map.getMessageID(), messageId);
assertNotNull(arjunaContext) ;
assertEquals(instanceIdentifier, arjunaContext.getInstanceIdentifier().getInstanceIdentifier()) ;
@@ -121,7 +120,7 @@
try
{
- CompletionInitiatorClient.getClient().sendAborted(completionInitiatorEndpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CompletionInitiatorClient.getClient().sendAborted(completionInitiatorEndpoint, map, new InstanceIdentifier("sender")) ;
callback.waitUntilTriggered() ;
}
finally
@@ -140,22 +139,22 @@
final String reason = "testSendErrorReason" ;
final String instanceIdentifier = "testSendError" ;
final W3CEndpointReference completionInitiatorEndpoint = TestUtil.getCompletionInitiatorEndpoint(instanceIdentifier);
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.completionInitiatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.completionInitiatorServiceURI, messageId) ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME ;
final SoapFault soapFault = new SoapFault11(soapFaultType, subcode, reason) ;
final TestCompletionInitiatorCallback callback = new TestCompletionInitiatorCallback() {
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ public void soapFault(final SoapFault soapFault, final MAP map, final ArjunaContext arjunaContext)
{
- assertEquals(addressingProperties.getTo().getURI().toString(), TestUtil.completionInitiatorServiceURI);
- assertNull(addressingProperties.getFrom());
- assertNull(addressingProperties.getFaultTo());
- assertNotNull(addressingProperties.getReplyTo());
- assertTrue(AddressingHelper.isNoneReplyTo(addressingProperties));
- assertNotNull(addressingProperties.getMessageID());
- assertEquals(addressingProperties.getMessageID().getURI().toString(), messageId);
+ assertEquals(map.getTo(), TestUtil.completionInitiatorServiceURI);
+ assertNull(map.getFrom());
+ assertNull(map.getFaultTo());
+ assertNotNull(map.getReplyTo());
+ assertTrue(AddressingHelper.isNoneReplyTo(map));
+ assertNotNull(map.getMessageID());
+ assertEquals(map.getMessageID(), messageId);
assertNotNull(arjunaContext) ;
assertEquals(instanceIdentifier, arjunaContext.getInstanceIdentifier().getInstanceIdentifier()) ;
@@ -171,7 +170,7 @@
try
{
- CompletionInitiatorClient.getClient().sendSoapFault(completionInitiatorEndpoint, addressingProperties, soapFault, new InstanceIdentifier("sender")) ;
+ CompletionInitiatorClient.getClient().sendSoapFault(completionInitiatorEndpoint, map, soapFault, new InstanceIdentifier("sender")) ;
callback.waitUntilTriggered() ;
}
finally
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionParticipantTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionParticipantTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -29,15 +29,14 @@
import junit.framework.TestCase;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsat.client.CompletionCoordinatorClient;
import com.arjuna.webservices11.wsat.processors.CompletionCoordinatorProcessor;
import com.arjuna.wst11.tests.junit.TestCompletionCoordinatorProcessor.CompletionCoordinatorDetails;
-import com.arjuna.wst11.tests.junit.TestCompletionCoordinatorProcessor;
import com.arjuna.wst11.tests.TestUtil;
-import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
public class CompletionParticipantTestCase extends TestCase
@@ -56,11 +55,11 @@
throws Exception
{
final String messageId = "testSendCommit" ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.completionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.completionCoordinatorServiceURI, messageId) ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("1") ;
final W3CEndpointReference endpoint = TestUtil.getCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- CompletionCoordinatorClient.getClient().sendCommit(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CompletionCoordinatorClient.getClient().sendCommit(endpoint, map, new InstanceIdentifier("sender")) ;
final CompletionCoordinatorDetails details = testCompletionCoordinatorProcessor.getCompletionCoordinatorDetails(messageId, 10000) ;
@@ -73,11 +72,11 @@
throws Exception
{
final String messageId = "testSendRollback" ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.completionCoordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.completionCoordinatorServiceURI, messageId) ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("2") ;
final W3CEndpointReference endpoint = TestUtil.getCompletionCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- CompletionCoordinatorClient.getClient().sendRollback(endpoint, addressingProperties, new InstanceIdentifier("sender")) ;
+ CompletionCoordinatorClient.getClient().sendRollback(endpoint, map, new InstanceIdentifier("sender")) ;
final CompletionCoordinatorDetails details = testCompletionCoordinatorProcessor.getCompletionCoordinatorDetails(messageId, 10000) ;
@@ -94,26 +93,26 @@
private void checkDetails(CompletionCoordinatorDetails details, boolean hasFrom, boolean hasFaultTo, String messageId, InstanceIdentifier instanceIdentifier)
{
- AddressingProperties inAddressingProperties = details.getAddressingProperties();
+ MAP inMAP = details.getMAP();
ArjunaContext inArjunaContext = details.getArjunaContext();
- assertEquals(inAddressingProperties.getTo().getURI().toString(), TestUtil.completionCoordinatorServiceURI);
- assertNotNull(inAddressingProperties.getReplyTo());
- assertTrue(AddressingHelper.isNoneReplyTo(inAddressingProperties));
+ assertEquals(inMAP.getTo(), TestUtil.completionCoordinatorServiceURI);
+ assertNotNull(inMAP.getReplyTo());
+ assertTrue(AddressingHelper.isNoneReplyTo(inMAP));
if (hasFrom) {
- assertNotNull(inAddressingProperties.getFrom());
- assertEquals(inAddressingProperties.getFrom().getAddress().getURI().toString(), TestUtil.completionInitiatorServiceURI);
+ assertNotNull(inMAP.getFrom());
+ assertEquals(inMAP.getFrom().getAddress(), TestUtil.completionInitiatorServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
if (hasFaultTo) {
- assertNotNull(inAddressingProperties.getFaultTo());
- assertEquals(inAddressingProperties.getFaultTo().getAddress().getURI().toString(), TestUtil.completionInitiatorServiceURI);
+ assertNotNull(inMAP.getFaultTo());
+ assertEquals(inMAP.getFaultTo().getAddress(), TestUtil.completionInitiatorServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
- assertNotNull(inAddressingProperties.getMessageID());
- assertEquals(inAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertNotNull(inMAP.getMessageID());
+ assertEquals(inMAP.getMessageID(), messageId);
if (instanceIdentifier == null) {
assertNull(inArjunaContext);
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,11 +25,10 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsat.processors.CompletionCoordinatorProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.wst11.CompletionCoordinatorParticipant;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import javax.xml.ws.addressing.AddressingProperties;
-
public class TestCompletionCoordinatorProcessor extends CompletionCoordinatorProcessor
{
private Map messageIdMap = new HashMap() ;
@@ -66,14 +65,14 @@
/**
* Commit.
* @param commit The commit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void commit(final Notification commit, final AddressingProperties addressingProperties,
+ public void commit(final Notification commit, final MAP map,
final ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString();
- final CompletionCoordinatorDetails details = new CompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID();
+ final CompletionCoordinatorDetails details = new CompletionCoordinatorDetails(map, arjunaContext) ;
details.setCommit(true) ;
synchronized(messageIdMap)
@@ -86,14 +85,14 @@
/**
* Rollback.
* @param rollback The rollback notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void rollback(final Notification rollback, final AddressingProperties addressingProperties,
+ public void rollback(final Notification rollback, final MAP map,
final ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CompletionCoordinatorDetails details = new CompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CompletionCoordinatorDetails details = new CompletionCoordinatorDetails(map, arjunaContext) ;
details.setRollback(true) ;
synchronized(messageIdMap)
@@ -122,20 +121,20 @@
public static class CompletionCoordinatorDetails
{
- private final AddressingProperties addressingProperties ;
+ private final MAP map ;
private final ArjunaContext arjunaContext ;
private boolean commit ;
private boolean rollback ;
- CompletionCoordinatorDetails(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ CompletionCoordinatorDetails(final MAP map, final ArjunaContext arjunaContext)
{
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
- public AddressingProperties getAddressingProperties()
+ public MAP getMAP()
{
- return addressingProperties ;
+ return map ;
}
public ArjunaContext getArjunaContext()
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionInitiatorCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionInitiatorCallback.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCompletionInitiatorCallback.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,11 +23,10 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsat.processors.CompletionInitiatorCallback;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import javax.xml.ws.addressing.AddressingProperties;
-
-/**
+/** B
* Base callback class for tests.
* @author kevin
*/
@@ -36,10 +35,10 @@
/**
* An aborted response.
* @param aborted The aborted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void aborted(final Notification aborted, final AddressingProperties addressingProperties,
+ public void aborted(final Notification aborted, final MAP map,
final ArjunaContext arjunaContext)
{
throw new RuntimeException("Unexpected aborted response") ;
@@ -48,10 +47,10 @@
/**
* A committed response.
* @param committed The committed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void committed(final Notification committed, final AddressingProperties addressingProperties,
+ public void committed(final Notification committed, final MAP map,
final ArjunaContext arjunaContext)
{
throw new RuntimeException("Unexpected committed response") ;
@@ -60,10 +59,10 @@
/**
* A SOAP fault response.
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties,
+ public void soapFault(final SoapFault soapFault, final MAP map,
final ArjunaContext arjunaContext)
{
throw new RuntimeException("Unexpected SOAP fault response") ;
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -26,14 +26,12 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.CoordinatorCompletionCoordinatorInboundEvents;
import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionCoordinatorProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.SoapFault;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
public class TestCoordinatorCompletionCoordinatorProcessor extends CoordinatorCompletionCoordinatorProcessor
{
private Map messageIdMap = new HashMap() ;
@@ -92,12 +90,12 @@
* Cancelled.
*
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cancelled(NotificationType cancelled, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void cancelled(NotificationType cancelled, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(map, arjunaContext) ;
details.setCancelled(true); ;
synchronized(messageIdMap)
@@ -111,12 +109,12 @@
* Closed.
*
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void closed(NotificationType closed, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void closed(NotificationType closed, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(map, arjunaContext) ;
details.setClosed(true); ;
synchronized(messageIdMap)
@@ -130,12 +128,12 @@
* Compensated.
*
* @param compensated The compensated notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void compensated(NotificationType compensated, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void compensated(NotificationType compensated, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(map, arjunaContext) ;
details.setCompensated(true); ;
synchronized(messageIdMap)
@@ -149,12 +147,12 @@
* Completed.
*
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void completed(NotificationType completed, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void completed(NotificationType completed, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(map, arjunaContext) ;
details.setCompleted(true); ;
synchronized(messageIdMap)
@@ -164,10 +162,10 @@
}
}
- public void exit(NotificationType exit, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void exit(NotificationType exit, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(map, arjunaContext) ;
details.setExit(true) ;
synchronized(messageIdMap)
@@ -181,10 +179,10 @@
* Cannot complete.
*
* @param cannotComplete The cannot complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cannotComplete(NotificationType cannotComplete, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
+ public void cannotComplete(NotificationType cannotComplete, MAP map, ArjunaContext arjunaContext) {
//To change body of implemented methods use File | Settings | File Templates.
}
@@ -192,12 +190,12 @@
* Fault.
*
* @param fault The fault exception.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void fail(ExceptionType fault, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void fail(ExceptionType fault, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(map, arjunaContext) ;
details.setFail(fault); ;
synchronized(messageIdMap)
@@ -208,10 +206,10 @@
//To change body of implemented methods use File | Settings | File Templates.
}
- public void getStatus(NotificationType getStatus, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void getStatus(NotificationType getStatus, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(map, arjunaContext) ;
details.setGetStatus(true) ;
synchronized(messageIdMap)
@@ -225,12 +223,12 @@
* Status.
*
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(StatusType status, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void status(StatusType status, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(map, arjunaContext) ;
details.setStatus(status); ;
synchronized(messageIdMap)
@@ -244,12 +242,12 @@
* SOAP fault.
*
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(SoapFault soapFault, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void soapFault(SoapFault soapFault, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionCoordinatorDetails details = new CoordinatorCompletionCoordinatorDetails(map, arjunaContext) ;
details.setSoapFault(soapFault); ;
synchronized(messageIdMap)
@@ -261,7 +259,7 @@
public static class CoordinatorCompletionCoordinatorDetails
{
- private final AddressingProperties addressingProperties ;
+ private final MAP map ;
private final ArjunaContext arjunaContext ;
private boolean closed ;
private boolean cancelled ;
@@ -274,15 +272,15 @@
private boolean exit ;
private boolean getStatus ;
- CoordinatorCompletionCoordinatorDetails(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ CoordinatorCompletionCoordinatorDetails(final MAP map, final ArjunaContext arjunaContext)
{
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
- public AddressingProperties getAddressingProperties()
+ public MAP getMAP()
{
- return addressingProperties ;
+ return map ;
}
public ArjunaContext getArjunaContext()
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionParticipantProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorCompletionParticipantProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -26,14 +26,12 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.CoordinatorCompletionParticipantInboundEvents;
import com.arjuna.webservices11.wsba.processors.CoordinatorCompletionParticipantProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.SoapFault;
import com.arjuna.wst.BusinessAgreementWithCoordinatorCompletionParticipant;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
public class TestCoordinatorCompletionParticipantProcessor extends CoordinatorCompletionParticipantProcessor
{
private Map messageIdMap = new HashMap() ;
@@ -93,10 +91,10 @@
return false;
}
- public void cancel(NotificationType cancel, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void cancel(NotificationType cancel, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(map, arjunaContext) ;
details.setCancel(true) ;
synchronized(messageIdMap)
@@ -106,10 +104,10 @@
}
}
- public void close(NotificationType close, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void close(NotificationType close, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(map, arjunaContext) ;
details.setClose(true) ;
synchronized(messageIdMap)
@@ -119,10 +117,10 @@
}
}
- public void compensate(NotificationType compensate, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void compensate(NotificationType compensate, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(map, arjunaContext) ;
details.setCompensate(true) ;
synchronized(messageIdMap)
@@ -132,10 +130,10 @@
}
}
- public void complete(NotificationType complete, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void complete(NotificationType complete, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(map, arjunaContext) ;
details.setComplete(true) ;
synchronized(messageIdMap)
@@ -149,12 +147,12 @@
* Exited.
*
* @param exited The exited notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void exited(NotificationType exited, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ public void exited(NotificationType exited, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(map, arjunaContext) ;
details.setExited(true) ;
synchronized(messageIdMap)
@@ -168,12 +166,12 @@
* Not Completed.
*
* @param notCompleted The not completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void notCompleted(NotificationType notCompleted, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ public void notCompleted(NotificationType notCompleted, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(map, arjunaContext) ;
details.setNotCompleted(true) ;
synchronized(messageIdMap)
@@ -187,12 +185,12 @@
* Faulted.
*
* @param failed The failed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void failed(NotificationType failed, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ public void failed(NotificationType failed, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(map, arjunaContext) ;
details.setFailed(true) ;
synchronized(messageIdMap)
@@ -202,10 +200,10 @@
}
}
- public void getStatus(NotificationType getStatus, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void getStatus(NotificationType getStatus, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(map, arjunaContext) ;
details.setGetStatus(true) ;
synchronized(messageIdMap)
@@ -219,12 +217,12 @@
* Status.
*
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(StatusType status, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ public void status(StatusType status, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(map, arjunaContext) ;
details.setStatus(status) ;
synchronized(messageIdMap)
@@ -238,12 +236,12 @@
* SOAP fault.
*
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(SoapFault soapFault, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ public void soapFault(SoapFault soapFault, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final CoordinatorCompletionParticipantDetails details = new CoordinatorCompletionParticipantDetails(map, arjunaContext) ;
details.setSoapFault(soapFault) ;
synchronized(messageIdMap)
@@ -263,7 +261,7 @@
public static class CoordinatorCompletionParticipantDetails
{
- private final AddressingProperties addressingProperties ;
+ private final MAP map ;
private final ArjunaContext arjunaContext ;
private boolean cancel ;
private boolean close ;
@@ -276,15 +274,15 @@
private boolean getStatus ;
private SoapFault soapFault ;
- CoordinatorCompletionParticipantDetails(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ CoordinatorCompletionParticipantDetails(final MAP map, final ArjunaContext arjunaContext)
{
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
- public AddressingProperties getAddressingProperties()
+ public MAP getMAP()
{
- return addressingProperties ;
+ return map ;
}
public ArjunaContext getArjunaContext()
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,13 +25,10 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsarj.ArjunaContext;
-import com.arjuna.webservices11.wsat.ParticipantInboundEvents;
import com.arjuna.webservices11.wsat.CoordinatorInboundEvents;
-import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
import com.arjuna.webservices11.wsat.processors.CoordinatorProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
-
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
public class TestCoordinatorProcessor extends CoordinatorProcessor
@@ -95,10 +92,10 @@
}
public void aborted(Notification aborted,
- AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorDetails details = new CoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorDetails details = new CoordinatorDetails(map, arjunaContext) ;
details.setAborted(true) ;
synchronized(messageIdMap)
@@ -109,10 +106,10 @@
}
public void committed(Notification committed,
- AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorDetails details = new CoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorDetails details = new CoordinatorDetails(map, arjunaContext) ;
details.setCommitted(true) ;
synchronized(messageIdMap)
@@ -123,10 +120,10 @@
}
public void prepared(Notification prepared,
- AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorDetails details = new CoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorDetails details = new CoordinatorDetails(map, arjunaContext) ;
details.setPrepared(true) ;
synchronized(messageIdMap)
@@ -137,10 +134,10 @@
}
public void readOnly(Notification readOnly,
- AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorDetails details = new CoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorDetails details = new CoordinatorDetails(map, arjunaContext) ;
details.setReadOnly(true) ;
synchronized(messageIdMap)
@@ -151,10 +148,10 @@
}
public void replay(Notification replay,
- AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorDetails details = new CoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorDetails details = new CoordinatorDetails(map, arjunaContext) ;
details.setReplay(true) ;
synchronized(messageIdMap)
@@ -164,11 +161,11 @@
}
}
- public void soapFault(SoapFault soapFault, AddressingProperties addressingProperties,
+ public void soapFault(SoapFault soapFault, MAP map,
ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final CoordinatorDetails details = new CoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final CoordinatorDetails details = new CoordinatorDetails(map, arjunaContext) ;
details.setSoapFault(soapFault) ;
synchronized(messageIdMap)
@@ -180,7 +177,7 @@
public static class CoordinatorDetails
{
- private final AddressingProperties addressingProperties ;
+ private final MAP map ;
private final ArjunaContext arjunaContext ;
private boolean aborted ;
private boolean committed ;
@@ -189,15 +186,15 @@
private boolean replay ;
private SoapFault soapFault ;
- CoordinatorDetails(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ CoordinatorDetails(final MAP map, final ArjunaContext arjunaContext)
{
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
- public AddressingProperties getAddressingProperties()
+ public MAP getMAP()
{
- return addressingProperties ;
+ return map ;
}
public ArjunaContext getArjunaContext()
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionCoordinatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionCoordinatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -26,14 +26,12 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.ParticipantCompletionCoordinatorInboundEvents;
import com.arjuna.webservices11.wsba.processors.ParticipantCompletionCoordinatorProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.SoapFault;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
public class TestParticipantCompletionCoordinatorProcessor extends ParticipantCompletionCoordinatorProcessor
{
private Map messageIdMap = new HashMap() ;
@@ -92,12 +90,12 @@
* Cancelled.
*
* @param cancelled The cancelled notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cancelled(NotificationType cancelled, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void cancelled(NotificationType cancelled, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(map, arjunaContext) ;
details.setCancelled(true) ;
synchronized(messageIdMap)
@@ -111,12 +109,12 @@
* Closed.
*
* @param closed The closed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void closed(NotificationType closed, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void closed(NotificationType closed, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(map, arjunaContext) ;
details.setClosed(true) ;
synchronized(messageIdMap)
@@ -130,12 +128,12 @@
* Compensated.
*
* @param compensated The compensated notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void compensated(NotificationType compensated, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void compensated(NotificationType compensated, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(map, arjunaContext) ;
details.setCompensated(true) ;
synchronized(messageIdMap)
@@ -149,12 +147,12 @@
* Completed.
*
* @param completed The completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void completed(NotificationType completed, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void completed(NotificationType completed, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(map, arjunaContext) ;
details.setCompleted(true) ;
synchronized(messageIdMap)
@@ -168,13 +166,13 @@
* CannotComplete.
*
* @param cannotComplete The cannot complete notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void cannotComplete(NotificationType cannotComplete, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void cannotComplete(NotificationType cannotComplete, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(map, arjunaContext) ;
details.setCannotComplete(true) ;
synchronized(messageIdMap)
@@ -187,13 +185,13 @@
/**
* exit
* @param exit The exit notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void exit(NotificationType exit, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void exit(NotificationType exit, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(map, arjunaContext) ;
details.setExit(true) ;
synchronized(messageIdMap)
@@ -207,12 +205,12 @@
* Fault.
*
* @param fault The fault exception.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void fail(ExceptionType fault, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void fail(ExceptionType fault, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(map, arjunaContext) ;
details.setFault(fault) ;
synchronized(messageIdMap)
@@ -222,10 +220,10 @@
}
}
- public void getStatus(NotificationType getStatus, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void getStatus(NotificationType getStatus, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(map, arjunaContext) ;
details.setGetStatus(true) ;
synchronized(messageIdMap)
@@ -239,12 +237,12 @@
* Status.
*
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(StatusType status, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void status(StatusType status, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(map, arjunaContext) ;
details.setStatus(status) ;
synchronized(messageIdMap)
@@ -258,12 +256,12 @@
* SOAP fault.
*
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(SoapFault soapFault, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(addressingProperties, arjunaContext) ;
+ public void soapFault(SoapFault soapFault, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionCoordinatorDetails details = new ParticipantCompletionCoordinatorDetails(map, arjunaContext) ;
details.setSoapFault(soapFault) ;
synchronized(messageIdMap)
@@ -275,7 +273,7 @@
public static class ParticipantCompletionCoordinatorDetails
{
- private final AddressingProperties addressingProperties ;
+ private final MAP map ;
private final ArjunaContext arjunaContext ;
private boolean exit ;
private boolean getStatus ;
@@ -288,15 +286,15 @@
private StatusType status;
private SoapFault soapFault;
- ParticipantCompletionCoordinatorDetails(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ ParticipantCompletionCoordinatorDetails(final MAP map, final ArjunaContext arjunaContext)
{
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
- public AddressingProperties getAddressingProperties()
+ public MAP getMAP()
{
- return addressingProperties ;
+ return map ;
}
public ArjunaContext getArjunaContext()
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionParticipantProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantCompletionParticipantProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -26,14 +26,11 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsba.ParticipantCompletionParticipantInboundEvents;
import com.arjuna.webservices11.wsba.processors.ParticipantCompletionParticipantProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.wst.BusinessAgreementWithParticipantCompletionParticipant;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import javax.xml.ws.addressing.AddressingProperties;
-
-
public class TestParticipantCompletionParticipantProcessor extends ParticipantCompletionParticipantProcessor
{
private Map messageIdMap = new HashMap() ;
@@ -93,10 +90,10 @@
return false;
}
- public void cancel(NotificationType cancel, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void cancel(NotificationType cancel, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(map, arjunaContext) ;
details.setCancel(true) ;
synchronized(messageIdMap)
@@ -106,10 +103,10 @@
}
}
- public void close(NotificationType close, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void close(NotificationType close, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(map, arjunaContext) ;
details.setClose(true) ;
synchronized(messageIdMap)
@@ -119,10 +116,10 @@
}
}
- public void compensate(NotificationType compensate, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void compensate(NotificationType compensate, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(map, arjunaContext) ;
details.setCompensate(true) ;
synchronized(messageIdMap)
@@ -136,12 +133,12 @@
* Exited.
*
* @param exited The exited notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void exited(NotificationType exited, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ public void exited(NotificationType exited, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(map, arjunaContext) ;
details.setExited(true); ;
synchronized(messageIdMap)
@@ -155,12 +152,12 @@
* Not Completed.
*
* @param notCompleted The not completed notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void notCompleted(NotificationType notCompleted, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ public void notCompleted(NotificationType notCompleted, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(map, arjunaContext) ;
details.setNotCompleted(true); ;
synchronized(messageIdMap)
@@ -174,12 +171,12 @@
* Faulted.
*
* @param faulted The faulted notification.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void failed(NotificationType faulted, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ public void failed(NotificationType faulted, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(map, arjunaContext) ;
details.setFaulted(true); ;
synchronized(messageIdMap)
@@ -189,10 +186,10 @@
}
}
- public void getStatus(NotificationType getStatus, AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ public void getStatus(NotificationType getStatus, MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(map, arjunaContext) ;
details.setGetStatus(true) ;
synchronized(messageIdMap)
@@ -206,12 +203,12 @@
* Status.
*
* @param status The status.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void status(StatusType status, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ public void status(StatusType status, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(map, arjunaContext) ;
details.setStatus(status); ;
synchronized(messageIdMap)
@@ -225,12 +222,12 @@
* SOAP fault.
*
* @param soapFault The SOAP fault.
- * @param addressingProperties The addressing context.
+ * @param map The addressing context.
* @param arjunaContext The arjuna context.
*/
- public void soapFault(SoapFault soapFault, AddressingProperties addressingProperties, ArjunaContext arjunaContext) {
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(addressingProperties, arjunaContext) ;
+ public void soapFault(SoapFault soapFault, MAP map, ArjunaContext arjunaContext) {
+ final String messageId = map.getMessageID() ;
+ final ParticipantCompletionParticipantDetails details = new ParticipantCompletionParticipantDetails(map, arjunaContext) ;
details.setSoapFault(soapFault) ;
synchronized(messageIdMap)
@@ -243,7 +240,7 @@
public static class ParticipantCompletionParticipantDetails
{
- private final AddressingProperties addressingProperties ;
+ private final MAP map ;
private final ArjunaContext arjunaContext ;
private boolean cancel ;
private boolean close ;
@@ -255,15 +252,15 @@
private StatusType status;
private SoapFault soapFault;
- ParticipantCompletionParticipantDetails(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ ParticipantCompletionParticipantDetails(final MAP map, final ArjunaContext arjunaContext)
{
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
- public AddressingProperties getAddressingProperties()
+ public MAP getMAP()
{
- return addressingProperties ;
+ return map ;
}
public ArjunaContext getArjunaContext()
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TestParticipantProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -27,10 +27,9 @@
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsat.ParticipantInboundEvents;
import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import javax.xml.ws.addressing.AddressingProperties;
-
public class TestParticipantProcessor extends ParticipantProcessor
{
private Map messageIdMap = new HashMap() ;
@@ -93,10 +92,10 @@
}
public void commit(Notification commit,
- AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantDetails details = new ParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantDetails details = new ParticipantDetails(map, arjunaContext) ;
details.setCommit(true) ;
synchronized(messageIdMap)
@@ -107,10 +106,10 @@
}
public void prepare(Notification prepare,
- AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantDetails details = new ParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantDetails details = new ParticipantDetails(map, arjunaContext) ;
details.setPrepare(true) ;
synchronized(messageIdMap)
@@ -121,10 +120,10 @@
}
public void rollback(Notification rollback,
- AddressingProperties addressingProperties, ArjunaContext arjunaContext)
+ MAP map, ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantDetails details = new ParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantDetails details = new ParticipantDetails(map, arjunaContext) ;
details.setRollback(true) ;
synchronized(messageIdMap)
@@ -134,11 +133,11 @@
}
}
- public void soapFault(SoapFault soapFault, AddressingProperties addressingProperties,
+ public void soapFault(SoapFault soapFault, MAP map,
ArjunaContext arjunaContext)
{
- final String messageId = addressingProperties.getMessageID().getURI().toString() ;
- final ParticipantDetails details = new ParticipantDetails(addressingProperties, arjunaContext) ;
+ final String messageId = map.getMessageID() ;
+ final ParticipantDetails details = new ParticipantDetails(map, arjunaContext) ;
details.setSoapFault(soapFault) ;
synchronized(messageIdMap)
@@ -150,22 +149,22 @@
public static class ParticipantDetails
{
- private final AddressingProperties addressingProperties ;
+ private final MAP map ;
private final ArjunaContext arjunaContext ;
private boolean commit ;
private boolean prepare ;
private boolean rollback ;
private SoapFault soapFault ;
- ParticipantDetails(final AddressingProperties addressingProperties, final ArjunaContext arjunaContext)
+ ParticipantDetails(final MAP map, final ArjunaContext arjunaContext)
{
- this.addressingProperties = addressingProperties ;
+ this.map = map ;
this.arjunaContext = arjunaContext ;
}
- public AddressingProperties getAddressingProperties()
+ public MAP getMAP()
{
- return addressingProperties ;
+ return map ;
}
public ArjunaContext getArjunaContext()
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCCoordinatorTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCCoordinatorTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -30,7 +30,6 @@
import javax.xml.namespace.QName;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.addressing.AddressingProperties;
import junit.framework.TestCase;
@@ -39,12 +38,12 @@
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsat.client.ParticipantClient;
import com.arjuna.webservices11.wsat.processors.ParticipantProcessor;
import com.arjuna.wst11.tests.junit.TestParticipantProcessor.ParticipantDetails;
-import com.arjuna.wst11.tests.junit.TestParticipantProcessor;
import com.arjuna.wst11.tests.TestUtil;
public class TwoPCCoordinatorTestCase extends TestCase
@@ -63,11 +62,11 @@
throws Exception
{
final String messageId = "testSendPrepare" ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantServiceURI, messageId) ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("1") ;
final W3CEndpointReference participantEndpointReference = TestUtil.getParticipantEndpoint(null);
- ParticipantClient.getClient().sendPrepare(participantEndpointReference, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantClient.getClient().sendPrepare(participantEndpointReference, map, new InstanceIdentifier("sender")) ;
final ParticipantDetails details = testParticipantProcessor.getParticipantDetails(messageId, 10000) ;
@@ -80,11 +79,11 @@
throws Exception
{
final String messageId = "testSendCommit" ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantServiceURI, messageId) ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("2") ;
final W3CEndpointReference participantEndpointReference = TestUtil.getParticipantEndpoint(null);
- ParticipantClient.getClient().sendCommit(participantEndpointReference, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantClient.getClient().sendCommit(participantEndpointReference, map, new InstanceIdentifier("sender")) ;
final ParticipantDetails details = testParticipantProcessor.getParticipantDetails(messageId, 10000) ;
@@ -97,11 +96,11 @@
throws Exception
{
final String messageId = "testSendRollback" ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantServiceURI, messageId) ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("3") ;
final W3CEndpointReference participantEndpointReference = TestUtil.getParticipantEndpoint(null);
- ParticipantClient.getClient().sendRollback(participantEndpointReference, addressingProperties, new InstanceIdentifier("sender")) ;
+ ParticipantClient.getClient().sendRollback(participantEndpointReference, map, new InstanceIdentifier("sender")) ;
final ParticipantDetails details = testParticipantProcessor.getParticipantDetails(messageId, 10000) ;
@@ -114,7 +113,7 @@
throws Exception
{
final String messageId = "testSendError" ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.participantServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.participantServiceURI, messageId) ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("4") ;
final String reason = "testSendErrorReason" ;
@@ -122,7 +121,7 @@
final QName subcode = ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME ;
final SoapFault soapFault = new SoapFault11(soapFaultType, subcode, reason) ;
- ParticipantClient.getClient().sendSoapFault(addressingProperties, soapFault, new InstanceIdentifier("sender")) ;
+ ParticipantClient.getClient().sendSoapFault(map, soapFault, new InstanceIdentifier("sender")) ;
final ParticipantDetails details = testParticipantProcessor.getParticipantDetails(messageId, 10000) ;
final SoapFault receivedSoapFault = details.getSoapFault() ;
@@ -152,26 +151,26 @@
private void checkDetails(ParticipantDetails details, boolean hasFrom, boolean hasFaultTo, String messageId, InstanceIdentifier instanceIdentifier)
{
- AddressingProperties inAddressingProperties = details.getAddressingProperties();
+ MAP inMAP = details.getMAP();
ArjunaContext inArjunaContext = details.getArjunaContext();
- assertEquals(inAddressingProperties.getTo().getURI().toString(), TestUtil.participantServiceURI);
- assertNotNull(inAddressingProperties.getReplyTo());
- assertTrue(AddressingHelper.isNoneReplyTo(inAddressingProperties));
+ assertEquals(inMAP.getTo(), TestUtil.participantServiceURI);
+ assertNotNull(inMAP.getReplyTo());
+ assertTrue(AddressingHelper.isNoneReplyTo(inMAP));
if (hasFrom) {
- assertNotNull(inAddressingProperties.getFrom());
- assertEquals(inAddressingProperties.getFrom().getAddress().getURI().toString(), TestUtil.coordinatorServiceURI);
+ assertNotNull(inMAP.getFrom());
+ assertEquals(inMAP.getFrom().getAddress(), TestUtil.coordinatorServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
if (hasFaultTo) {
- assertNotNull(inAddressingProperties.getFaultTo());
- assertEquals(inAddressingProperties.getFaultTo().getAddress().getURI().toString(), TestUtil.coordinatorServiceURI);
+ assertNotNull(inMAP.getFaultTo());
+ assertEquals(inMAP.getFaultTo().getAddress(), TestUtil.coordinatorServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
- assertNotNull(inAddressingProperties.getMessageID());
- assertEquals(inAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertNotNull(inMAP.getMessageID());
+ assertEquals(inMAP.getMessageID(), messageId);
if (instanceIdentifier == null) {
assertNull(inArjunaContext);
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -30,12 +30,9 @@
import javax.xml.namespace.QName;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
import junit.framework.TestCase;
-import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsarj.ArjunaContext;
@@ -43,12 +40,10 @@
import com.arjuna.webservices.wsarjtx.ArjunaTXConstants;
import com.arjuna.webservices11.wsat.client.CoordinatorClient;
import com.arjuna.webservices11.wsat.processors.CoordinatorProcessor;
-import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.wst11.tests.junit.TestCoordinatorProcessor.CoordinatorDetails;
-import com.arjuna.wst11.tests.junit.TestCoordinatorProcessor;
import com.arjuna.wst11.tests.TestUtil;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
+import com.arjuna.webservices11.wsaddr.map.MAP;
public class TwoPCParticipantTestCase extends TestCase
{
@@ -68,9 +63,9 @@
final String messageId = "testSendPrepared" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("1") ;
W3CEndpointReference coordinatorEndpoint = TestUtil.getCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId) ;
- CoordinatorClient.getClient().sendPrepared(coordinatorEndpoint, addressingProperties, new InstanceIdentifier("sender"));
+ CoordinatorClient.getClient().sendPrepared(coordinatorEndpoint, map, new InstanceIdentifier("sender"));
CoordinatorDetails details = testCoordinatorProcessor.getCoordinatorDetails(messageId, 10000);
assertTrue(details.hasPrepared());
@@ -84,9 +79,9 @@
final String messageId = "testSendAborted" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("2") ;
W3CEndpointReference coordinatorEndpoint = TestUtil.getCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId) ;
- CoordinatorClient.getClient().sendAborted(coordinatorEndpoint, addressingProperties, new InstanceIdentifier("sender"));
+ CoordinatorClient.getClient().sendAborted(coordinatorEndpoint, map, new InstanceIdentifier("sender"));
CoordinatorDetails details = testCoordinatorProcessor.getCoordinatorDetails(messageId, 10000);
assertTrue(details.hasAborted());
@@ -100,9 +95,9 @@
final String messageId = "testSendReadOnly" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("3") ;
W3CEndpointReference coordinatorEndpoint = TestUtil.getCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId) ;
- CoordinatorClient.getClient().sendReadOnly(coordinatorEndpoint, addressingProperties, new InstanceIdentifier("sender"));
+ CoordinatorClient.getClient().sendReadOnly(coordinatorEndpoint, map, new InstanceIdentifier("sender"));
CoordinatorDetails details = testCoordinatorProcessor.getCoordinatorDetails(messageId, 10000);
assertTrue(details.hasReadOnly());
@@ -116,9 +111,9 @@
final String messageId = "testSendCommitted" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("4") ;
W3CEndpointReference coordinatorEndpoint = TestUtil.getCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId) ;
- CoordinatorClient.getClient().sendCommitted(coordinatorEndpoint, addressingProperties, new InstanceIdentifier("sender"));
+ CoordinatorClient.getClient().sendCommitted(coordinatorEndpoint, map, new InstanceIdentifier("sender"));
CoordinatorDetails details = testCoordinatorProcessor.getCoordinatorDetails(messageId, 10000);
assertTrue(details.hasCommitted());
@@ -132,13 +127,13 @@
final String messageId = "testSendError" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("5");
W3CEndpointReference coordinatorEndpoint = TestUtil.getCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId);
+ final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId);
final String reason = "testSendErrorReason" ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME ;
final SoapFault11 soapFault = new SoapFault11(soapFaultType, subcode, reason) ;
- CoordinatorClient.getClient().sendSoapFault(coordinatorEndpoint, addressingProperties, soapFault, new InstanceIdentifier("sender"));
+ CoordinatorClient.getClient().sendSoapFault(coordinatorEndpoint, map, soapFault, new InstanceIdentifier("sender"));
CoordinatorDetails details = testCoordinatorProcessor.getCoordinatorDetails(messageId, 10000);
assertNotNull(details.hasSoapFault());
@@ -167,26 +162,26 @@
private void checkDetails(CoordinatorDetails details, boolean hasFrom, boolean hasFaultTo, String messageId, InstanceIdentifier instanceIdentifier)
{
- AddressingProperties inAddressingProperties = details.getAddressingProperties();
+ MAP inMAP = details.getMAP();
ArjunaContext inArjunaContext = details.getArjunaContext();
- assertEquals(inAddressingProperties.getTo().getURI().toString(), TestUtil.coordinatorServiceURI);
- assertNotNull(inAddressingProperties.getReplyTo());
- assertTrue(AddressingHelper.isNoneReplyTo(inAddressingProperties));
+ assertEquals(inMAP.getTo(), TestUtil.coordinatorServiceURI);
+ assertNotNull(inMAP.getReplyTo());
+ assertTrue(AddressingHelper.isNoneReplyTo(inMAP));
if (hasFrom) {
- assertNotNull(inAddressingProperties.getFrom());
- assertEquals(inAddressingProperties.getFrom().getAddress().getURI().toString(), TestUtil.participantServiceURI);
+ assertNotNull(inMAP.getFrom());
+ assertEquals(inMAP.getFrom().getAddress(), TestUtil.participantServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
if (hasFaultTo) {
- assertNotNull(inAddressingProperties.getFaultTo());
- assertEquals(inAddressingProperties.getFaultTo().getAddress().getURI().toString(), TestUtil.participantServiceURI);
+ assertNotNull(inMAP.getFaultTo());
+ assertEquals(inMAP.getFaultTo().getAddress(), TestUtil.participantServiceURI);
} else {
- assertNull(inAddressingProperties.getFrom());
+ assertNull(inMAP.getFrom());
}
- assertNotNull(inAddressingProperties.getMessageID());
- assertEquals(inAddressingProperties.getMessageID().getURI().toString(), messageId);
+ assertNotNull(inMAP.getMessageID());
+ assertEquals(inMAP.getMessageID(), messageId);
if (instanceIdentifier == null) {
assertNull(inArjunaContext);
Modified: labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -33,7 +33,7 @@
</listener>
<servlet>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSASTestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -43,7 +43,7 @@
</servlet>
<servlet>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSASTestRunnerXMLServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -54,12 +54,12 @@
<!-- servlet mappings -->
<servlet-mapping>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<url-pattern>/index.xml</url-pattern>
</servlet-mapping>
Modified: labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf-tests_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf-tests_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -33,7 +33,7 @@
</listener>
<servlet>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSCFTestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -43,7 +43,7 @@
</servlet>
<servlet>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSCFTestRunnerXMLServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -54,12 +54,12 @@
<!-- servlet mappings -->
<servlet-mapping>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<url-pattern>/index.xml</url-pattern>
</servlet-mapping>
Modified: labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -33,7 +33,7 @@
</listener>
<servlet>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSCFTestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -43,7 +43,7 @@
</servlet>
<servlet>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSCFTestRunnerXMLServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -54,12 +54,12 @@
<!-- servlet mappings -->
<servlet-mapping>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<url-pattern>/index.xml</url-pattern>
</servlet-mapping>
Deleted: labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,120 +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.
- */
-/*
- * Copyright (C) 2002, 2003, 2004
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id$
- */
-
-package com.arjuna.mw.wst.client;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.Handler;
-import javax.xml.rpc.handler.HandlerInfo;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
-
-import com.arjuna.webservices.wscoor.CoordinationConstants;
-
-/**
- * The class is used to perform WS-Transaction context insertion
- * and extraction for application level SOAP messages using JaxRPC.
- *
- */
-
-public class JaxRPCHeaderContextProcessor extends JaxBaseHeaderContextProcessor implements Handler
-{
- /**
- * The handler information.
- */
- private HandlerInfo handlerInfo ;
-
- /**
- * Initialise the handler information.
- * @param handlerInfo The handler information.
- */
- public void init(final HandlerInfo handlerInfo)
- {
- this.handlerInfo = handlerInfo ;
- }
-
- /**
- * Destroy the handler.
- */
- public void destroy()
- {
- }
-
- /**
- * Get the headers.
- * @return the headers.
- */
- public QName[] getHeaders()
- {
- return new QName[] {new QName(CoordinationConstants.WSCOOR_NAMESPACE, CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT)};
- }
-
- /**
- * Handle the request.
- * @param messageContext The current message context.
- */
-
- public boolean handleRequest(final MessageContext messageContext)
- {
- final SOAPMessageContext soapMessageContext = (SOAPMessageContext)messageContext ;
- final SOAPMessage soapMessage = soapMessageContext.getMessage() ;
-
- return handleOutboundMessage(soapMessage);
- }
-
- /**
- * Handle the response.
- * @param messageContext The current message context.
- */
- public boolean handleResponse(final MessageContext messageContext)
- {
- final SOAPMessageContext soapMessageContext = (SOAPMessageContext)messageContext ;
- resumeTransaction(soapMessageContext.getMessage()) ;
- return true ;
- }
-
- /**
- * Handle the fault.
- * @param messageContext The current message context.
- */
- public boolean handleFault(final MessageContext messageContext)
- {
- final SOAPMessageContext soapMessageContext = (SOAPMessageContext)messageContext ;
- resumeTransaction(soapMessageContext.getMessage()) ;
- return true ;
- }
-}
Deleted: labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,117 +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.
- */
-/*
- * Copyright (C) 2002, 2003, 2004
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id$
- */
-
-package com.arjuna.mw.wst.service;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.Handler;
-import javax.xml.rpc.handler.HandlerInfo;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
-
-
-import com.arjuna.webservices.wscoor.CoordinationConstants;
-
-/**
- * The class is used to perform WS-Transaction context insertion
- * and extraction for application level SOAP messages using JaxRPC.
- */
-public class JaxRPCHeaderContextProcessor extends JaxBaseHeaderContextProcessor implements Handler
-{
- /**
- * The handler information.
- */
- private HandlerInfo handlerInfo ;
-
- /**
- * Initialise the handler information.
- * @param handlerInfo The handler information.
- */
- public void init(final HandlerInfo handlerInfo)
- {
- this.handlerInfo = handlerInfo ;
- }
-
- /**
- * Destroy the handler.
- */
- public void destroy()
- {
- }
-
- /**
- * Get the headers.
- * @return the headers.
- */
- public QName[] getHeaders()
- {
- return new QName[] {new QName(CoordinationConstants.WSCOOR_NAMESPACE, CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT)};
- }
-
- /**
- * Handle the request.
- * @param messageContext The current message context.
- */
- public boolean handleRequest(final MessageContext messageContext)
- {
- final SOAPMessageContext soapMessageContext = (SOAPMessageContext)messageContext ;
- final SOAPMessage soapMessage = soapMessageContext.getMessage() ;
-
- return handleInboundMessage(soapMessage);
- }
-
- /**
- * Handle the response.
- * @param messageContext The current message context.
- */
- public boolean handleResponse(final MessageContext messageContext)
- {
- suspendTransaction() ;
- return true ;
- }
-
- /**
- * Handle the fault.
- * @param messageContext The current message context.
- */
- public boolean handleFault(final MessageContext messageContext)
- {
- suspendTransaction() ;
- return true ;
- }
-}
Deleted: labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxRPCSubordinateHeaderContextProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxRPCSubordinateHeaderContextProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxRPCSubordinateHeaderContextProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -1,69 +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.
- */
-/*
- * Copyright (C) 2002, 2003, 2004
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id$
- */
-
-package com.arjuna.mw.wst.service;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.Handler;
-import javax.xml.rpc.handler.HandlerInfo;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
-
-
-import com.arjuna.webservices.wscoor.CoordinationConstants;
-
-/**
- * The class is used to perform WS-Transaction context insertion
- * and extraction for application level SOAP messages using JaxRPC.
- */
-public class JaxRPCSubordinateHeaderContextProcessor extends JaxRPCHeaderContextProcessor implements Handler
-{
- /**
- * Handle the request.
- * @param messageContext The current message context.
- */
- public boolean handleRequest(final MessageContext messageContext)
- {
- final SOAPMessageContext soapMessageContext = (SOAPMessageContext)messageContext ;
- final SOAPMessage soapMessage = soapMessageContext.getMessage() ;
-
- // the generic handler can do the job for us -- just pass the correct flag
-
- return handleInboundMessage(soapMessage, false);
- }
-}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -33,7 +33,7 @@
</listener>
<servlet>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSTXTestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -43,7 +43,7 @@
</servlet>
<servlet>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSTXTestRunnerXMLServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -54,12 +54,12 @@
<!-- servlet mappings -->
<servlet-mapping>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<url-pattern>/index.xml</url-pattern>
</servlet-mapping>
Modified: labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_web-app.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_web-app.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -33,7 +33,7 @@
</listener>
<servlet>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSTXTestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -43,7 +43,7 @@
</servlet>
<servlet>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSTXTestRunnerXMLServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
@@ -54,12 +54,12 @@
<!-- servlet mappings -->
<servlet-mapping>
- <servlet-name>JUnit Tests Servlet</servlet-name>
+ <servlet-name>JUnitTestsServlet</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit Tests XML Servlet</servlet-name>
+ <servlet-name>JUnitTestsXMLServlet</servlet-name>
<url-pattern>/index.xml</url-pattern>
</servlet-mapping>
Modified: labs/jbosstm/trunk/XTS/demo/ddrpc/jboss/webservices.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/ddrpc/jboss/webservices.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/demo/ddrpc/jboss/webservices.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -38,7 +38,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
@@ -57,7 +57,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
@@ -76,7 +76,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
@@ -95,7 +95,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
@@ -114,7 +114,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
@@ -133,7 +133,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
Copied: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java (from rev 26379, labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java)
===================================================================
--- labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java (rev 0)
+++ labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+/*
+ * Copyright (C) 2002, 2003, 2004
+ *
+ * Arjuna Technologies Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id$
+ */
+
+package com.arjuna.mw.wst.client;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.Handler;
+import javax.xml.rpc.handler.HandlerInfo;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPHeaderElement;
+import javax.xml.soap.SOAPMessage;
+
+import com.arjuna.webservices.wscoor.CoordinationConstants;
+
+/**
+ * The class is used to perform WS-Transaction context insertion
+ * and extraction for application level SOAP messages using JaxRPC.
+ *
+ */
+
+public class JaxRPCHeaderContextProcessor extends JaxBaseHeaderContextProcessor implements Handler
+{
+ /**
+ * The handler information.
+ */
+ private HandlerInfo handlerInfo ;
+
+ /**
+ * Initialise the handler information.
+ * @param handlerInfo The handler information.
+ */
+ public void init(final HandlerInfo handlerInfo)
+ {
+ this.handlerInfo = handlerInfo ;
+ }
+
+ /**
+ * Destroy the handler.
+ */
+ public void destroy()
+ {
+ }
+
+ /**
+ * Get the headers.
+ * @return the headers.
+ */
+ public QName[] getHeaders()
+ {
+ return new QName[] {new QName(CoordinationConstants.WSCOOR_NAMESPACE, CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT)};
+ }
+
+ /**
+ * Handle the request.
+ * @param messageContext The current message context.
+ */
+
+ public boolean handleRequest(final MessageContext messageContext)
+ {
+ final SOAPMessageContext soapMessageContext = (SOAPMessageContext)messageContext ;
+ final SOAPMessage soapMessage = soapMessageContext.getMessage() ;
+
+ return handleOutboundMessage(soapMessage);
+ }
+
+ /**
+ * Handle the response.
+ * @param messageContext The current message context.
+ */
+ public boolean handleResponse(final MessageContext messageContext)
+ {
+ final SOAPMessageContext soapMessageContext = (SOAPMessageContext)messageContext ;
+ resumeTransaction(soapMessageContext.getMessage()) ;
+ return true ;
+ }
+
+ /**
+ * Handle the fault.
+ * @param messageContext The current message context.
+ */
+ public boolean handleFault(final MessageContext messageContext)
+ {
+ final SOAPMessageContext soapMessageContext = (SOAPMessageContext)messageContext ;
+ resumeTransaction(soapMessageContext.getMessage()) ;
+ return true ;
+ }
+}
Copied: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCHeaderContextProcessor.java (from rev 26379, labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java)
===================================================================
--- labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCHeaderContextProcessor.java (rev 0)
+++ labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCHeaderContextProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -0,0 +1,118 @@
+/*
+ * 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.
+ */
+/*
+ * Copyright (C) 2002, 2003, 2004
+ *
+ * Arjuna Technologies Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id$
+ */
+
+package com.arjuna.mw.wst.server;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.Handler;
+import javax.xml.rpc.handler.HandlerInfo;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPHeaderElement;
+import javax.xml.soap.SOAPMessage;
+
+
+import com.arjuna.webservices.wscoor.CoordinationConstants;
+import com.arjuna.mw.wst.service.JaxBaseHeaderContextProcessor;
+
+/**
+ * The class is used to perform WS-Transaction context insertion
+ * and extraction for application level SOAP messages using JaxRPC.
+ */
+public class JaxRPCHeaderContextProcessor extends JaxBaseHeaderContextProcessor implements Handler
+{
+ /**
+ * The handler information.
+ */
+ private HandlerInfo handlerInfo ;
+
+ /**
+ * Initialise the handler information.
+ * @param handlerInfo The handler information.
+ */
+ public void init(final HandlerInfo handlerInfo)
+ {
+ this.handlerInfo = handlerInfo ;
+ }
+
+ /**
+ * Destroy the handler.
+ */
+ public void destroy()
+ {
+ }
+
+ /**
+ * Get the headers.
+ * @return the headers.
+ */
+ public QName[] getHeaders()
+ {
+ return new QName[] {new QName(CoordinationConstants.WSCOOR_NAMESPACE, CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT)};
+ }
+
+ /**
+ * Handle the request.
+ * @param messageContext The current message context.
+ */
+ public boolean handleRequest(final MessageContext messageContext)
+ {
+ final SOAPMessageContext soapMessageContext = (SOAPMessageContext)messageContext ;
+ final SOAPMessage soapMessage = soapMessageContext.getMessage() ;
+
+ return handleInboundMessage(soapMessage);
+ }
+
+ /**
+ * Handle the response.
+ * @param messageContext The current message context.
+ */
+ public boolean handleResponse(final MessageContext messageContext)
+ {
+ suspendTransaction() ;
+ return true ;
+ }
+
+ /**
+ * Handle the fault.
+ * @param messageContext The current message context.
+ */
+ public boolean handleFault(final MessageContext messageContext)
+ {
+ suspendTransaction() ;
+ return true ;
+ }
+}
Copied: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCSubordinateHeaderContextProcessor.java (from rev 26379, labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxRPCSubordinateHeaderContextProcessor.java)
===================================================================
--- labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCSubordinateHeaderContextProcessor.java (rev 0)
+++ labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCSubordinateHeaderContextProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+/*
+ * Copyright (C) 2002, 2003, 2004
+ *
+ * Arjuna Technologies Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id$
+ */
+
+package com.arjuna.mw.wst.server;
+
+import javax.xml.rpc.handler.Handler;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPMessage;
+
+/**
+ * The class is used to perform WS-Transaction context insertion
+ * and extraction for application level SOAP messages using JaxRPC.
+ */
+public class JaxRPCSubordinateHeaderContextProcessor extends JaxRPCHeaderContextProcessor implements Handler
+{
+ /**
+ * Handle the request.
+ * @param messageContext The current message context.
+ */
+ public boolean handleRequest(final MessageContext messageContext)
+ {
+ final SOAPMessageContext soapMessageContext = (SOAPMessageContext)messageContext ;
+ final SOAPMessage soapMessage = soapMessageContext.getMessage() ;
+
+ // the generic handler can do the job for us -- just pass the correct flag
+
+ return handleInboundMessage(soapMessage, false);
+ }
+}
\ No newline at end of file
Property changes on: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCSubordinateHeaderContextProcessor.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -106,9 +106,7 @@
<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>
+ <!-- todo put a copy of the handler file in WEB-INF and refer to it correctly from SEI class annotation-->
<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 -->
Deleted: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/initiatorhandlers.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -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>
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/participanthandlers.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,9 +28,5 @@
<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>
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/AsyncParticipantStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -27,14 +27,12 @@
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.wsaddr.map.MAP;
import com.arjuna.webservices11.SoapFault11;
import com.jboss.transaction.wstf.webservices.sc007.client.AsyncParticipantClient;
import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorCallback;
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.
*/
@@ -65,14 +63,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
+ AsyncParticipantClient.getClient().sendCompletionCommit(map, coordinatorURI) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -94,14 +92,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
+ AsyncParticipantClient.getClient().sendCompletionRollback(map, coordinatorURI) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -123,14 +121,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendCommit(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -152,14 +150,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendRollback(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -181,14 +179,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -210,14 +208,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendReadonly(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -239,14 +237,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -268,14 +266,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -297,14 +295,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -326,14 +324,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendReplayCommit(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -355,14 +353,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -384,14 +382,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -413,14 +411,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendRetryCommit(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -442,14 +440,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -471,14 +469,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final InitiatorProcessor initiator = InitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendLostCommitted(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -527,9 +525,9 @@
/**
* A response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void response(final AddressingProperties addressingProperties)
+ public void response(final MAP map)
{
this.response = true ;
}
@@ -537,9 +535,9 @@
/**
* A SOAP fault response.
* @param soapFault The SOAP fault response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+ public void soapFault(final SoapFault soapFault, final MAP map)
{
this.soapFault = soapFault ;
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/SyncParticipantStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -26,10 +26,9 @@
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.wsaddr.map.MAP;
import com.jboss.transaction.wstf.webservices.sc007.client.SyncParticipantClient;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The participant stub.
*/
@@ -60,9 +59,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
+ SyncParticipantClient.getClient().sendCompletionCommit(map, coordinatorURI) ;
}
/**
@@ -76,9 +75,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
+ SyncParticipantClient.getClient().sendCompletionRollback(map, coordinatorURI) ;
}
/**
@@ -92,9 +91,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendCommit(coordinationContext, map) ;
}
/**
@@ -108,9 +107,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendRollback(coordinationContext, map) ;
}
/**
@@ -124,9 +123,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, map) ;
}
/**
@@ -140,9 +139,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendReadonly(coordinationContext, map) ;
}
/**
@@ -156,9 +155,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, map) ;
}
/**
@@ -172,9 +171,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, map) ;
}
/**
@@ -188,9 +187,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, map) ;
}
/**
@@ -204,9 +203,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendReplayCommit(coordinationContext, map) ;
}
/**
@@ -220,9 +219,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, map) ;
}
/**
@@ -236,9 +235,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, map) ;
}
/**
@@ -252,9 +251,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendRetryCommit(coordinationContext, map) ;
}
/**
@@ -268,9 +267,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, map) ;
}
/**
@@ -284,8 +283,8 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendLostCommitted(coordinationContext, map) ;
}
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/AsyncParticipantClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,20 +21,17 @@
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.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
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
@@ -110,75 +107,59 @@
/**
* The initiator URI for replies.
*/
- private EndpointReference initiator = null;
+ private MAPEndpoint 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();
+ MAPBuilder builder = MAPBuilder.getBuilder();
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
- }
+ initiator = builder.newEndpoint(initiatorURIString);
}
/**
* Send a completion commit request.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCompletionCommit(final MAP map, final String coordinatorURI)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, completionCommitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, completionCommitAction);
port.completionCommit(coordinatorURI);
}
/**
* Send a completion rollback request.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCompletionRollback(final MAP map, final String coordinatorURI)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, completionRollbackAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, 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.
+ * @param map 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)
+ public void sendCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, commitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, commitAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -193,15 +174,15 @@
/**
* Send a rollback request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, rollbackAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, rollbackAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -216,15 +197,15 @@
/**
* Send a phase2Rollback request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, phase2RollbackAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, phase2RollbackAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -239,15 +220,15 @@
/**
* Send a readonly request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendReadonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, readonlyAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, readonlyAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -262,15 +243,15 @@
/**
* Send a volatileAndDurable request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, volatileAndDurableAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, volatileAndDurableAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -285,15 +266,15 @@
/**
* Send an earlyReadonly request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, earlyReadonlyAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, earlyReadonlyAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -308,15 +289,15 @@
/**
* Send a earlyAborted request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendEarlyAborted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, earlyAbortedAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, earlyAbortedAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -331,15 +312,15 @@
/**
* Send a replayCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendReplayCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, replayCommitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, replayCommitAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -354,15 +335,15 @@
/**
* Send a retryPreparedCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, retryPreparedCommitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, retryPreparedCommitAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -377,15 +358,15 @@
/**
* Send a retryPreparedAbort request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, retryPreparedAbortAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, retryPreparedAbortAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -400,14 +381,14 @@
/**
* Send a retryCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, retryCommitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, retryCommitAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -422,15 +403,15 @@
/**
* Send a preparedAfterTimeout request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, preparedAfterTimeoutAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, preparedAfterTimeoutAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -445,15 +426,15 @@
/**
* Send a lostCommitted request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendLostCommitted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = InteropClient.getParticipantPort(addressingProperties, lostCommittedAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = InteropClient.getParticipantPort(map, lostCommittedAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,21 +21,17 @@
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.webservices11.wsaddr.map.MAP;
import com.arjuna.wsc11.messaging.MessageId;
import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.AddressingBuilder;
-
/**
* The initiator client.
* @author kevin
@@ -57,57 +53,42 @@
*/
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.
+ * @param map 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)
+ public void sendResponse(final MAP map)
throws SoapFault, IOException
{
- InitiatorPortType port = InteropClient.getInitiatorPort(addressingProperties, responseAction);
+ InitiatorPortType port = InteropClient.getInitiatorPort(map, responseAction);
port.response();
}
/**
* Send a fault.
- * @param addressingProperties The addressing context.
+ * @param map 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)
+ public void sendSoapFault(final MAP map, 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());
+ MAP replyProperties = AddressingHelper.createFaultContext(map, MessageId.getMessageId());
AddressingHelper.installNoneReplyTo(replyProperties);
- SoapFaultClient.sendSoapFault(soapFault, addressingProperties, actionURI);
+ SoapFaultClient.sendSoapFault(soapFault, map, soapFaultAction);
}
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.
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InteropClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -20,18 +20,18 @@
*/
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.soap.AddressingFeature;
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.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.jboss.transaction.wstf.webservices.sc007.generated.Sc007Service;
import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;
import com.jboss.transaction.wstf.webservices.sc007.generated.ParticipantPortType;
@@ -55,7 +55,7 @@
/**
* builder used to construct addressing info for calls
*/
- private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ private static MAPBuilder builder = MAPBuilder.getBuilder();
/**
* fetch an Sc007 service unique to the current thread
@@ -69,45 +69,36 @@
return sc007Service.get();
}
- public static InitiatorPortType getInitiatorPort(AddressingProperties addressingProperties,
+ public static InitiatorPortType getInitiatorPort(MAP map,
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);
+ InitiatorPortType port = service.getPort(InitiatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- AttributedURI toUri = addressingProperties.getTo();
- List<Handler> customHandlerChain = new ArrayList<Handler>();
+ String to = map.getTo();
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
+ List<Handler> customHandlerChain = new ArrayList<Handler>();
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
- }
+ map.setAction(action);
+ map.setFrom(getParticipant());
+ AddressingHelper.configureRequestContext(requestContext, map, to, action);
+
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)
+ public static ParticipantPortType getParticipantPort(MAP map, 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);
+ ParticipantPortType port = service.getPort(ParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- AttributedURI toUri = addressingProperties.getTo();
+ String to = map.getTo();
List<Handler> customHandlerChain = new ArrayList<Handler>();
/*
* we need to add the coordination context handler in the case where we are passing a
@@ -115,55 +106,38 @@
*/
customHandlerChain.add(new CoordinationContextHandler());
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can 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
- }
+ map.setAction(action);
+ map.setFrom(getInitiator());
+ AddressingHelper.configureRequestContext(requestContext, map, to, action);
+
return port;
}
- private static EndpointReference initiator;
- private static EndpointReference participant;
+ private static MAPEndpoint initiator;
+ private static MAPEndpoint participant;
- private static synchronized EndpointReference getInitiator()
+ private static synchronized MAPEndpoint 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
- }
+ ServiceRegistry.getRegistry().getServiceURI(InteropConstants.SERVICE_INITIATOR);
+ initiator = builder.newEndpoint(initiatorURIString);
}
return initiator;
}
- private static synchronized EndpointReference getParticipant()
+ private static synchronized MAPEndpoint 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
- }
+ participant = builder.newEndpoint(participantURIString);
}
return participant;
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/SyncParticipantClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,9 +22,8 @@
import java.io.IOException;
-import javax.xml.ws.addressing.AddressingProperties;
-
import com.arjuna.webservices.*;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
import com.jboss.transaction.wstf.webservices.sc007.InteropConstants;
@@ -109,24 +108,24 @@
/**
* Send a completion commit request.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCompletionCommit(final MAP map, 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 map 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)
+ public void sendCompletionRollback(final MAP map, final String coordinatorURI)
throws SoapFault, IOException
{
}
@@ -134,11 +133,11 @@
/**
* Send a commit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -146,11 +145,11 @@
/**
* Send a rollback request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -158,11 +157,11 @@
/**
* Send a phase2Rollback request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -170,11 +169,11 @@
/**
* Send a readonly request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendReadonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -182,11 +181,11 @@
/**
* Send a volatileAndDurable request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -194,11 +193,11 @@
/**
* Send an earlyReadonly request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -206,11 +205,11 @@
/**
* Send a earlyAborted request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendEarlyAborted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -218,11 +217,11 @@
/**
* Send a replayCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendReplayCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -230,11 +229,11 @@
/**
* Send a retryPreparedCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -242,11 +241,11 @@
/**
* Send a retryPreparedAbort request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -254,11 +253,11 @@
/**
* Send a retryCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -266,11 +265,11 @@
/**
* Send a preparedAfterTimeout request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -278,11 +277,11 @@
/**
* Send a lostCommitted request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendLostCommitted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorCallback.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,9 +22,8 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.base.processors.Callback;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The callback for the initiator client.
* @author kevin
@@ -33,14 +32,14 @@
{
/**
* A response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public abstract void response(final AddressingProperties addressingProperties) ;
+ public abstract void response(final MAP map) ;
/**
* A SOAP fault response.
* @param soapFault The SOAP fault response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties) ;
+ public abstract void soapFault(final SoapFault soapFault, final MAP map) ;
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/InitiatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,9 +23,8 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.base.processors.Callback;
import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The Initiator processor.
* @author kevin
@@ -48,29 +47,29 @@
/**
* Handle a response response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void handleResponse(final AddressingProperties addressingProperties)
+ public void handleResponse(final MAP map)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((InitiatorCallback)callback).response(addressingProperties) ;
+ ((InitiatorCallback)callback).response(map) ;
}
- }, getIDs(addressingProperties)) ;
+ }, getIDs(map)) ;
}
/**
* Register a SOAP fault response.
* @param soapFault The SOAP fault response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+ public void handleSoapFault(final SoapFault soapFault, final MAP map)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((InitiatorCallback)callback).soapFault(soapFault, addressingProperties) ;
+ ((InitiatorCallback)callback).soapFault(soapFault, map) ;
}
- }, getIDs(addressingProperties)) ;
+ }, getIDs(map)) ;
}
/**
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/processors/ParticipantProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -25,6 +25,7 @@
import com.arjuna.wst.CompletionCoordinatorParticipant;
import com.arjuna.wst11.messaging.engines.ParticipantEngine;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.jboss.transaction.wstf.webservices.sc007.InteropUtil;
import com.jboss.transaction.wstf.webservices.sc007.participant.CommitDurable2PCParticipant;
import com.jboss.transaction.wstf.webservices.sc007.participant.CommitFailureDurable2PCParticipant;
@@ -34,8 +35,6 @@
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
@@ -59,10 +58,10 @@
/**
* Execute the CompletionCommit
* @param coordinatorURI The address of the coordinator to employ
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @throws SoapFault11 for errors during processing
*/
- public void completionCommit(final String coordinatorURI, final AddressingProperties addressingProperties)
+ public void completionCommit(final String coordinatorURI, final MAP map)
throws SoapFault11
{
try
@@ -80,11 +79,11 @@
/**
* Execute the CompletionRollback
* @param coordinatorURI The address of the coordinator to employ.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void completionRollback(final String coordinatorURI, final AddressingProperties addressingProperties)
+ public void completionRollback(final String coordinatorURI, final MAP map)
throws SoapFault11
{
try
@@ -101,11 +100,11 @@
/**
* Execute the Commit
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void commit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void commit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -120,11 +119,11 @@
/**
* Execute the Rollback
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void rollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -139,11 +138,11 @@
/**
* Execute the Phase2Rollback
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void phase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void phase2Rollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -159,11 +158,11 @@
/**
* Execute the Readonly
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void readonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void readonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -179,11 +178,11 @@
/**
* Execute the VolatileAndDurable
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void volatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void volatileAndDurable(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -198,11 +197,11 @@
/**
* Execute the EarlyReadonly
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void earlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void earlyReadonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -219,11 +218,11 @@
/**
* Execute the EarlyAborted
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void earlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void earlyAborted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -240,11 +239,11 @@
/**
* Execute the ReplayCommit
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void replayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void replayCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -261,11 +260,11 @@
/**
* Execute the RetryPreparedCommit
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void retryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void retryPreparedCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -281,11 +280,11 @@
/**
* Execute the RetryPreparedAbort
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void retryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void retryPreparedAbort(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -300,11 +299,11 @@
/**
* Execute the RetryCommit
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void retryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void retryCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -319,11 +318,11 @@
/**
* Execute the PreparedAfterTimeout
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void preparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void preparedAfterTimeout(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -339,11 +338,11 @@
/**
* Execute the LostCommitted
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void lostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void lostCommitted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,11 +22,12 @@
import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorProcessor;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import 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.soap.Addressing;
import javax.xml.ws.handler.MessageContext;
import javax.annotation.Resource;
@@ -37,12 +38,10 @@
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
*/
@@ -50,9 +49,8 @@
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")
+ serviceName="sc007Service")
+ at Addressing(required=true)
public class InitiatorPortTypeImpl {
/**
@@ -70,9 +68,9 @@
public void response()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
- InitiatorProcessor.getInitiator().handleResponse(inboundAddressProperties) ;
+ InitiatorProcessor.getInitiator().handleResponse(inboundMap) ;
}
@WebMethod(operationName = "SoapFault", action = "http://www.wstf.org/docs/scenarios/sc007/SoapFault")
@@ -83,10 +81,10 @@
Fault fault)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
- InitiatorProcessor.getInitiator().handleSoapFault(soapFaultInternal, inboundAddressProperties) ;
+ InitiatorProcessor.getInitiator().handleSoapFault(soapFaultInternal, inboundMap) ;
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -24,6 +24,7 @@
import com.jboss.transaction.wstf.webservices.sc007.client.InitiatorClient;
import com.jboss.transaction.wstf.webservices.CoordinationContextManager;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.wsc11.messaging.MessageId;
@@ -32,16 +33,12 @@
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.soap.Addressing;
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
*/
@@ -49,8 +46,8 @@
targetNamespace = "http://www.wstf.org/sc007",
portName="sc007ParticipantPort",
wsdlLocation="/WEB-INF/wsdl/sc007.wsdl",
- serviceName="Sc007Service")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
+ serviceName="sc007Service")
+ at Addressing(required=true)
@HandlerChain(file="participanthandlers.xml")
public class ParticipantPortTypeImpl {
@@ -72,14 +69,14 @@
String parameters)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
try {
- ParticipantProcessor.getParticipant().completionCommit(parameters, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().completionCommit(parameters, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -94,14 +91,14 @@
String parameters)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
try {
- ParticipantProcessor.getParticipant().completionRollback(parameters, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().completionRollback(parameters, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -113,15 +110,15 @@
public void commit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().commit(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().commit(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -133,15 +130,15 @@
public void rollback()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().rollback(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().rollback(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -153,15 +150,15 @@
public void phase2Rollback()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().phase2Rollback(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().phase2Rollback(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -173,15 +170,15 @@
public void readonly()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().readonly(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().readonly(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -193,15 +190,15 @@
public void volatileAndDurable()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().volatileAndDurable(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().volatileAndDurable(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -213,15 +210,15 @@
public void earlyReadonly()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().earlyReadonly(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().earlyReadonly(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -233,15 +230,15 @@
public void earlyAborted()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().earlyAborted(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().earlyAborted(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -253,15 +250,15 @@
public void replayCommit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().replayCommit(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().replayCommit(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -273,15 +270,15 @@
public void retryPreparedCommit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().retryPreparedCommit(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().retryPreparedCommit(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -293,15 +290,15 @@
public void retryPreparedAbort()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().retryPreparedAbort(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().retryPreparedAbort(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -313,15 +310,15 @@
public void retryCommit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().retryCommit(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().retryCommit(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -333,15 +330,15 @@
public void preparedAfterTimeout()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().preparedAfterTimeout(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().preparedAfterTimeout(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -353,31 +350,31 @@
public void lostCommitted()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ParticipantProcessor.getParticipant().lostCommitted(coordinationContext, inboundAddressProperties);
+ ParticipantProcessor.getParticipant().lostCommitted(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
* send an acknowledgement notifying a successfuly processed request
*
- * @param inboundAddressProperties identifes who to reply to and what message id the response should relate to
+ * @param inboundMap identifes who to reply to and what message id the response should relate to
*/
- private void sendResponse(AddressingProperties inboundAddressProperties)
+ private void sendResponse(MAP inboundMap)
{
- AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
+ MAP outboundAddressProperties = AddressingHelper.createResponseContext(inboundMap, 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);
+ String to = outboundAddressProperties.getTo();
+ System.out.println("com.jboss.transaction.txinterop.webservices.sc007.sei.ParticipantPortTypeImpl_1: unable to send response to " + to);
throw new ProtocolException(th);
}
}
@@ -385,12 +382,12 @@
/**
* 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
+ * @param inboundMap identifes who to reply to and what message id the fault message should relate to
*/
- private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
+ private void sendSoapFault(MAP inboundMap, SoapFault11 sf)
{
try {
- InitiatorClient.getClient().sendSoapFault(inboundAddressProperties, sf);
+ InitiatorClient.getClient().sendSoapFault(inboundMap, 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);
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -44,29 +44,29 @@
<!-- Define Interop 11 Server Endpoints -->
<servlet>
- <servlet-name>WSTF Sc007 Initiator Service</servlet-name>
+ <servlet-name>WSTFSc007InitiatorService</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-name>WSTFSc007ParticipantService</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>
+ <servlet-name>WSTFSc007InitiatorService</servlet-name>
<url-pattern>/InitiatorService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>WSTF Sc007 Participant Service</servlet-name>
+ <servlet-name>WSTFSc007ParticipantService</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-name>HTTPProxyServlet</servlet-name>
<servlet-class>com.jboss.transaction.wstf.proxy.ProxyListenerService</servlet-class>
<!--
The base URI of the proxy servlet.
@@ -79,40 +79,40 @@
</servlet>
<servlet>
- <servlet-name>JUnit test servlet</servlet-name>
+ <servlet-name>JUnittestservlet</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-name>XMLresultsservlet</servlet-name>
<servlet-class>com.jboss.transaction.wstf.test.XMLResultsServlet</servlet-class>
</servlet>
<servlet>
- <servlet-name>Log servlet</servlet-name>
+ <servlet-name>Logservlet</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>
+ <servlet-name>HTTPProxyServlet</servlet-name>
<url-pattern>/proxy/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit test servlet</servlet-name>
+ <servlet-name>JUnittestservlet</servlet-name>
<url-pattern>/test</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>XML results servlet</servlet-name>
+ <servlet-name>XMLresultsservlet</servlet-name>
<url-pattern>/xmlresults</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Log servlet</servlet-name>
+ <servlet-name>Logservlet</servlet-name>
<url-pattern>/logs/*</url-pattern>
</servlet-mapping>
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -106,13 +106,9 @@
<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>
+ <!-- todo put a copy of each handler file in WEB-INF and refer to it correctly from SEI class annotation-->
<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 -->
Deleted: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/initiatorhandlers.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -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>
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/interop11/participanthandlers.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,9 +28,5 @@
<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>
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -27,13 +27,12 @@
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.wsaddr.map.MAP;
import com.arjuna.webservices11.SoapFault11;
import com.jboss.transaction.txinterop.webservices.atinterop.client.AsyncParticipantClient;
import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorCallback;
import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The participant stub.
*/
@@ -64,14 +63,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
+ AsyncParticipantClient.getClient().sendCompletionCommit(map, coordinatorURI) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -93,14 +92,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
+ AsyncParticipantClient.getClient().sendCompletionRollback(map, coordinatorURI) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -122,14 +121,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendCommit(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -151,14 +150,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendRollback(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -180,14 +179,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -209,14 +208,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendReadonly(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -238,14 +237,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -267,14 +266,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -296,14 +295,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -325,14 +324,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendReplayCommit(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -354,14 +353,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -383,14 +382,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -412,14 +411,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendRetryCommit(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -441,14 +440,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -470,14 +469,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final ATInitiatorProcessor initiator = ATInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendLostCommitted(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -526,9 +525,9 @@
/**
* A response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void response(final AddressingProperties addressingProperties)
+ public void response(final MAP map)
{
this.response = true ;
}
@@ -536,9 +535,9 @@
/**
* A SOAP fault response.
* @param soapFault The SOAP fault response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+ public void soapFault(final SoapFault soapFault, final MAP map)
{
this.soapFault = soapFault ;
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/SyncParticipantStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -26,10 +26,9 @@
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.wsaddr.map.MAP;
import com.jboss.transaction.txinterop.webservices.atinterop.client.SyncParticipantClient;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The participant stub.
*/
@@ -60,9 +59,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCompletionCommit(addressingProperties, coordinatorURI) ;
+ SyncParticipantClient.getClient().sendCompletionCommit(map, coordinatorURI) ;
}
/**
@@ -76,9 +75,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCompletionRollback(addressingProperties, coordinatorURI) ;
+ SyncParticipantClient.getClient().sendCompletionRollback(map, coordinatorURI) ;
}
/**
@@ -92,9 +91,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCommit(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendCommit(coordinationContext, map) ;
}
/**
@@ -108,9 +107,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendRollback(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendRollback(coordinationContext, map) ;
}
/**
@@ -124,9 +123,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendPhase2Rollback(coordinationContext, map) ;
}
/**
@@ -140,9 +139,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendReadonly(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendReadonly(coordinationContext, map) ;
}
/**
@@ -156,9 +155,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendVolatileAndDurable(coordinationContext, map) ;
}
/**
@@ -172,9 +171,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendEarlyReadonly(coordinationContext, map) ;
}
/**
@@ -188,9 +187,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendEarlyAborted(coordinationContext, map) ;
}
/**
@@ -204,9 +203,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendReplayCommit(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendReplayCommit(coordinationContext, map) ;
}
/**
@@ -220,9 +219,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendRetryPreparedCommit(coordinationContext, map) ;
}
/**
@@ -236,9 +235,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendRetryPreparedAbort(coordinationContext, map) ;
}
/**
@@ -252,9 +251,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendRetryCommit(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendRetryCommit(coordinationContext, map) ;
}
/**
@@ -268,9 +267,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendPreparedAfterTimeout(coordinationContext, map) ;
}
/**
@@ -284,8 +283,8 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendLostCommitted(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendLostCommitted(coordinationContext, map) ;
}
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/ATInteropClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -20,20 +20,18 @@
*/
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.soap.AddressingFeature;
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.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorService;
import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantService;
import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;
@@ -63,7 +61,7 @@
/**
* builder used to construct addressing info for calls
*/
- private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ private static MAPBuilder builder = MAPBuilder.getBuilder();
/**
* fetch a coordinator activation service unique to the current thread
@@ -89,45 +87,35 @@
return participantService.get();
}
- public static InitiatorPortType getInitiatorPort(AddressingProperties addressingProperties,
+ public static InitiatorPortType getInitiatorPort(MAP map,
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);
+ InitiatorPortType port = service.getPort(InitiatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- AttributedURI toUri = addressingProperties.getTo();
- List<Handler> customHandlerChain = new ArrayList<Handler>();
+ String to = map.getTo();
/*
* we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
- */
+ List<Handler> customHandlerChain = new ArrayList<Handler>();
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
- }
+ map.setAction(action);
+ map.setFrom(getParticipant());
+ AddressingHelper.configureRequestContext(requestContext, map, to, action);
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)
+ public static ParticipantPortType getParticipantPort(MAP map, 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);
+ ParticipantPortType port = service.getPort(ParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- AttributedURI toUri = addressingProperties.getTo();
+ String to = map.getTo();
List<Handler> customHandlerChain = new ArrayList<Handler>();
/*
* we need to add the coordination context handler in the case where we are passing a
@@ -135,55 +123,38 @@
*/
customHandlerChain.add(new CoordinationContextHandler());
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can 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
- }
+ map.setAction(action);
+ map.setFrom(getInitiator());
+ AddressingHelper.configureRequestContext(requestContext, map, to, action);
+
return port;
}
- private static EndpointReference initiator;
- private static EndpointReference participant;
+ private static MAPEndpoint initiator;
+ private static MAPEndpoint participant;
- private static synchronized EndpointReference getInitiator()
+ private static synchronized MAPEndpoint 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
- }
+ ServiceRegistry.getRegistry().getServiceURI(ATInteropConstants.SERVICE_INITIATOR);
+ initiator = builder.newEndpoint(initiatorURIString);
}
return initiator;
}
- private static synchronized EndpointReference getParticipant()
+ private static synchronized MAPEndpoint 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
- }
+ participant = builder.newEndpoint(participantURIString);
}
return participant;
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/AsyncParticipantClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,20 +21,17 @@
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.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
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
@@ -110,7 +107,7 @@
/**
* The initiator URI for replies.
*/
- private EndpointReference initiator = null;
+ private MAPEndpoint initiator = null;
/**
* Construct the interop synch client.
@@ -127,58 +124,52 @@
//ClientPolicy.register(handlerRegistry) ;
//soapService = new SoapService(handlerRegistry) ;
- AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ MAPBuilder builder = MAPBuilder.getBuilder();
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
- }
+ initiator = builder.newEndpoint(initiatorURIString);
}
/**
* Send a completion commit request.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCompletionCommit(final MAP map, final String coordinatorURI)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, completionCommitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, completionCommitAction);
port.completionCommit(coordinatorURI);
}
/**
* Send a completion rollback request.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCompletionRollback(final MAP map, final String coordinatorURI)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, completionRollbackAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, 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.
+ * @param map 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)
+ public void sendCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, commitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, commitAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -193,15 +184,15 @@
/**
* Send a rollback request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, rollbackAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, rollbackAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -216,15 +207,15 @@
/**
* Send a phase2Rollback request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, phase2RollbackAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, phase2RollbackAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -239,15 +230,15 @@
/**
* Send a readonly request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendReadonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, readonlyAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, readonlyAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -262,15 +253,15 @@
/**
* Send a volatileAndDurable request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, volatileAndDurableAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, volatileAndDurableAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -285,15 +276,15 @@
/**
* Send an earlyReadonly request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, earlyReadonlyAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, earlyReadonlyAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -308,15 +299,15 @@
/**
* Send a earlyAborted request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendEarlyAborted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, earlyAbortedAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, earlyAbortedAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -331,15 +322,15 @@
/**
* Send a replayCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendReplayCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, replayCommitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, replayCommitAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -354,15 +345,15 @@
/**
* Send a retryPreparedCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, retryPreparedCommitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, retryPreparedCommitAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -377,15 +368,15 @@
/**
* Send a retryPreparedAbort request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, retryPreparedAbortAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, retryPreparedAbortAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -400,14 +391,14 @@
/**
* Send a retryCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, retryCommitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, retryCommitAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -422,15 +413,15 @@
/**
* Send a preparedAfterTimeout request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, preparedAfterTimeoutAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, preparedAfterTimeoutAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
@@ -445,15 +436,15 @@
/**
* Send a lostCommitted request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendLostCommitted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = ATInteropClient.getParticipantPort(addressingProperties, lostCommittedAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = ATInteropClient.getParticipantPort(map, lostCommittedAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try
{
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,32 +21,17 @@
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.webservices11.wsaddr.map.MAP;
import com.arjuna.wsc11.messaging.MessageId;
import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;
-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
@@ -80,45 +65,38 @@
/**
* Send a response.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendResponse(final MAP map)
throws SoapFault, IOException
{
- InitiatorPortType port = ATInteropClient.getInitiatorPort(addressingProperties, responseAction);
+ InitiatorPortType port = ATInteropClient.getInitiatorPort(map, responseAction);
port.response();
}
/**
* Send a fault.
- * @param addressingProperties The addressing context.
+ * @param map 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)
+ public void sendSoapFault(final MAP map, 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());
+ MAP replyProperties = AddressingHelper.createFaultContext(map, MessageId.getMessageId());
AddressingHelper.installNoneReplyTo(replyProperties);
- SoapFaultClient.sendSoapFault(soapFault, addressingProperties, actionURI);
+ SoapFaultClient.sendSoapFault(soapFault, map, soapFaultAction);
}
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.
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,9 +22,8 @@
import java.io.IOException;
-import javax.xml.ws.addressing.AddressingProperties;
-
import com.arjuna.webservices.*;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
@@ -109,24 +108,24 @@
/**
* Send a completion commit request.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCompletionCommit(final MAP map, 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 map 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)
+ public void sendCompletionRollback(final MAP map, final String coordinatorURI)
throws SoapFault, IOException
{
}
@@ -134,11 +133,11 @@
/**
* Send a commit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -146,11 +145,11 @@
/**
* Send a rollback request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -158,11 +157,11 @@
/**
* Send a phase2Rollback request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendPhase2Rollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -170,11 +169,11 @@
/**
* Send a readonly request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendReadonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -182,11 +181,11 @@
/**
* Send a volatileAndDurable request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendVolatileAndDurable(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -194,11 +193,11 @@
/**
* Send an earlyReadonly request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendEarlyReadonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -206,11 +205,11 @@
/**
* Send a earlyAborted request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendEarlyAborted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -218,11 +217,11 @@
/**
* Send a replayCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendReplayCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -230,11 +229,11 @@
/**
* Send a retryPreparedCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryPreparedCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -242,11 +241,11 @@
/**
* Send a retryPreparedAbort request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryPreparedAbort(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -254,11 +253,11 @@
/**
* Send a retryCommit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendRetryCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -266,11 +265,11 @@
/**
* Send a preparedAfterTimeout request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendPreparedAfterTimeout(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -278,11 +277,11 @@
/**
* Send a lostCommitted request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendLostCommitted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorCallback.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,9 +22,8 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.base.processors.Callback;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The callback for the initiator client.
* @author kevin
@@ -33,14 +32,14 @@
{
/**
* A response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public abstract void response(final AddressingProperties addressingProperties) ;
+ public abstract void response(final MAP map) ;
/**
* A SOAP fault response.
* @param soapFault The SOAP fault response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties) ;
+ public abstract void soapFault(final SoapFault soapFault, final MAP map) ;
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATInitiatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,9 +23,8 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.base.processors.Callback;
import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The Initiator processor.
* @author kevin
@@ -48,29 +47,29 @@
/**
* Handle a response response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void handleResponse(final AddressingProperties addressingProperties)
+ public void handleResponse(final MAP map)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((ATInitiatorCallback)callback).response(addressingProperties) ;
+ ((ATInitiatorCallback)callback).response(map) ;
}
- }, getIDs(addressingProperties)) ;
+ }, getIDs(map)) ;
}
/**
* Register a SOAP fault response.
* @param soapFault The SOAP fault response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+ public void handleSoapFault(final SoapFault soapFault, final MAP map)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((ATInitiatorCallback)callback).soapFault(soapFault, addressingProperties) ;
+ ((ATInitiatorCallback)callback).soapFault(soapFault, map) ;
}
- }, getIDs(addressingProperties)) ;
+ }, getIDs(map)) ;
}
/**
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,11 +21,11 @@
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.arjuna.webservices11.wsaddr.map.MAP;
import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropUtil;
import com.jboss.transaction.txinterop.webservices.atinterop.participant.CommitDurable2PCParticipant;
import com.jboss.transaction.txinterop.webservices.atinterop.participant.CommitFailureDurable2PCParticipant;
@@ -35,8 +35,6 @@
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
@@ -60,10 +58,10 @@
/**
* Execute the CompletionCommit
* @param coordinatorURI The address of the coordinator to employ
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @throws SoapFault11 for errors during processing
*/
- public void completionCommit(final String coordinatorURI, final AddressingProperties addressingProperties)
+ public void completionCommit(final String coordinatorURI, final MAP map)
throws SoapFault11
{
try
@@ -81,11 +79,11 @@
/**
* Execute the CompletionRollback
* @param coordinatorURI The address of the coordinator to employ.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void completionRollback(final String coordinatorURI, final AddressingProperties addressingProperties)
+ public void completionRollback(final String coordinatorURI, final MAP map)
throws SoapFault11
{
try
@@ -102,11 +100,11 @@
/**
* Execute the Commit
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void commit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void commit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -121,11 +119,11 @@
/**
* Execute the Rollback
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void rollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -140,11 +138,11 @@
/**
* Execute the Phase2Rollback
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void phase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void phase2Rollback(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -160,11 +158,11 @@
/**
* Execute the Readonly
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void readonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void readonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -180,11 +178,11 @@
/**
* Execute the VolatileAndDurable
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void volatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void volatileAndDurable(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -199,11 +197,11 @@
/**
* Execute the EarlyReadonly
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void earlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void earlyReadonly(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -220,11 +218,11 @@
/**
* Execute the EarlyAborted
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void earlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void earlyAborted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -241,11 +239,11 @@
/**
* Execute the ReplayCommit
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void replayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void replayCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -262,11 +260,11 @@
/**
* Execute the RetryPreparedCommit
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void retryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void retryPreparedCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -282,11 +280,11 @@
/**
* Execute the RetryPreparedAbort
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void retryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void retryPreparedAbort(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -301,11 +299,11 @@
/**
* Execute the RetryCommit
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void retryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void retryCommit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -320,11 +318,11 @@
/**
* Execute the PreparedAfterTimeout
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void preparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void preparedAfterTimeout(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -340,11 +338,11 @@
/**
* Execute the LostCommitted
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void lostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void lostCommitted(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,14 +21,13 @@
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 com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
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.soap.Addressing;
import javax.xml.ws.handler.MessageContext;
import javax.annotation.Resource;
@@ -39,18 +38,9 @@
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
*/
@@ -59,8 +49,7 @@
portName = "InitiatorPortType",
wsdlLocation="/WEB-INF/wsdl/interopat-initiator-binding.wsdl",
serviceName="InitiatorService")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="initiatorhandlers.xml")
+ at Addressing(required=true)
public class InitiatorPortTypeImpl {
/**
@@ -78,9 +67,9 @@
public void response()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
- ATInitiatorProcessor.getInitiator().handleResponse(inboundAddressProperties) ;
+ ATInitiatorProcessor.getInitiator().handleResponse(inboundMap) ;
}
@WebMethod(operationName = "SoapFault", action = "http://fabrikam123.com/SoapFault")
@@ -91,10 +80,10 @@
Fault fault)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
- ATInitiatorProcessor.getInitiator().handleSoapFault(soapFaultInternal, inboundAddressProperties) ;
+ ATInitiatorProcessor.getInitiator().handleSoapFault(soapFaultInternal, inboundMap) ;
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -20,12 +20,11 @@
*/
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.wsaddr.map.MAP;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.wsc11.messaging.MessageId;
@@ -34,18 +33,12 @@
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.soap.Addressing;
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
*/
@@ -54,7 +47,7 @@
portName="ParticipantPortType",
wsdlLocation="/WEB-INF/wsdl/interopat-participant-binding.wsdl",
serviceName="ParticipantService")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
+ at Addressing(required=true)
@HandlerChain(file="participanthandlers.xml")
public class ParticipantPortTypeImpl {
@@ -76,14 +69,14 @@
String parameters)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
try {
- ATParticipantProcessor.getParticipant().completionCommit(parameters, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().completionCommit(parameters, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -98,14 +91,14 @@
String parameters)
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
try {
- ATParticipantProcessor.getParticipant().completionRollback(parameters, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().completionRollback(parameters, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -117,15 +110,15 @@
public void commit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().commit(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().commit(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -137,15 +130,15 @@
public void rollback()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().rollback(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().rollback(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -157,15 +150,15 @@
public void phase2Rollback()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().phase2Rollback(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().phase2Rollback(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -177,15 +170,15 @@
public void readonly()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().readonly(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().readonly(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -197,15 +190,15 @@
public void volatileAndDurable()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().volatileAndDurable(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().volatileAndDurable(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -217,15 +210,15 @@
public void earlyReadonly()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().earlyReadonly(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().earlyReadonly(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -237,15 +230,15 @@
public void earlyAborted()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().earlyAborted(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().earlyAborted(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -257,15 +250,15 @@
public void replayCommit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().replayCommit(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().replayCommit(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -277,15 +270,15 @@
public void retryPreparedCommit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().retryPreparedCommit(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().retryPreparedCommit(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -297,15 +290,15 @@
public void retryPreparedAbort()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().retryPreparedAbort(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().retryPreparedAbort(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -317,15 +310,15 @@
public void retryCommit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().retryCommit(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().retryCommit(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -337,15 +330,15 @@
public void preparedAfterTimeout()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().preparedAfterTimeout(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().preparedAfterTimeout(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -357,31 +350,31 @@
public void lostCommitted()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- ATParticipantProcessor.getParticipant().lostCommitted(coordinationContext, inboundAddressProperties);
+ ATParticipantProcessor.getParticipant().lostCommitted(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
* send an acknowledgement notifying a successfuly processed request
*
- * @param inboundAddressProperties identifes who to reply to and what message id the response should relate to
+ * @param inboundMap identifes who to reply to and what message id the response should relate to
*/
- private void sendResponse(AddressingProperties inboundAddressProperties)
+ private void sendResponse(MAP inboundMap)
{
- AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
+ MAP outboundMap = AddressingHelper.createResponseContext(inboundMap, MessageId.getMessageId());
try {
- InitiatorClient.getClient().sendResponse(outboundAddressProperties);
+ InitiatorClient.getClient().sendResponse(outboundMap);
} 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);
+ String to = outboundMap.getTo();
+ System.out.println("com.jboss.transaction.txinterop.webservices.atinterop.sei.ParticipantPortTypeImpl_1: unable to send response to " + to);
throw new ProtocolException(th);
}
}
@@ -389,12 +382,12 @@
/**
* 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
+ * @param inboundMap identifes who to reply to and what message id the fault message should relate to
*/
- private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
+ private void sendSoapFault(MAP inboundMap, SoapFault11 sf)
{
try {
- InitiatorClient.getClient().sendSoapFault(inboundAddressProperties, sf);
+ InitiatorClient.getClient().sendSoapFault(inboundMap, 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);
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -28,12 +28,11 @@
import com.arjuna.wsc11.messaging.MessageId;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.jboss.transaction.txinterop.webservices.bainterop.client.AsyncParticipantClient;
import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAInitiatorCallback;
import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAInitiatorProcessor;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The participant stub.
*/
@@ -64,14 +63,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCancel(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendCancel(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -93,14 +92,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendExit(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendExit(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -122,14 +121,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendFail(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendFail(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -151,14 +150,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCannotComplete(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendCannotComplete(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -180,14 +179,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendParticipantCompleteClose(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendParticipantCompleteClose(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -209,14 +208,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCoordinatorCompleteClose(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendCoordinatorCompleteClose(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -238,14 +237,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendUnsolicitedComplete(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendUnsolicitedComplete(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -267,14 +266,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCompensate(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendCompensate(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -296,14 +295,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendCompensationFail(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendCompensationFail(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -325,14 +324,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendParticipantCancelCompletedRace(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendParticipantCancelCompletedRace(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -354,14 +353,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendMessageLossAndRecovery(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendMessageLossAndRecovery(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -383,14 +382,14 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
final RequestCallback callback = new RequestCallback() ;
final BAInitiatorProcessor initiator = BAInitiatorProcessor.getInitiator() ;
initiator.registerCallback(messageId, callback) ;
try
{
- AsyncParticipantClient.getClient().sendMixedOutcome(coordinationContext, addressingProperties) ;
+ AsyncParticipantClient.getClient().sendMixedOutcome(coordinationContext, map) ;
callback.waitUntilTriggered(15000) ;
}
finally
@@ -439,9 +438,9 @@
/**
* A response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void response(final AddressingProperties addressingProperties)
+ public void response(final MAP map)
{
this.response = true ;
}
@@ -449,9 +448,9 @@
/**
* A SOAP fault response.
* @param soapFault The SOAP fault response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+ public void soapFault(final SoapFault soapFault, final MAP map)
{
this.soapFault = soapFault ;
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/SyncParticipantStub.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -26,10 +26,9 @@
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.wsaddr.map.MAP;
import com.jboss.transaction.txinterop.webservices.bainterop.client.SyncParticipantClient;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The participant stub.
*/
@@ -60,9 +59,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCancel(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendCancel(coordinationContext, map) ;
}
/**
@@ -76,9 +75,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendExit(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendExit(coordinationContext, map) ;
}
/**
@@ -92,9 +91,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendFail(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendFail(coordinationContext, map) ;
}
/**
@@ -108,9 +107,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCannotComplete(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendCannotComplete(coordinationContext, map) ;
}
/**
@@ -124,9 +123,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendParticipantCompleteClose(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendParticipantCompleteClose(coordinationContext, map) ;
}
/**
@@ -140,9 +139,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCoordinatorCompleteClose(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendCoordinatorCompleteClose(coordinationContext, map) ;
}
/**
@@ -156,9 +155,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendUnsolicitedComplete(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendUnsolicitedComplete(coordinationContext, map) ;
}
/**
@@ -172,9 +171,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCompensate(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendCompensate(coordinationContext, map) ;
}
/**
@@ -188,9 +187,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendCompensationFail(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendCompensationFail(coordinationContext, map) ;
}
/**
@@ -204,9 +203,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendParticipantCancelCompletedRace(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendParticipantCancelCompletedRace(coordinationContext, map) ;
}
/**
@@ -220,9 +219,9 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendMessageLossAndRecovery(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendMessageLossAndRecovery(coordinationContext, map) ;
}
/**
@@ -236,8 +235,8 @@
throws SoapFault, IOException
{
final String messageId = MessageId.getMessageId() ;
- final AddressingProperties addressingProperties = AddressingHelper.createRequestContext(serviceURI, messageId) ;
+ final MAP map = AddressingHelper.createRequestContext(serviceURI, messageId) ;
- SyncParticipantClient.getClient().sendMixedOutcome(coordinationContext, addressingProperties) ;
+ SyncParticipantClient.getClient().sendMixedOutcome(coordinationContext, map) ;
}
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/AsyncParticipantClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,20 +21,17 @@
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.arjuna.webservices11.wsaddr.map.MAPEndpoint;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
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
@@ -98,7 +95,7 @@
/**
* The initiator URI for replies.
*/
- private EndpointReference initiator = null;
+ private MAPEndpoint initiator = null;
/**
* Construct the interop synch client.
@@ -116,28 +113,22 @@
// 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
- }
+ MAPBuilder builder = MAPBuilder.getBuilder();
+ initiator = builder.newEndpoint(initiatorURIString);
}
/**
* Send a cancel request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCancel(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, cancelAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, cancelAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.cancel();
@@ -149,15 +140,15 @@
/**
* Send a exit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendExit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, exitAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, exitAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.exit();
@@ -169,15 +160,15 @@
/**
* Send a fail request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendFail(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, failAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, failAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.fail();
@@ -189,15 +180,15 @@
/**
* Send a cannot complete request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCannotComplete(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, cannotCompleteAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, cannotCompleteAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.cannotComplete();
@@ -209,15 +200,15 @@
/**
* Send a participant complete close request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendParticipantCompleteClose(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, participantCompleteCloseAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, participantCompleteCloseAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.participantCompleteClose();
@@ -229,15 +220,15 @@
/**
* Send a coordinator complete close request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCoordinatorCompleteClose(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, coordinatorCompleteCloseAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, coordinatorCompleteCloseAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.coordinatorCompleteClose();
@@ -249,15 +240,15 @@
/**
* Send a unsolicited complete request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendUnsolicitedComplete(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, unsolicitedCompleteAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, unsolicitedCompleteAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.unsolicitedComplete();
@@ -269,15 +260,15 @@
/**
* Send a compensate request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCompensate(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, compensateAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, compensateAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.compensate();
@@ -289,15 +280,15 @@
/**
* Send a compensation fail request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCompensationFail(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, participantCompensationFailAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, participantCompensationFailAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.compensationFail();
@@ -309,15 +300,15 @@
/**
* 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.
+ * @param map 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)
+ public void sendParticipantCancelCompletedRace(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, participantCancelCompletedRaceAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, participantCancelCompletedRaceAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.participantCancelCompletedRace();
@@ -329,15 +320,15 @@
/**
* 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.
+ * @param map 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)
+ public void sendMessageLossAndRecovery(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, messageLossAndRecoveryAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, messageLossAndRecoveryAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.messageLossAndRecovery();
@@ -349,15 +340,15 @@
/**
* Send a mixed outcome request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendMixedOutcome(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
- addressingProperties.setReplyTo(initiator) ;
- ParticipantPortType port = BAInteropClient.getParticipantPort(addressingProperties, mixedOutcomeAction);
+ map.setReplyTo(initiator) ;
+ ParticipantPortType port = BAInteropClient.getParticipantPort(map, mixedOutcomeAction);
CoordinationContextManager.setThreadContext(coordinationContext) ;
try {
port.mixedOutcome();
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/BAInteropClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -20,24 +20,21 @@
*/
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.soap.AddressingFeature;
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;
+import com.arjuna.webservices11.wsaddr.map.MAPBuilder;
+import com.arjuna.webservices11.wsaddr.map.MAP;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
/**
* Created by IntelliJ IDEA.
@@ -61,7 +58,7 @@
/**
* builder used to construct addressing info for calls
*/
- private static AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ private static MAPBuilder builder = MAPBuilder.getBuilder();
/**
* fetch a coordinator activation service unique to the current thread
@@ -87,67 +84,50 @@
return participantService.get();
}
- public static InitiatorPortType getInitiatorPort(AddressingProperties addressingProperties,
- String action)
+ public static InitiatorPortType getInitiatorPort(MAP map, 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);
+ InitiatorPortType port = service.getPort(InitiatorPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- AttributedURI toUri = addressingProperties.getTo();
- List<Handler> customHandlerChain = new ArrayList<Handler>();
+ String to = map.getTo();
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
+ List<Handler> customHandlerChain = new ArrayList<Handler>();
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
- }
+ map.setAction(action);
+ AddressingHelper.configureRequestContext(requestContext, map, to, action);
+
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)
+ public static ParticipantPortType getParticipantPort(MAP map, 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);
+ ParticipantPortType port = service.getPort(ParticipantPortType.class, new AddressingFeature(true, true));
BindingProvider bindingProvider = (BindingProvider)port;
- AttributedURI toUri = addressingProperties.getTo();
+ String to = map.getTo();
List<Handler> customHandlerChain = new ArrayList<Handler>();
/*
- * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
- */
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can 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
- }
+ map.setAction(action);
+ AddressingHelper.configureRequestContext(requestContext, map, to, action);
+
return port;
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,19 +21,15 @@
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.wsaddr.map.MAP;
import com.arjuna.webservices11.SoapFault11;
import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorPortType;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.AddressingBuilder;
-
/**
* The initiator client.
* @author kevin
@@ -55,53 +51,39 @@
*/
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.
+ * @param map 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)
+ public void sendResponse(final MAP map)
throws SoapFault, IOException
{
- InitiatorPortType port = BAInteropClient.getInitiatorPort(addressingProperties, responseAction);
+ InitiatorPortType port = BAInteropClient.getInitiatorPort(map, responseAction);
port.response();
}
/**
* Send a fault.
- * @param addressingProperties The addressing context.
+ * @param map 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)
+ public void sendSoapFault(final MAP map, 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);
+ AddressingHelper.installNoneReplyTo(map);
+ SoapFaultClient.sendSoapFault(soapFault, map, soapFaultAction);
}
/**
@@ -114,5 +96,4 @@
}
private static final String faultAction = "http://fabrikam123.com/SoapFault";
- private static final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,9 +22,8 @@
import java.io.IOException;
-import javax.xml.ws.addressing.AddressingProperties;
-
import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices11.wsaddr.map.MAP;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
@@ -98,11 +97,11 @@
/**
* Send a cancel request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCancel(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -110,11 +109,11 @@
/**
* Send a exit request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendExit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -122,11 +121,11 @@
/**
* Send a fail request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendFail(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -134,11 +133,11 @@
/**
* Send a cannot complete request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCannotComplete(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -146,11 +145,11 @@
/**
* Send a participant complete close request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendParticipantCompleteClose(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -158,11 +157,11 @@
/**
* Send a coordinator complete close request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCoordinatorCompleteClose(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -170,11 +169,11 @@
/**
* Send a unsolicited complete request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendUnsolicitedComplete(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -182,11 +181,11 @@
/**
* Send a compensate request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCompensate(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -194,11 +193,11 @@
/**
* Send a compensation fail request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendCompensationFail(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -206,11 +205,11 @@
/**
* 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.
+ * @param map 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)
+ public void sendParticipantCancelCompletedRace(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -218,11 +217,11 @@
/**
* 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.
+ * @param map 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)
+ public void sendMessageLossAndRecovery(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
@@ -230,11 +229,11 @@
/**
* Send a mixed outcome request.
* @param coordinationContext The coordination context.
- * @param addressingProperties The addressing context initialised with to, message ID and relates to.
+ * @param map 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)
+ public void sendMixedOutcome(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault, IOException
{
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorCallback.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -22,9 +22,8 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.base.processors.Callback;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The callback for the initiator client.
* @author kevin
@@ -33,14 +32,14 @@
{
/**
* A response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public abstract void response(final AddressingProperties addressingProperties) ;
+ public abstract void response(final MAP map) ;
/**
* A SOAP fault response.
* @param soapFault The SOAP fault response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public abstract void soapFault(final SoapFault soapFault, final AddressingProperties addressingProperties) ;
+ public abstract void soapFault(final SoapFault soapFault, final MAP map) ;
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAInitiatorProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,9 +23,8 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.base.processors.Callback;
import com.arjuna.webservices11.wsaddr.processor.BaseWSAddrResponseProcessor;
+import com.arjuna.webservices11.wsaddr.map.MAP;
-import javax.xml.ws.addressing.AddressingProperties;
-
/**
* The Initiator processor.
* @author kevin
@@ -48,29 +47,29 @@
/**
* Handle a response response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void handleResponse(final AddressingProperties addressingProperties)
+ public void handleResponse(final MAP map)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((BAInitiatorCallback)callback).response(addressingProperties) ;
+ ((BAInitiatorCallback)callback).response(map) ;
}
- }, getIDs(addressingProperties)) ;
+ }, getIDs(map)) ;
}
/**
* Register a SOAP fault response.
* @param soapFault The SOAP fault response.
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
*/
- public void handleSoapFault(final SoapFault soapFault, final AddressingProperties addressingProperties)
+ public void handleSoapFault(final SoapFault soapFault, final MAP map)
{
handleCallbacks(new CallbackExecutorAdapter() {
public void execute(final Callback callback) {
- ((BAInitiatorCallback)callback).soapFault(soapFault, addressingProperties) ;
+ ((BAInitiatorCallback)callback).soapFault(soapFault, map) ;
}
- }, getIDs(addressingProperties)) ;
+ }, getIDs(map)) ;
}
/**
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -21,11 +21,11 @@
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.arjuna.webservices11.wsaddr.map.MAP;
import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropUtil;
import com.jboss.transaction.txinterop.webservices.bainterop.participant.CancelParticipant;
import com.jboss.transaction.txinterop.webservices.bainterop.participant.CoordinatorCompleteCloseParticipant;
@@ -36,8 +36,6 @@
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
@@ -60,11 +58,11 @@
/**
* Execute the Cancel
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void cancel(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void cancel(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -79,11 +77,11 @@
/**
* Execute the Exit
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void exit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void exit(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -101,11 +99,11 @@
/**
* Execute the Fail
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void fail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void fail(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -123,11 +121,11 @@
/**
* Execute the CannotComplete
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void cannotComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void cannotComplete(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -145,11 +143,11 @@
/**
* Execute the ParticipantCompleteClose
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void participantCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void participantCompleteClose(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -167,11 +165,11 @@
/**
* Execute the CoordinatorCompleteClose
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void coordinatorCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void coordinatorCompleteClose(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -186,11 +184,11 @@
/**
* Execute the UnsolicitedComplete
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void unsolicitedComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void unsolicitedComplete(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -208,11 +206,11 @@
/**
* Execute the Compensate
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void compensate(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void compensate(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -230,11 +228,11 @@
/**
* Execute the ParticipantCompensationFail
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void participantCompensationFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void participantCompensationFail(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -252,11 +250,11 @@
/**
* Execute the ParticipantCancelCompletedRace
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void participantCancelCompletedRace(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void participantCancelCompletedRace(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -274,11 +272,11 @@
/**
* Execute the MessageLossAndRecovery
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void messageLossAndRecovery(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void messageLossAndRecovery(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
try
@@ -293,11 +291,11 @@
/**
* Execute the MixedOutcome
- * @param addressingProperties The current addressing context.
+ * @param map The current addressing context.
* @return The response.
* @throws SoapFault11 for errors during processing
*/
- public void mixedOutcome(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
+ public void mixedOutcome(final CoordinationContextType coordinationContext, final MAP map)
throws SoapFault11
{
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -20,13 +20,12 @@
*/
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 com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.map.MAP;
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;
@@ -36,12 +35,8 @@
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;
+import javax.xml.ws.soap.Addressing;
-
/**
* Implementation class for WSTX 1.1 AT Interop Test Initiator service
*/
@@ -50,8 +45,7 @@
portName = "InitiatorPortType",
wsdlLocation="/WEB-INF/wsdl/interopba-initiator-binding.wsdl",
serviceName="InitiatorService")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="initiatorhandlers.xml")
+ at Addressing(required=true)
public class InitiatorPortTypeImpl {
/**
@@ -69,9 +63,9 @@
public void response()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
- BAInitiatorProcessor.getInitiator().handleResponse(inboundAddressProperties) ;
+ BAInitiatorProcessor.getInitiator().handleResponse(inboundMap) ;
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java 2009-05-12 14:36:47 UTC (rev 26470)
@@ -23,27 +23,21 @@
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.wsaddr.map.MAP;
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.soap.Addressing;
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
*/
@@ -52,7 +46,7 @@
portName="ParticipantPortType",
wsdlLocation="/WEB-INF/wsdl/interopba-participant-binding.wsdl",
serviceName="ParticipantService")
-// @EndpointConfig(configName = "Standard WSAddressing Endpoint")
+ at Addressing(required=true)
@HandlerChain(file="participanthandlers.xml")
public class ParticipantPortTypeImpl {
@@ -71,15 +65,15 @@
public void cancel()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().cancel(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().cancel(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -91,15 +85,15 @@
public void exit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().exit(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().exit(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -111,15 +105,15 @@
public void fail()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().fail(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().fail(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -131,15 +125,15 @@
public void cannotComplete()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().cannotComplete(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().cannotComplete(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -151,15 +145,15 @@
public void participantCompleteClose()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().participantCompleteClose(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().participantCompleteClose(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -171,15 +165,15 @@
public void coordinatorCompleteClose()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().coordinatorCompleteClose(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().coordinatorCompleteClose(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -191,15 +185,15 @@
public void unsolicitedComplete()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().unsolicitedComplete(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().unsolicitedComplete(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -211,15 +205,15 @@
public void compensate()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().compensate(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().compensate(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -231,15 +225,15 @@
public void compensationFail()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().participantCompensationFail(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().participantCompensationFail(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -251,15 +245,15 @@
public void participantCancelCompletedRace()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().participantCancelCompletedRace(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().participantCancelCompletedRace(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -271,15 +265,15 @@
public void messageLossAndRecovery()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().messageLossAndRecovery(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().messageLossAndRecovery(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
@@ -291,31 +285,31 @@
public void mixedOutcome()
{
MessageContext ctx = webServiceCtx.getMessageContext();
- AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
- BAParticipantProcessor.getParticipant().mixedOutcome(coordinationContext, inboundAddressProperties);
+ BAParticipantProcessor.getParticipant().mixedOutcome(coordinationContext, inboundMap);
} catch (SoapFault11 sf) {
- sendSoapFault(inboundAddressProperties, sf);
+ sendSoapFault(inboundMap, sf);
return;
}
- sendResponse(inboundAddressProperties);
+ sendResponse(inboundMap);
}
/**
* send an acknowledgement notifying a successfuly processed request
*
- * @param inboundAddressProperties identifes who to reply to and what message id the response should relate to
+ * @param inboundMap identifes who to reply to and what message id the response should relate to
*/
- private void sendResponse(AddressingProperties inboundAddressProperties)
+ private void sendResponse(MAP inboundMap)
{
- AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
+ MAP outboundAddressProperties = AddressingHelper.createResponseContext(inboundMap, 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);
+ String to = outboundAddressProperties.getTo();
+ System.out.println("com.jboss.transaction.txinterop.webservices.bainterop.sei.ParticipantPortTypeImpl_1: unable to send response to " + to);
throw new ProtocolException(th);
}
}
@@ -323,11 +317,11 @@
/**
* 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
+ * @param inboundMap identifes who to reply to and what message id the fault message should relate to
*/
- private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
+ private void sendSoapFault(MAP inboundMap, SoapFault11 sf)
{
- AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
+ MAP outboundAddressProperties = AddressingHelper.createResponseContext(inboundMap, MessageId.getMessageId());
try {
InitiatorClient.getClient().sendSoapFault(outboundAddressProperties, sf);
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web.xml 2009-05-12 11:57:22 UTC (rev 26469)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web.xml 2009-05-12 14:36:47 UTC (rev 26470)
@@ -63,49 +63,49 @@
<!-- Define Interop 11 Server Endpoints -->
<servlet>
- <servlet-name>Interop 11 AT Initiator Service</servlet-name>
+ <servlet-name>Interop11ATInitiatorService</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-name>Interop11ATParticipantService</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-name>Interop11BAInitiatorService</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-name>Interop11BAParticipantService</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>
+ <servlet-name>Interop11ATInitiatorService</servlet-name>
<url-pattern>/ATInitiatorService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Interop 11 AT Participant Service</servlet-name>
+ <servlet-name>Interop11ATParticipantService</servlet-name>
<url-pattern>/ATParticipantService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Interop 11 BA Initiator Service</servlet-name>
+ <servlet-name>Interop11BAInitiatorService</servlet-name>
<url-pattern>/BAInitiatorService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Interop 11 BA Participant Service</servlet-name>
+ <servlet-name>Interop11BAParticipantService</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-name>HTTPProxyServlet</servlet-name>
<servlet-class>com.jboss.transaction.txinterop.proxy.ProxyListenerService</servlet-class>
<!--
The base URI of the proxy servlet.
@@ -118,40 +118,40 @@
</servlet>
<servlet>
- <servlet-name>JUnit test servlet</servlet-name>
+ <servlet-name>JUnittestservlet</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-name>XMLresultsservlet</servlet-name>
<servlet-class>com.jboss.transaction.txinterop.test.XMLResultsServlet</servlet-class>
</servlet>
<servlet>
- <servlet-name>Log servlet</servlet-name>
+ <servlet-name>Logservlet</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>
+ <servlet-name>HTTPProxyServlet</servlet-name>
<url-pattern>/proxy/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>JUnit test servlet</servlet-name>
+ <servlet-name>JUnittestservlet</servlet-name>
<url-pattern>/test</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>XML results servlet</servlet-name>
+ <servlet-name>XMLresultsservlet</servlet-name>
<url-pattern>/xmlresults</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Log servlet</servlet-name>
+ <servlet-name>Logservlet</servlet-name>
<url-pattern>/logs/*</url-pattern>
</servlet-mapping>
More information about the jboss-svn-commits
mailing list