[jboss-svn-commits] JBL Code SVN: r20136 - in labs/jbosstm/trunk/XTS: WS-T and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri May 23 10:20:27 EDT 2008
Author: adinn
Date: 2008-05-23 10:20:27 -0400 (Fri, 23 May 2008)
New Revision: 20136
Added:
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/
Modified:
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java
labs/jbosstm/trunk/XTS/WS-T/build.xml
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/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/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/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java
labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_application.xml
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/TestInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TestSuite.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCParticipantTestCase.java
Log:
updated WS-T unit tests to exercise WS-AT/BA 1.1 code and fixed various errors in the 1.1 implementation to do ensure WSA header values conform to specs. 1.1 WS-T unit tests now all succeed.
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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -259,25 +259,61 @@
}
}
- public static void installFrom(AddressingProperties addressingProperties, EndpointReference epReference, InstanceIdentifier identifier)
+ public static void installFaultTo(AddressingProperties addressingProperties, EndpointReference epReference, InstanceIdentifier identifier)
{
AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
EndpointReference from = builder.newEndpointReference(epReference.getAddress().getURI());
InstanceIdentifier.setEndpointInstanceIdentifier(from, identifier);
- addressingProperties.setFrom(from);
+ addressingProperties.setFaultTo(from);
}
- public static void installFromReplyTo(AddressingProperties addressingProperties, EndpointReference epReference, InstanceIdentifier identifier)
+ public static void installFromFaultTo(AddressingProperties addressingProperties, EndpointReference epReference, InstanceIdentifier identifier)
{
AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
EndpointReference from = builder.newEndpointReference(epReference.getAddress().getURI());
InstanceIdentifier.setEndpointInstanceIdentifier(from, identifier);
- EndpointReference replyTo = builder.newEndpointReference(epReference.getAddress().getURI());
- InstanceIdentifier.setEndpointInstanceIdentifier(replyTo, identifier);
addressingProperties.setFrom(from);
- addressingProperties.setReplyTo(replyTo);
+ EndpointReference faultTo = builder.newEndpointReference(epReference.getAddress().getURI());
+ InstanceIdentifier.setEndpointInstanceIdentifier(faultTo, identifier);
+ addressingProperties.setFaultTo(faultTo);
}
+ private static EndpointReference noneReplyTo = null;
+
+ private static synchronized EndpointReference getNoneReplyTo()
+ {
+ if (noneReplyTo == null) {
+ AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ AddressingConstants addressingConstants = builder.newAddressingConstants();
+ try {
+ URI noneURI = new URI(addressingConstants.getNoneURI());
+ noneReplyTo = builder.newEndpointReference(noneURI);
+ } catch (URISyntaxException e) {
+ // will not happen
+ }
+ }
+
+ return noneReplyTo;
+ }
+
+ public static boolean isNoneReplyTo(AddressingProperties addressingProperties)
+ {
+ EndpointReference replyTo = addressingProperties.getReplyTo();
+ if (replyTo != null) {
+ String noneAddress = getNoneReplyTo().getAddress().getURI().toString();
+ String replyAddress = replyTo.getAddress().getURI().toString();
+
+ return noneAddress.equals(replyAddress);
+ } else {
+ return false;
+ }
+ }
+
+ public static void installNoneReplyTo(AddressingProperties addressingProperties)
+ {
+ addressingProperties.setReplyTo(getNoneReplyTo());
+ }
+
public static javax.xml.ws.addressing.AttributedURI makeURI(AddressingBuilder builder, String messageID)
{
try {
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2008-05-23 14:20:27 UTC (rev 20136)
@@ -307,16 +307,24 @@
<classpath>
<pathelement path="${build.dev.lib.dir}/ws-t.jar"/>
<pathelement path="${build.dev.lib.dir}/ws-t10.jar"/>
+ <pathelement path="${build.dev.lib.dir}/ws-t11.jar"/>
<path refid="tests.lib.path"/>
<path refid="lib.ext.path"/>
<path refid="ws-c.path"/>
<path refid="ws-c10.path"/>
+ <path refid="ws-c11.path"/>
</classpath>
<src path="${tests.src.dir}"/>
</javac>
</target>
<target name="tests-webapps" depends="tests-compile">
+ <jar jarfile="${build.tests.lib.dir}/ws-t-tests.jar">
+ <fileset dir="${build.tests.classes.dir}"/>
+ <manifest>
+ <attribute name="Class-Path" value="ws-t11.jar ws-t10.jar ws-t.jar ws-c11.jar ws-c10.jar ws-c.jar ${tests.libs}"/>
+ </manifest>
+ </jar>
<copy file="${tests.dd.dir}/ws-t-tests_web-app.xml" tofile="${build.tests.dd.dir}/web-app.xml">
<filterset>
<filter token="hostname" value="${hostname}"/>
@@ -325,10 +333,20 @@
</copy>
<war warfile="${build.tests.webapps.dir}/ws-t-tests.war" webxml="${build.tests.dd.dir}/web-app.xml">
<manifest>
- <attribute name="Class-Path" value="ws-t10.jar ws-t.jar ${tests.libs}"/>
+ <attribute name="Class-Path" value="ws-t-tests.jar"/>
</manifest>
- <classes dir="${build.tests.classes.dir}"/>
</war>
+ <copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${build.tests.dd.dir}/web-app11.xml">
+ <filterset>
+ <filter token="hostname" value="${hostname}"/>
+ <filter token="port" value="${port}"/>
+ </filterset>
+ </copy>
+ <war warfile="${build.tests.webapps.dir}/ws-t11-tests.war" webxml="${build.tests.dd.dir}/web-app11.xml">
+ <manifest>
+ <attribute name="Class-Path" value="ws-t-tests.jar"/>
+ </manifest>
+ </war>
<ear earfile="${build.tests.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t-tests_application.xml">
<!--
<fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
@@ -338,7 +356,8 @@
<fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
<fileset dir="${build.dev.lib.dir}" includes="ws-t.jar ws-t10.jar"/>
-->
- <fileset dir="${build.tests.webapps.dir}" includes="ws-t-tests.war"/>
+ <fileset dir="${build.tests.webapps.dir}" includes="ws-t-tests.war ws-t11-tests.war"/>
+ <fileset dir="${build.tests.lib.dir}" includes="ws-t-tests.jar"/>
<!--
<fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c.libs} ${ws-c10.libs}"/>
-->
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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -114,7 +114,7 @@
public void sendComplete(final W3CEndpointReference coordinator, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, terminationParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, terminationParticipant, identifier);
final TerminationCoordinatorPortType port = getPort(coordinator, addressingProperties, identifier, completeAction);
final NotificationType complete = new NotificationType();
@@ -131,7 +131,7 @@
public void sendClose(final W3CEndpointReference coordinator, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, terminationParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, terminationParticipant, identifier);
final TerminationCoordinatorPortType port = getPort(coordinator, addressingProperties, identifier, closeAction);
final NotificationType close = new NotificationType();
@@ -148,7 +148,7 @@
public void sendCancel(final W3CEndpointReference coordinator, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, terminationParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, terminationParticipant, identifier);
final TerminationCoordinatorPortType port = getPort(coordinator, addressingProperties, identifier, cancelAction);
final NotificationType cancel = new NotificationType();
@@ -169,7 +169,7 @@
final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, terminationParticipant, identifier);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
// 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);
}
@@ -190,6 +190,7 @@
// 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);
}
}
\ 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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationParticipantClient.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -119,7 +119,7 @@
public void sendCompleted(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, terminationCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, terminationCoordinator, identifier);
final TerminationParticipantPortType port = getPort(participant, addressingProperties, identifier, completedAction);
final NotificationType completed = new NotificationType();
@@ -136,7 +136,7 @@
public void sendClosed(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, terminationCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, terminationCoordinator, identifier);
final TerminationParticipantPortType port = getPort(participant, addressingProperties, identifier, closedAction);
final NotificationType closed = new NotificationType();
@@ -153,7 +153,7 @@
public void sendCancelled(final W3CEndpointReference participant,final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, terminationCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, terminationCoordinator, identifier);
final TerminationParticipantPortType port = getPort(participant, addressingProperties, identifier, cancelledAction);
final NotificationType cancelled = new NotificationType();
@@ -170,7 +170,7 @@
public void sendFaulted(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, terminationCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, terminationCoordinator, identifier);
final TerminationParticipantPortType port = getPort(participant, addressingProperties, identifier, faultedAction);
final NotificationType faulted = new NotificationType();
@@ -189,7 +189,8 @@
public void sendSoapFault(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, terminationCoordinator, identifier);
+ //AddressingHelper.installFrom(addressingProperties, terminationCoordinator, identifier);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
final TerminationParticipantPortType port = getPort(participant, addressingProperties, 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
@@ -250,6 +251,7 @@
final AttributedURI action)
{
// create a port specific to the incoming addressing properties
+ AddressingHelper.installNoneReplyTo(addressingProperties);
return WSARJTXClient.getTerminationParticipantPort(identifier, action, addressingProperties);
}
}
\ No newline at end of file
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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionCoordinatorClient.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -82,7 +82,7 @@
public void sendCommit(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, completionInitiator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, completionInitiator, identifier);
CompletionCoordinatorPortType port = getPort(endpoint, addressingProperties, commitAction);
Notification commit = new Notification();
@@ -99,7 +99,7 @@
public void sendRollback(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, completionInitiator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, completionInitiator, identifier);
CompletionCoordinatorPortType port = getPort(endpoint, addressingProperties, rollbackAction);
Notification rollback = new Notification();
@@ -127,7 +127,7 @@
final AddressingProperties addressingProperties,
final AttributedURI action)
{
- addressingProperties.setFrom(completionInitiator);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
return WSATClient.getCompletionCoordinatorPort(endpoint, action, addressingProperties);
}
}
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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -89,7 +89,7 @@
public void sendCommitted(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, completionCoordinator, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, completionCoordinator, identifier);
CompletionInitiatorPortType port = getPort(participant, addressingProperties, committedAction);
Notification commited = new Notification();
@@ -106,7 +106,7 @@
public void sendAborted(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, completionCoordinator, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, completionCoordinator, identifier);
CompletionInitiatorPortType port = getPort(participant, addressingProperties, abortedAction);
Notification aborted = new Notification();
@@ -124,9 +124,9 @@
public void sendSoapFault(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, completionCoordinator, identifier);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
// 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, participant, addressingProperties, faultAction);
}
/**
@@ -150,7 +150,7 @@
final AddressingProperties addressingProperties,
final AttributedURI action)
{
- addressingProperties.setFrom(completionCoordinator);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
return WSATClient.getCompletionInitiatorPort(participant, action, addressingProperties);
}
}
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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -99,7 +99,7 @@
public void sendPrepared(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participant, identifier);
CoordinatorPortType port = getPort(endpoint, addressingProperties, preparedAction);
Notification prepared = new Notification();
@@ -116,7 +116,7 @@
public void sendAborted(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participant, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
CoordinatorPortType port = getPort(endpoint, addressingProperties, abortedAction);
Notification aborted = new Notification();
@@ -133,7 +133,7 @@
public void sendReadOnly(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participant, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
CoordinatorPortType port = getPort(endpoint, addressingProperties, readOnlyAction);
Notification readOnly = new Notification();
@@ -150,7 +150,7 @@
public void sendCommitted(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participant, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, participant, identifier);
CoordinatorPortType port = getPort(endpoint, addressingProperties, committedAction);
Notification committed = new Notification();
@@ -168,9 +168,9 @@
public void sendSoapFault(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participant, identifier);
- // use the SoapFaultService to format a soap fault and send it back to the faultto or from address
- SoapFaultClient.sendSoapFault((SoapFault11)soapFault, addressingProperties, faultAction);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
+ // use the SoapFaultService to format a soap fault and send it back to the faultto address
+ SoapFaultClient.sendSoapFault((SoapFault11)soapFault, endpoint, addressingProperties, faultAction);
}
/**
@@ -194,6 +194,7 @@
final AddressingProperties addressingProperties,
final AttributedURI action)
{
+ AddressingHelper.installNoneReplyTo(addressingProperties);
return WSATClient.getCoordinatorPort(endpoint, action, addressingProperties);
}
}
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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -93,7 +93,7 @@
public void sendPrepare(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
ParticipantPortType port = getPort(endpoint, addressingProperties, prepareAction);
Notification prepare = new Notification();
@@ -110,7 +110,7 @@
public void sendCommit(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
ParticipantPortType port = getPort(endpoint, addressingProperties, commitAction);
Notification commit = new Notification();
@@ -127,7 +127,7 @@
public void sendRollback(final W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinator, identifier);
ParticipantPortType port = getPort(endpoint, addressingProperties, rollbackAction);
Notification rollback = new Notification();
@@ -145,8 +145,8 @@
public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
+ AddressingHelper.installNoneReplyTo(addressingProperties);
// use the SoapFaultService to format a soap fault and send it back to the faultto or from address
- AddressingHelper.installFrom(addressingProperties, coordinator, identifier);
SoapFaultClient.sendSoapFault((SoapFault11)soapFault, addressingProperties, faultAction);
}
@@ -171,7 +171,7 @@
final AddressingProperties addressingProperties,
final AttributedURI action)
{
- addressingProperties.setFrom(coordinator);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
if (participant != null) {
return WSATClient.getParticipantPort(participant, action, addressingProperties);
} 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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -140,7 +140,7 @@
public void sendCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinatorCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionParticipant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, completedAction);
NotificationType completed = new NotificationType();
@@ -159,7 +159,7 @@
final QName exceptionIdentifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinatorCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionParticipant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, failAction);
ExceptionType fail = new ExceptionType();
@@ -178,7 +178,7 @@
public void sendCompensated(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, coordinatorCompletionParticipant, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, coordinatorCompletionParticipant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, compensatedAction);
NotificationType compensated = new NotificationType();
@@ -196,7 +196,7 @@
public void sendClosed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, coordinatorCompletionParticipant, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, coordinatorCompletionParticipant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, closedAction);
NotificationType closed = new NotificationType();
@@ -214,7 +214,7 @@
public void sendCancelled(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, coordinatorCompletionParticipant, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, coordinatorCompletionParticipant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, cancelledAction);
NotificationType camcelled = new NotificationType();
@@ -232,7 +232,7 @@
public void sendExit(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinatorCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionParticipant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, exitAction);
NotificationType exited = new NotificationType();
@@ -250,7 +250,7 @@
public void sendCannotComplete(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, coordinatorCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionParticipant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, cannotCompleteAction);
NotificationType cannotComplete = new NotificationType();
@@ -268,7 +268,7 @@
public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinatorCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionParticipant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, getStatusAction);
NotificationType getStatus = new NotificationType();
@@ -287,7 +287,7 @@
final QName state)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinatorCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionParticipant, identifier);
BusinessAgreementWithCoordinatorCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, statusAction);
StatusType status = new StatusType();
@@ -316,7 +316,7 @@
private BusinessAgreementWithCoordinatorCompletionCoordinatorPortType
getPort(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final AttributedURI action)
{
- addressingProperties.setFrom(coordinatorCompletionParticipant);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
if (participant != null) {
return WSBAClient.getCoordinatorCompletionCoordinatorPort(participant, action, addressingProperties);
} 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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -139,7 +139,7 @@
public void sendComplete(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, completeAction);
NotificationType complete = new NotificationType();
@@ -157,7 +157,7 @@
public void sendClose(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, closeAction);
NotificationType close = new NotificationType();
@@ -175,7 +175,7 @@
public void sendCancel(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, cancelAction);
NotificationType cancel = new NotificationType();
@@ -193,7 +193,7 @@
public void sendCompensate(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, compensateAction);
NotificationType compensate = new NotificationType();
@@ -211,7 +211,7 @@
public void sendFailed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, coordinatorCompletionCoordinator, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, failedAction);
NotificationType failed = new NotificationType();
@@ -229,7 +229,7 @@
public void sendExited(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, coordinatorCompletionCoordinator, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, exitedAction);
NotificationType exit = new NotificationType();
@@ -247,7 +247,7 @@
public void sendNotCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, coordinatorCompletionCoordinator, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, notCompletedAction);
NotificationType notCompleted = new NotificationType();
@@ -265,7 +265,7 @@
public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, coordinatorCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, getStatusAction);
NotificationType getStatus = new NotificationType();
@@ -284,7 +284,7 @@
final QName state)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, coordinatorCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, coordinatorCompletionCoordinator, identifier);
BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, statusAction);
StatusType status = new StatusType();
@@ -313,7 +313,7 @@
private BusinessAgreementWithCoordinatorCompletionParticipantPortType
getPort(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final AttributedURI action)
{
- addressingProperties.setFrom(coordinatorCompletionCoordinator);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
if (participant != null) {
return WSBAClient.getCoordinatorCompletionParticipantPort(participant, action, addressingProperties);
} 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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -140,7 +140,7 @@
public void sendCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participantCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionParticipant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, completedAction);
NotificationType completed = new NotificationType();
@@ -159,7 +159,7 @@
final QName exceptionIdentifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participantCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionParticipant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, failAction);
ExceptionType fail = new ExceptionType();
@@ -178,7 +178,7 @@
public void sendCompensated(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participantCompletionParticipant, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, participantCompletionParticipant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, compensatedAction);
NotificationType compensated = new NotificationType();
@@ -196,7 +196,7 @@
public void sendClosed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participantCompletionParticipant, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, participantCompletionParticipant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, closedAction);
NotificationType closed = new NotificationType();
@@ -214,7 +214,7 @@
public void sendCancelled(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participantCompletionParticipant, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, participantCompletionParticipant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, cancelledAction);
NotificationType cancelled = new NotificationType();
@@ -232,7 +232,7 @@
public void sendExit(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participantCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionParticipant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, exitAction);
NotificationType exit = new NotificationType();
@@ -250,7 +250,7 @@
public void sendCannotComplete(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participantCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionParticipant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, cannotCompleteAction);
NotificationType cannotComplete = new NotificationType();
@@ -268,7 +268,7 @@
public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participantCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionParticipant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, getStatusAction);
NotificationType getStatus = new NotificationType();
@@ -287,7 +287,7 @@
final QName state)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participantCompletionParticipant, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionParticipant, identifier);
BusinessAgreementWithParticipantCompletionCoordinatorPortType port;
port = getPort(endpoint, addressingProperties, statusAction);
StatusType status = new StatusType();
@@ -316,7 +316,7 @@
private BusinessAgreementWithParticipantCompletionCoordinatorPortType
getPort(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final AttributedURI action)
{
- addressingProperties.setFrom(participantCompletionParticipant);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
if (participant != null) {
return WSBAClient.getParticipantCompletionCoordinatorPort(participant, action, addressingProperties);
} 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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -134,7 +134,7 @@
public void sendClose(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participantCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionCoordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, closeAction);
NotificationType close = new NotificationType();
@@ -152,7 +152,7 @@
public void sendCancel(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participantCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionCoordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, cancelAction);
NotificationType cancel = new NotificationType();
@@ -170,7 +170,7 @@
public void sendCompensate(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participantCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionCoordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, compensateAction);
NotificationType compensate = new NotificationType();
@@ -188,7 +188,7 @@
public void sendFailed(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participantCompletionCoordinator, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, participantCompletionCoordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, failedAction);
NotificationType failed = new NotificationType();
@@ -206,7 +206,7 @@
public void sendExited(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participantCompletionCoordinator, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, participantCompletionCoordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, exitedAction);
NotificationType exited = new NotificationType();
@@ -224,7 +224,7 @@
public void sendNotCompleted(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFrom(addressingProperties, participantCompletionCoordinator, identifier);
+ AddressingHelper.installFaultTo(addressingProperties, participantCompletionCoordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, notCompletedAction);
NotificationType notCompleted = new NotificationType();
@@ -242,7 +242,7 @@
public void sendGetStatus(W3CEndpointReference endpoint, final AddressingProperties addressingProperties, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participantCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionCoordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, getStatusAction);
NotificationType getStatus = new NotificationType();
@@ -261,7 +261,7 @@
final QName state)
throws SoapFault, IOException
{
- AddressingHelper.installFromReplyTo(addressingProperties, participantCompletionCoordinator, identifier);
+ AddressingHelper.installFromFaultTo(addressingProperties, participantCompletionCoordinator, identifier);
BusinessAgreementWithParticipantCompletionParticipantPortType port;
port = getPort(endpoint, addressingProperties, statusAction);
StatusType status = new StatusType();
@@ -290,7 +290,7 @@
private BusinessAgreementWithParticipantCompletionParticipantPortType
getPort(final W3CEndpointReference participant, final AddressingProperties addressingProperties, final AttributedURI action)
{
- addressingProperties.setFrom(participantCompletionCoordinator);
+ AddressingHelper.installNoneReplyTo(addressingProperties);
if (participant != null) {
return WSBAClient.getParticipantCompletionParticipantPort(participant, action, addressingProperties);
} else {
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 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -817,6 +817,7 @@
{
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()) ;
}
catch (final Throwable th)
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_application.xml 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_application.xml 2008-05-23 14:20:27 UTC (rev 20136)
@@ -28,8 +28,15 @@
<module>
<web>
- <web-uri>ws-t-tests.war</web-uri>
+ <web-uri>ws-t-tests.war</web-uri>
<context-root>/ws-t-tests</context-root>
</web>
</module>
+
+ <module>
+ <web>
+ <web-uri>ws-t11-tests.war</web-uri>
+ <context-root>/ws-t11-tests</context-root>
+ </web>
+ </module>
</application>
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/TestInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/TestInitialisation.java 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/TestInitialisation.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -148,6 +148,7 @@
participantCompletionParticipantProcessor.activateParticipant(testFaultedExceptionBusinessAgreementWithParticipantCompletionParticipantEngine, TestUtil.FAULTEDEXCEPTION_PARTICIPANT_IDENTIFIER);
final CoordinatorCompletionParticipantProcessor coordinatorCompletionParticipantProcessor = CoordinatorCompletionParticipantProcessor.getProcessor() ;
+ // !!! is this not supposed to be BusinessActivityConstants.SERVICE_COORDINATOR_COMPLETION_COORDINATOR
final AttributedURIType coordinatorCompletionCoordinatorURI = new AttributedURIType(SoapRegistry.getRegistry().getServiceURI(BusinessActivityConstants.SERVICE_PARTICIPANT_COMPLETION_COORDINATOR));
testSystemExceptionBusinessAgreementWithCoordinatorCompletionParticipantEngine = new CoordinatorCompletionParticipantEngine(TestUtil.SYSTEMEXCEPTION_PARTICIPANT_IDENTIFIER, new EndpointReferenceType(coordinatorCompletionCoordinatorURI), testSystemExceptionBusinessAgreementWithCoordinatorCompletionParticipant);
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TestSuite.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TestSuite.java 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TestSuite.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -33,7 +33,7 @@
// the service tests are no longer working
addTest(new junit.framework.TestSuite(CompletionParticipantTestCase.class));
addTest(new junit.framework.TestSuite(CompletionCoordinatorTestCase.class));
- //addTest(new junit.framework.TestSuite(TwoPCParticipantTestCase.class));
+ addTest(new junit.framework.TestSuite(TwoPCParticipantTestCase.class));
addTest(new junit.framework.TestSuite(TwoPCCoordinatorTestCase.class));
addTest(new junit.framework.TestSuite(CompletionServiceTestCase.class));
//addTest(new junit.framework.TestSuite(TwoPCServiceTestCase.class));
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCParticipantTestCase.java 2008-05-23 14:17:35 UTC (rev 20135)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCParticipantTestCase.java 2008-05-23 14:20:27 UTC (rev 20136)
@@ -165,6 +165,8 @@
final QName subcode = ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME ;
final SoapFault soapFault = new SoapFault10(soapFaultType, subcode, reason) ;
+ // for this test we use the soap fault client to send a message where we have no valid instance identifier
+ // we could also test the case where we have an instance identifier but it never gets exercised anyway!
CoordinatorClient.getClient().sendSoapFault(addressingContext, soapFault, new InstanceIdentifier("sender"));
CoordinatorDetails details = testCoordinatorProcessor.getCoordinatorDetails(messageId, 10000);
@@ -172,7 +174,7 @@
assertEquals(details.hasSoapFault().getSoapFaultType(), soapFault.getSoapFaultType());
assertEquals(details.hasSoapFault().getReason(), soapFault.getReason());
assertEquals(details.hasSoapFault().getSubcode(), soapFault.getSubcode());
- // don't expect reply to address but do expect identifier
+ // don't expect reply to address nor an identifier
checkDetails(details, false, messageId, null);
}
More information about the jboss-svn-commits
mailing list