Author: mlovett
Date: Thu Mar 22 06:38:32 2007
New Revision: 521260
URL: http://svn.apache.org/viewvc?view=rev&rev=521260
Log:
SANDESHA2-75: Automatically send an offer when using WSRM 1.0 and connecting to
a service that contains OUT-IN meps.
Modified:
webservices/sandesha/trunk/java/config/module.xml
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/MessageNumberRolloverFaultTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceClosedFaultTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/UnknownSequenceFaultTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/RMScenariosTest.java
Modified: webservices/sandesha/trunk/java/config/module.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/module.xml?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
--- webservices/sandesha/trunk/java/config/module.xml (original)
+++ webservices/sandesha/trunk/java/config/module.xml Thu Mar 22 06:38:32 2007
@@ -36,7 +36,7 @@
</handler>
</OutFaultFlow>
- <operation name="RMInOnlyOperation"
mep="http://www.w3.org/2006/01/wsdl/in-only";>
+ <operation name="Sandesha2OperationInOnly"
mep="http://www.w3.org/2006/01/wsdl/in-only";>
<messageReceiver
class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
<!-- namespaces for the 2005-02 spec -->
@@ -51,7 +51,7 @@
</operation>
- <operation name="RMInOutOperation"
mep="http://www.w3.org/2006/01/wsdl/in-out";>
+ <operation name="Sandesha2OperationInOut"
mep="http://www.w3.org/2006/01/wsdl/in-out";>
<messageReceiver
class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
<!-- namespaces for the 2005-02 spec -->
@@ -70,14 +70,14 @@
<actionMapping>http://docs.oasis-open.org/ws-rx/wsmc/200702/MakeConnection</actionMapping>
</operation>
- <operation name="RMOutOnlyOperation"
mep="http://www.w3.org/2006/01/wsdl/out-only";>
+ <operation name="Sandesha2OperationOutOnly"
mep="http://www.w3.org/2006/01/wsdl/out-only";>
<messageReceiver
class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
</operation>
- <operation name="RMOutInOperation"
mep="http://www.w3.org/2006/01/wsdl/out-in";>
+ <operation name="Sandesha2OperationOutIn"
mep="http://www.w3.org/2006/01/wsdl/out-in";>
<messageReceiver
class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
</operation>
- <operation name="RMInOutDuplicateMessageOperation"
mep="http://www.w3.org/2006/01/wsdl/in-out";>
+ <operation name="Sandesha2OperationDuplicate"
mep="http://www.w3.org/2006/01/wsdl/in-out";>
<messageReceiver
class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
</operation>
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
Thu Mar 22 06:38:32 2007
@@ -517,10 +517,6 @@
static final String SECURITY_MANAGER = "Sandesha2SecurityManager";
- static final String RM_IN_OUT_OPERATION_NAME = "RMInOutOperation";
-
- static final String RM_IN_ONLY_OPERATION = "RMInOnlyOperation";
-
static final String RETRANSMITTABLE_PHASES = "RMRetransmittablePhases";
static final String propertiesToCopyFromReferenceMessage =
"propertiesToCopyFromReferenceMessage";
@@ -531,6 +527,15 @@
static final String MAKE_CONNECTION_RESPONSE = "MakeConnectionResponse";
+ static final String SERVICE_CONTAINS_OUT_IN_MEPS =
"ServiceContainsOutInMeps";
+
+ static final String SANDESHA_OP_PREFIX = "Sandesha2Operation";
+ static final QName RM_OUT_IN_OPERATION = new
QName(SANDESHA_OP_PREFIX + "OutIn");
+ static final QName RM_OUT_ONLY_OPERATION = new
QName(SANDESHA_OP_PREFIX + "OutOnly");
+ static final QName RM_DUPLICATE_OPERATION = new
QName(SANDESHA_OP_PREFIX + "Duplicate");
+ static final QName RM_IN_OUT_OPERATION = new
QName(SANDESHA_OP_PREFIX + "InOut");
+ static final QName RM_IN_ONLY_OPERATION = new
QName(SANDESHA_OP_PREFIX + "InOnly");
+
static final String [] SPEC_NS_URIS = {
SPEC_2005_02.NS_URI,
SPEC_2007_02.NS_URI
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java
Thu Mar 22 06:38:32 2007
@@ -17,18 +17,25 @@
package org.apache.sandesha2;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.modules.Module;
import org.apache.axis2.modules.ModulePolicyExtension;
import org.apache.axis2.modules.PolicyExtension;
import org.apache.axis2.util.TargetResolver;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Assertion;
@@ -151,6 +158,34 @@
parameter.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
parameter.setValue(axisDescPropertyBean);
axisDescription.addParameter(parameter);
+ }
+
+ // When we engage Sandesha for a Service, we check to see if
there are
+ // any OUT_IN MEPs on it's operations. If there are then we
record that,
+ // so that we know we should send an Offer for WSRM 1.0
Sequences.
+ // We check the operation names, as the RM operations are added
in as
+ // well, and and we only want to consider the user's operations.
+ if(axisDescription instanceof AxisService) {
+ AxisService service = (AxisService) axisDescription;
+ Iterator ops = service.getOperations();
+ while(ops.hasNext()) {
+ AxisOperation op = (AxisOperation) ops.next();
+ log.debug("Examining operation " + op.getName()
+ ", mep " + op.getAxisSpecifMEPConstant());
+
+ String name = null;
+ QName qName = op.getName();
+ if(qName != null) name = qName.getLocalPart();
+ if(name != null &&
name.startsWith(Sandesha2Constants.SANDESHA_OP_PREFIX))
+ break;
+
+ // If we get to here then we must have one of
the user's operations, so
+ // check the MEP.
+ if(op.getAxisSpecifMEPConstant() ==
WSDLConstants.MEP_CONSTANT_OUT_IN) {
+ Parameter p = new
Parameter(Sandesha2Constants.SERVICE_CONTAINS_OUT_IN_MEPS, Boolean.TRUE);
+ service.addParameter(p);
+ break;
+ }
+ }
}
if(log.isDebugEnabled()) log.debug("Exit:
SandeshaModule::engageNotify");
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
Thu Mar 22 06:38:32 2007
@@ -1155,7 +1155,7 @@
anonOutOnlyOperation =
AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_OUT_ONLY);
anonOutOnlyOperation.setName(ServiceClient.ANON_OUT_ONLY_OP);
- AxisOperation referenceOperation =
service.getOperation(new QName (Sandesha2Constants.RM_IN_ONLY_OPERATION));
+ AxisOperation referenceOperation =
service.getOperation(Sandesha2Constants.RM_IN_ONLY_OPERATION);
if (referenceOperation!=null) {
anonOutOnlyOperation.setPhasesOutFlow(referenceOperation.getPhasesOutFlow());
@@ -1176,7 +1176,7 @@
anonOutInOperation =
AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_OUT_IN);
anonOutInOperation.setName(ServiceClient.ANON_OUT_IN_OP);
- AxisOperation referenceOperation =
service.getOperation(new QName (Sandesha2Constants.RM_IN_OUT_OPERATION_NAME));
+ AxisOperation referenceOperation =
service.getOperation(Sandesha2Constants.RM_IN_OUT_OPERATION);
if (referenceOperation!=null) {
anonOutInOperation.setPhasesOutFlow(referenceOperation.getPhasesOutFlow());
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
Thu Mar 22 06:38:32 2007
@@ -22,7 +22,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPHeader;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
@@ -30,6 +29,8 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -133,36 +134,49 @@
CreateSequence createSequencePart = new
CreateSequence(rmNamespaceValue);
- // Adding sequence offer - if present
- OperationContext operationcontext =
applicationMsgContext.getOperationContext();
- if (operationcontext != null) {
- String offeredSequence = (String) applicationMsgContext
-
.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID);
- EndpointReference offeredEndpoint = (EndpointReference)
applicationMsgContext
-
.getProperty(SandeshaClientConstants.OFFERED_ENDPOINT);
-
- if (offeredEndpoint==null) {
- EndpointReference replyTo =
applicationMsgContext.getReplyTo(); //using replyTo as the Endpoint if it is
not specified
-
- if (replyTo!=null) {
- offeredEndpoint =
SandeshaUtil.cloneEPR(replyTo);
+ // Adding sequence offer - if present. We send an offer if the
client has assigned an
+ // id, or if we are using WS-RM 1.0 and the service contains
out-in MEPs
+ boolean autoOffer = false;
+
if(Sandesha2Constants.SPEC_2005_02.NS_URI.equals(rmNamespaceValue)) {
+ AxisService service =
applicationMsgContext.getAxisService();
+ if(service != null) {
+ Parameter p =
service.getParameter(Sandesha2Constants.SERVICE_CONTAINS_OUT_IN_MEPS);
+ if(p != null && p.getValue() != null) {
+ autoOffer = ((Boolean)
p.getValue()).booleanValue();
}
}
- // Finally fall back to using an anonymous endpoint
- if (offeredEndpoint==null) {
- offeredEndpoint = new
EndpointReference(SpecSpecificConstants.getAddressingAnonymousURI(addressingNamespace));
+ }
+ String offeredSequenceId = (String)
applicationMsgContext.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID);
+
+ if(autoOffer ||
+ (offeredSequenceId != null && offeredSequenceId.length() >
0)) {
+
+ if (offeredSequenceId == null ||
offeredSequenceId.length() == 0) {
+ offeredSequenceId = SandeshaUtil.getUUID();
}
- if (offeredSequence != null &&
!"".equals(offeredSequence)) {
- SequenceOffer offerPart = new
SequenceOffer(rmNamespaceValue);
- Identifier identifier = new
Identifier(rmNamespaceValue);
- identifier.setIndentifer(offeredSequence);
- offerPart.setIdentifier(identifier);
- createSequencePart.setSequenceOffer(offerPart);
+
+ SequenceOffer offerPart = new
SequenceOffer(rmNamespaceValue);
+ Identifier identifier = new
Identifier(rmNamespaceValue);
+ identifier.setIndentifer(offeredSequenceId);
+ offerPart.setIdentifier(identifier);
+ createSequencePart.setSequenceOffer(offerPart);
+
+ if
(Sandesha2Constants.SPEC_2007_02.NS_URI.equals(rmNamespaceValue)) {
+ // We are going to send an offer, so decide
which endpoint to include
+ EndpointReference offeredEndpoint =
(EndpointReference)
applicationMsgContext.getProperty(SandeshaClientConstants.OFFERED_ENDPOINT);
+ if (offeredEndpoint==null) {
+ EndpointReference replyTo =
applicationMsgContext.getReplyTo(); //using replyTo as the Endpoint if it is
not specified
- if
(Sandesha2Constants.SPEC_2007_02.NS_URI.equals(rmNamespaceValue)) {
- Endpoint endpoint = new Endpoint
(offeredEndpoint, rmNamespaceValue, addressingNamespace);
- offerPart.setEndpoint(endpoint);
+ if (replyTo!=null) {
+ offeredEndpoint =
SandeshaUtil.cloneEPR(replyTo);
+ }
+ }
+ // Finally fall back to using an anonymous
endpoint
+ if (offeredEndpoint==null) {
+ offeredEndpoint = new
EndpointReference(SpecSpecificConstants.getAddressingAnonymousURI(addressingNamespace));
}
+ Endpoint endpoint = new Endpoint
(offeredEndpoint, rmNamespaceValue, addressingNamespace);
+ offerPart.setEndpoint(endpoint);
}
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java
Thu Mar 22 06:38:32 2007
@@ -17,8 +17,6 @@
package org.apache.sandesha2.util;
-import javax.xml.namespace.QName;
-
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -339,16 +337,16 @@
if(rmSpecLevel.equals(Sandesha2Constants.SPEC_VERSIONS.v1_0)) {
switch(messageType) {
case Sandesha2Constants.MessageTypes.CREATE_SEQ:
- result = service.getOperation(new
QName("RMOutInOperation"));
+ result =
service.getOperation(Sandesha2Constants.RM_OUT_IN_OPERATION);
break;
case Sandesha2Constants.MessageTypes.TERMINATE_SEQ:
case Sandesha2Constants.MessageTypes.ACK:
case Sandesha2Constants.MessageTypes.ACK_REQUEST:
case Sandesha2Constants.MessageTypes.LAST_MESSAGE:
- result = service.getOperation(new
QName("RMOutOnlyOperation"));
+ result =
service.getOperation(Sandesha2Constants.RM_OUT_ONLY_OPERATION);
break;
case Sandesha2Constants.MessageTypes.DUPLICATE_MESSAGE:
- result = service.getOperation(new
QName("RMInOutDuplicateMessageOperation"));
+ result =
service.getOperation(Sandesha2Constants.RM_DUPLICATE_OPERATION);
break;
}
} else
if(rmSpecLevel.equals(Sandesha2Constants.SPEC_VERSIONS.v1_1)) {
@@ -357,11 +355,11 @@
case Sandesha2Constants.MessageTypes.CLOSE_SEQUENCE:
case Sandesha2Constants.MessageTypes.TERMINATE_SEQ:
case
Sandesha2Constants.MessageTypes.MAKE_CONNECTION_MSG:
- result = service.getOperation(new
QName("RMOutInOperation"));
+ result =
service.getOperation(Sandesha2Constants.RM_OUT_IN_OPERATION);
break;
case Sandesha2Constants.MessageTypes.ACK:
case Sandesha2Constants.MessageTypes.ACK_REQUEST:
- result = service.getOperation(new
QName("RMOutOnlyOperation"));
+ result =
service.getOperation(Sandesha2Constants.RM_OUT_ONLY_OPERATION);
break;
}
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
Thu Mar 22 06:38:32 2007
@@ -540,7 +540,7 @@
// Generate a new RM In Only
operation
ServiceContext serviceCtx =
responseMessageContext.getServiceContext();
- AxisOperation op =
msgCtx.getAxisService().getOperation(new QName("RMInOnlyOperation"));
+ AxisOperation op =
msgCtx.getAxisService().getOperation(Sandesha2Constants.RM_IN_ONLY_OPERATION);
responseMsgOpCtx =
ContextFactory.createOperationContext (op, serviceCtx);
}
Modified:
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java
(original)
+++
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java
Thu Mar 22 06:38:32 2007
@@ -17,6 +17,7 @@
package org.apache.sandesha2;
import java.io.File;
+import java.util.ArrayList;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
@@ -26,6 +27,7 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.client.SandeshaReport;
import org.apache.sandesha2.client.SequenceReport;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -45,7 +47,6 @@
}
public void testSequenceOffer () throws Exception {
-
String to = "http://127.0.0.1:"; + serverPort +
"/axis2/services/RMSampleService";
String repoPath = "target" + File.separator + "repos" +
File.separator + "client";
@@ -99,10 +100,10 @@
assertEquals(callback1.getResult(),"echo1");
//checking weather the incomingSequenceReport
has the offered sequence ID
- //SandeshaReport rmReport =
SandeshaClient.getSandeshaReport(configContext);
- //ArrayList incomingSeqList =
rmReport.getIncomingSequenceList();
- //assertEquals(incomingSeqList.size(),1);
-
//assertEquals(incomingSeqList.get(0),offeredSequenceID);
+ SandeshaReport rmReport =
SandeshaClient.getSandeshaReport(configContext);
+ ArrayList incomingSeqList =
rmReport.getIncomingSequenceList();
+ assertEquals(incomingSeqList.size(),1);
+
assertEquals(incomingSeqList.get(0),offeredSequenceID);
lastError = null;
break;
Modified:
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/MessageNumberRolloverFaultTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/MessageNumberRolloverFaultTest.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/MessageNumberRolloverFaultTest.java
(original)
+++
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/MessageNumberRolloverFaultTest.java
Thu Mar 22 06:38:32 2007
@@ -21,8 +21,6 @@
import java.io.OutputStream;
import java.net.HttpURLConnection;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
@@ -167,7 +165,7 @@
messageContext.setWSAAction(pingAction);
// Set the AxisOperation to be InOut
- AxisOperation operation =
messageContext.getAxisService().getOperation(new QName("RMInOutOperation"));
+ AxisOperation operation =
messageContext.getAxisService().getOperation(Sandesha2Constants.RM_IN_OUT_OPERATION);
operation.setMessageReceiver(new RMMessageReceiver());
messageContext.setAxisOperation(operation);
Modified:
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceClosedFaultTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceClosedFaultTest.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceClosedFaultTest.java
(original)
+++
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceClosedFaultTest.java
Thu Mar 22 06:38:32 2007
@@ -21,8 +21,6 @@
import java.io.OutputStream;
import java.net.HttpURLConnection;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
@@ -169,7 +167,7 @@
messageContext.setWSAAction(pingAction);
// Set the AxisOperation to be InOut
- AxisOperation operation =
messageContext.getAxisService().getOperation(new QName("RMInOutOperation"));
+ AxisOperation operation =
messageContext.getAxisService().getOperation(Sandesha2Constants.RM_IN_OUT_OPERATION);
operation.setMessageReceiver(new RMMessageReceiver());
messageContext.setAxisOperation(operation);
Modified:
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
(original)
+++
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
Thu Mar 22 06:38:32 2007
@@ -22,8 +22,6 @@
import java.net.HttpURLConnection;
import java.util.List;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -438,7 +436,7 @@
messageContext.setWSAAction(pingAction);
// Set the AxisOperation to be InOut
- AxisOperation operation =
messageContext.getAxisService().getOperation(new QName("RMInOutOperation"));
+ AxisOperation operation =
messageContext.getAxisService().getOperation(Sandesha2Constants.RM_IN_OUT_OPERATION);
operation.setMessageReceiver(new RMMessageReceiver());
messageContext.setAxisOperation(operation);
@@ -486,7 +484,7 @@
messageContext.setWSAAction(pingAction);
// Set the AxisOperation to be InOut
- AxisOperation operation =
messageContext.getAxisService().getOperation(new QName("RMInOutOperation"));
+ AxisOperation operation =
messageContext.getAxisService().getOperation(Sandesha2Constants.RM_IN_OUT_OPERATION);
operation.setMessageReceiver(new RMMessageReceiver());
messageContext.setAxisOperation(operation);
@@ -534,7 +532,7 @@
messageContext.setWSAAction(pingAction);
// Set the AxisOperation to be InOut
- AxisOperation operation =
messageContext.getAxisService().getOperation(new QName("RMInOutOperation"));
+ AxisOperation operation =
messageContext.getAxisService().getOperation(Sandesha2Constants.RM_IN_OUT_OPERATION);
operation.setMessageReceiver(new RMMessageReceiver());
messageContext.setAxisOperation(operation);
Modified:
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/UnknownSequenceFaultTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/UnknownSequenceFaultTest.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/UnknownSequenceFaultTest.java
(original)
+++
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/UnknownSequenceFaultTest.java
Thu Mar 22 06:38:32 2007
@@ -21,8 +21,6 @@
import java.io.OutputStream;
import java.net.HttpURLConnection;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
@@ -139,7 +137,7 @@
messageContext.setWSAAction(pingAction);
// Set the AxisOperation to be InOut
- AxisOperation operation =
messageContext.getAxisService().getOperation(new QName("RMInOutOperation"));
+ AxisOperation operation =
messageContext.getAxisService().getOperation(Sandesha2Constants.RM_IN_OUT_OPERATION);
operation.setMessageReceiver(new RMMessageReceiver());
messageContext.setAxisOperation(operation);
Modified:
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/RMScenariosTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/RMScenariosTest.java?view=diff&rev=521260&r1=521259&r2=521260
==============================================================================
---
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/RMScenariosTest.java
(original)
+++
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/RMScenariosTest.java
Thu Mar 22 06:38:32 2007
@@ -105,9 +105,8 @@
clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_1);
runEcho(clientOptions, false, false, false);
- // Test sync echo with an offer, and the 1.0 spec
+ // Test sync echo with an offer, and the 1.0 spec. In this case
the offer is automatic
clientOptions = new Options();
-
clientOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID());
clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_0);
runEcho(clientOptions, false, false, true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
