[jboss-svn-commits] JBL Code SVN: r25160 - in labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11: wsba/client and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 9 09:41:50 EST 2009
Author: adinn
Date: 2009-02-09 09:41:50 -0500 (Mon, 09 Feb 2009)
New Revision: 25160
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/ParticipantClient.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
Log:
fixed bug introduced when adding HTTPS support which was causing participant rollback after coordinator crash to fail
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-02-09 14:03:52 UTC (rev 25159)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java 2009-02-09 14:41:50 UTC (rev 25160)
@@ -112,7 +112,7 @@
public void sendPrepared(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
CoordinatorPortType port = getPort(endpoint, addressingProperties, preparedAction);
Notification prepared = new Notification();
@@ -130,7 +130,7 @@
public void sendAborted(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
CoordinatorPortType port = getPort(endpoint, addressingProperties, abortedAction);
Notification aborted = new Notification();
@@ -148,7 +148,7 @@
public void sendReadOnly(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
CoordinatorPortType port = getPort(endpoint, addressingProperties, readOnlyAction);
Notification readOnly = new Notification();
@@ -166,7 +166,7 @@
public void sendCommitted(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
CoordinatorPortType port = getPort(endpoint, addressingProperties, committedAction);
Notification committed = new Notification();
@@ -195,9 +195,15 @@
* @param endpoint
* @return either the secure participant endpoint or the non-secure endpoint
*/
- EndpointReference getParticipant(W3CEndpointReference endpoint)
+ EndpointReference getParticipant(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
{
- String address = endpoint.getAddress();
+ String address;
+ if (endpoint != null) {
+ address = endpoint.getAddress();
+ } else {
+ address = addressingProperties.getTo().getURI().toString();
+ }
+
if (address.startsWith("https")) {
return secureParticipant;
} else {
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-02-09 14:03:52 UTC (rev 25159)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java 2009-02-09 14:41:50 UTC (rev 25160)
@@ -105,7 +105,7 @@
public void sendPrepare(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
ParticipantPortType port = getPort(endpoint, addressingProperties, prepareAction);
Notification prepare = new Notification();
@@ -123,7 +123,7 @@
public void sendCommit(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
ParticipantPortType port = getPort(endpoint, addressingProperties, commitAction);
Notification commit = new Notification();
@@ -141,7 +141,7 @@
public void sendRollback(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
ParticipantPortType port = getPort(endpoint, addressingProperties, rollbackAction);
Notification rollback = new Notification();
@@ -170,9 +170,15 @@
* @param endpoint
* @return either the secure coordinator endpoint or the non-secure endpoint
*/
- EndpointReference getCoordinator(W3CEndpointReference endpoint)
+ EndpointReference getCoordinator(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
{
- String address = endpoint.getAddress();
+ String address;
+ if (endpoint != null) {
+ address = endpoint.getAddress();
+ } else {
+ address = addressingProperties.getTo().getURI().toString();
+ }
+
if (address.startsWith("https")) {
return secureCoordinator;
} else {
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-02-09 14:03:52 UTC (rev 25159)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java 2009-02-09 14:41:50 UTC (rev 25160)
@@ -153,7 +153,7 @@
public void sendCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, completedAction);
@@ -173,7 +173,7 @@
final QName exceptionIdentifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, failAction);
@@ -193,7 +193,7 @@
public void sendCompensated(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, compensatedAction);
@@ -212,7 +212,7 @@
public void sendClosed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, closedAction);
@@ -231,7 +231,7 @@
public void sendCancelled(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, cancelledAction);
@@ -250,7 +250,7 @@
public void sendExit(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, exitAction);
@@ -269,7 +269,7 @@
public void sendCannotComplete(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, cannotCompleteAction);
@@ -288,7 +288,7 @@
public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, getStatusAction);
@@ -308,7 +308,7 @@
final QName state)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, statusAction);
@@ -323,9 +323,15 @@
* @param endpoint
* @return either the secure participant endpoint or the non-secure endpoint
*/
- EndpointReference getParticipant(W3CEndpointReference endpoint)
+ EndpointReference getParticipant(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
{
- String address = endpoint.getAddress();
+ String address;
+ if (endpoint != null) {
+ address = endpoint.getAddress();
+ } else {
+ address = addressingProperties.getTo().getURI().toString();
+ }
+
if (address.startsWith("https")) {
return secureCoordinatorCompletionParticipant;
} else {
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-02-09 14:03:52 UTC (rev 25159)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java 2009-02-09 14:41:50 UTC (rev 25160)
@@ -152,7 +152,7 @@
public void sendComplete(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, completeAction);
@@ -171,7 +171,7 @@
public void sendClose(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, closeAction);
@@ -190,7 +190,7 @@
public void sendCancel(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, cancelAction);
@@ -209,7 +209,7 @@
public void sendCompensate(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, compensateAction);
@@ -228,7 +228,7 @@
public void sendFailed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, failedAction);
@@ -247,7 +247,7 @@
public void sendExited(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, exitedAction);
@@ -266,7 +266,7 @@
public void sendNotCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, notCompletedAction);
@@ -285,7 +285,7 @@
public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, getStatusAction);
@@ -305,7 +305,7 @@
final QName state)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, statusAction);
@@ -320,9 +320,15 @@
* @param endpoint
* @return either the secure coordinator endpoint or the non-secure endpoint
*/
- EndpointReference getCoordinator(W3CEndpointReference endpoint)
+ EndpointReference getCoordinator(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
{
- String address = endpoint.getAddress();
+ String address;
+ if (endpoint != null) {
+ address = endpoint.getAddress();
+ } else {
+ address = addressingProperties.getTo().getURI().toString();
+ }
+
if (address.startsWith("https")) {
return secureCoordinatorCompletionCoordinator;
} else {
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-02-09 14:03:52 UTC (rev 25159)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java 2009-02-09 14:41:50 UTC (rev 25160)
@@ -153,7 +153,7 @@
public void sendCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, completedAction);
@@ -173,7 +173,7 @@
final QName exceptionIdentifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, failAction);
@@ -193,7 +193,7 @@
public void sendCompensated(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, compensatedAction);
@@ -212,7 +212,7 @@
public void sendClosed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, closedAction);
@@ -231,7 +231,7 @@
public void sendCancelled(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, cancelledAction);
@@ -250,7 +250,7 @@
public void sendExit(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, exitAction);
@@ -269,7 +269,7 @@
public void sendCannotComplete(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, cannotCompleteAction);
@@ -288,7 +288,7 @@
public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, getStatusAction);
@@ -308,7 +308,7 @@
final QName state)
throws SoapFault, IOException
{
- EndpointReference participant = getParticipant(endpoint);
+ EndpointReference participant = getParticipant(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, statusAction);
@@ -323,9 +323,15 @@
* @param endpoint
* @return either the secure participant endpoint or the non-secure endpoint
*/
- EndpointReference getParticipant(W3CEndpointReference endpoint)
+ EndpointReference getParticipant(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
{
- String address = endpoint.getAddress();
+ String address;
+ if (endpoint != null) {
+ address = endpoint.getAddress();
+ } else {
+ address = addressingProperties.getTo().getURI().toString();
+ }
+
if (address.startsWith("https")) {
return secureParticipantCompletionParticipant;
} else {
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-02-09 14:03:52 UTC (rev 25159)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java 2009-02-09 14:41:50 UTC (rev 25160)
@@ -147,7 +147,7 @@
public void sendClose(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, closeAction);
@@ -166,7 +166,7 @@
public void sendCancel(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, cancelAction);
@@ -185,7 +185,7 @@
public void sendCompensate(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, compensateAction);
@@ -204,7 +204,7 @@
public void sendFailed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, failedAction);
@@ -223,7 +223,7 @@
public void sendExited(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, exitedAction);
@@ -242,7 +242,7 @@
public void sendNotCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, notCompletedAction);
@@ -261,7 +261,7 @@
public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, getStatusAction);
@@ -281,7 +281,7 @@
final QName state)
throws SoapFault, IOException
{
- EndpointReference coordinator = getCoordinator(endpoint);
+ EndpointReference coordinator = getCoordinator(endpoint, addressingProperties);
AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, statusAction);
@@ -296,9 +296,15 @@
* @param endpoint
* @return either the secure coordinator endpoint or the non-secure endpoint
*/
- EndpointReference getCoordinator(W3CEndpointReference endpoint)
+ EndpointReference getCoordinator(W3CEndpointReference endpoint, AddressingProperties addressingProperties)
{
- String address = endpoint.getAddress();
+ String address;
+ if (endpoint != null) {
+ address = endpoint.getAddress();
+ } else {
+ address = addressingProperties.getTo().getURI().toString();
+ }
+
if (address.startsWith("https")) {
return secureParticipantCompletionCoordinator;
} else {
More information about the jboss-svn-commits
mailing list