You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2006/04/23 08:59:13 UTC
svn commit: r396229 - in /webservices/sandesha/trunk/interop: conf/
src/org/apache/sandesha2/ src/org/apache/sandesha2/interop/
src/org/apache/sandesha2/wsrm_2006_02/
Author: chamikara
Date: Sat Apr 22 23:59:12 2006
New Revision: 396229
URL: http://svn.apache.org/viewcvs?rev=396229&view=rev
Log:
Updated interop files
Removed:
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/InteropClientAPI.java
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/interop/
Modified:
webservices/sandesha/trunk/interop/conf/sandesha2_interop.properties
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_1.java
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_2.java
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_3.java
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_4.java
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_1.java
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_2.java
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_3.java
Modified: webservices/sandesha/trunk/interop/conf/sandesha2_interop.properties
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/conf/sandesha2_interop.properties?rev=396229&r1=396228&r2=396229&view=diff
==============================================================================
--- webservices/sandesha/trunk/interop/conf/sandesha2_interop.properties (original)
+++ webservices/sandesha/trunk/interop/conf/sandesha2_interop.properties Sat Apr 22 23:59:12 2006
@@ -1,2 +1,2 @@
-to=http://localhost:8080/axis2/services/RMInteropService
-transportTo=http://localhost:8070/axis2/services/RMInteropService
\ No newline at end of file
+to=http://127.0.0.1:8080/axis2/services/RMSampleService
+transportTo=http://127.0.0.1:8080/axis2/services/RMSampleService
\ No newline at end of file
Modified: webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_1.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_1.java?rev=396229&r1=396228&r2=396229&view=diff
==============================================================================
--- webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_1.java (original)
+++ webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_1.java Sat Apr 22 23:59:12 2006
@@ -21,8 +21,11 @@
import java.io.InputStream;
import java.util.Properties;
-import javax.xml.namespace.QName;
-
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
@@ -31,13 +34,9 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.client.Sandesha2ClientAPI;
-import org.apache.sandesha2.client.reports.SequenceReport;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAP12Constants;
+import org.apache.sandesha2.client.SandeshaClient;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.client.SequenceReport;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -91,7 +90,7 @@
return;
}
- String axis2_xml = AXIS2_CLIENT_PATH + "axis2.xml";
+ String axis2_xml = AXIS2_CLIENT_PATH + "client_axis2.xml";
ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(AXIS2_CLIENT_PATH,axis2_xml);
Options clientOptions = new Options ();
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
@@ -99,18 +98,18 @@
clientOptions.setTo(new EndpointReference (toEPR));
String sequenceKey = "sequence1";
- clientOptions.setProperty(Sandesha2ClientAPI.SEQUENCE_KEY,sequenceKey);
+ clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE); //uncomment this to send messages without chunking.
clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
+// clientOptions.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,AddressingConstants.Submission.WSA_NAMESPACE);
+ clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
- clientOptions.setProperty(Sandesha2ClientAPI.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
+ clientOptions.setAction("urn:wsrm:Ping");
ServiceClient serviceClient = new ServiceClient (configContext,null);
- serviceClient.engageModule(new QName ("sandesha2")); //engaging the sandesha2 module.
-
serviceClient.setOptions(clientOptions);
serviceClient.fireAndForget(getPingOMBlock("ping1"));
@@ -120,7 +119,7 @@
SequenceReport sequenceReport = null;
boolean complete = false;
while (!complete) {
- sequenceReport = Sandesha2ClientAPI.getOutgoingSequenceReport(toEPR,sequenceKey,configContext);
+ sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
if (sequenceReport!=null && sequenceReport.getCompletedMessages().size()==3)
complete = true;
else {
@@ -132,7 +131,7 @@
}
}
- Sandesha2ClientAPI.terminateSequence(toEPR,sequenceKey,serviceClient,configContext);
+ SandeshaClient.terminateSequence(serviceClient);
serviceClient.finalizeInvoke();
}
Modified: webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_2.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_2.java?rev=396229&r1=396228&r2=396229&view=diff
==============================================================================
--- webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_2.java (original)
+++ webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_2.java Sat Apr 22 23:59:12 2006
@@ -21,8 +21,10 @@
import java.io.InputStream;
import java.util.Properties;
-import javax.xml.namespace.QName;
-
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
@@ -30,15 +32,10 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContextConstants;
-import org.apache.sandesha2.InteropClientAPI;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.client.Sandesha2ClientAPI;
-import org.apache.sandesha2.client.reports.SequenceReport;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAP12Constants;
+import org.apache.sandesha2.client.SandeshaClient;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.client.SequenceReport;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -92,7 +89,7 @@
return;
}
- String axis2_xml = AXIS2_CLIENT_PATH + "axis2.xml";
+ String axis2_xml = AXIS2_CLIENT_PATH + "client_axis2.xml";
ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(AXIS2_CLIENT_PATH,axis2_xml);
Options clientOptions = new Options ();
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
@@ -100,31 +97,33 @@
clientOptions.setTo(new EndpointReference (toEPR));
String sequenceKey = "sequence1";
- clientOptions.setProperty(Sandesha2ClientAPI.SEQUENCE_KEY,sequenceKey);
+ clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE); //uncomment this to send messages without chunking.
- clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
+// clientOptions.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,AddressingConstants.Submission.WSA_NAMESPACE);
+
+// clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
+
+ clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
- clientOptions.setProperty(Sandesha2ClientAPI.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
+ clientOptions.setAction("urn:wsrm:Ping");
ServiceClient serviceClient = new ServiceClient (configContext,null);
- serviceClient.engageModule(new QName ("sandesha2")); //engaging the sandesha2 module.
-
serviceClient.setOptions(clientOptions);
- clientOptions.setProperty(Sandesha2ClientAPI.DUMMY_MESSAGE,Sandesha2ClientAPI.VALUE_TRUE);
- clientOptions.setProperty(Sandesha2ClientAPI.LAST_MESSAGE, "true");
+ clientOptions.setProperty(SandeshaClientConstants.DUMMY_MESSAGE,Sandesha2Constants.VALUE_TRUE);
+ clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true");
serviceClient.fireAndForget(getPingOMBlock("ping31"));
- clientOptions.setProperty(Sandesha2ClientAPI.DUMMY_MESSAGE,Sandesha2ClientAPI.VALUE_FALSE);
+ clientOptions.setProperty(SandeshaClientConstants.DUMMY_MESSAGE,Sandesha2Constants.VALUE_FALSE);
SequenceReport sequenceReport = null;
boolean established = false;
while (!established) {
- sequenceReport = Sandesha2ClientAPI.getOutgoingSequenceReport(toEPR,sequenceKey,configContext);
+ sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
if (sequenceReport!=null && sequenceReport.getSequenceStatus()>=SequenceReport.SEQUENCE_STATUS_ESTABLISHED)
established = true;
else {
@@ -136,13 +135,13 @@
}
}
- InteropClientAPI.sendAckRequest(toEPR,sequenceKey,serviceClient,configContext);
+ SandeshaClient.sendAckRequest(serviceClient);
- Sandesha2ClientAPI.terminateSequence(toEPR,sequenceKey,serviceClient,configContext);
+ SandeshaClient.terminateSequence(serviceClient);
boolean terminated = false;
while (!terminated) {
- sequenceReport = Sandesha2ClientAPI.getOutgoingSequenceReport(toEPR,sequenceKey,configContext);
+ sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
if (sequenceReport!=null && sequenceReport.getSequenceStatus()==SequenceReport.SEQUENCE_STATUS_TERMINATED)
terminated = true;
else {
Modified: webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_3.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_3.java?rev=396229&r1=396228&r2=396229&view=diff
==============================================================================
--- webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_3.java (original)
+++ webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_3.java Sat Apr 22 23:59:12 2006
@@ -21,8 +21,10 @@
import java.io.InputStream;
import java.util.Properties;
-import javax.xml.namespace.QName;
-
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
@@ -30,15 +32,10 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContextConstants;
-import org.apache.sandesha2.InteropClientAPI;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.client.Sandesha2ClientAPI;
-import org.apache.sandesha2.client.reports.SequenceReport;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAP12Constants;
+import org.apache.sandesha2.client.SandeshaClient;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.client.SequenceReport;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -92,7 +89,7 @@
return;
}
- String axis2_xml = AXIS2_CLIENT_PATH + "axis2.xml";
+ String axis2_xml = AXIS2_CLIENT_PATH + "client_axis2.xml";
ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(AXIS2_CLIENT_PATH,axis2_xml);
Options clientOptions = new Options ();
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
@@ -100,29 +97,31 @@
clientOptions.setTo(new EndpointReference (toEPR));
String sequenceKey = "sequence1";
- clientOptions.setProperty(Sandesha2ClientAPI.SEQUENCE_KEY,sequenceKey);
+ clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE); //uncomment this to send messages without chunking.
- clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
+// clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
- clientOptions.setProperty(Sandesha2ClientAPI.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
+ clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
- ServiceClient serviceClient = new ServiceClient (configContext,null);
+// clientOptions.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,AddressingConstants.Submission.WSA_NAMESPACE);
- serviceClient.engageModule(new QName ("sandesha2")); //engaging the sandesha2 module.
+ clientOptions.setAction("urn:wsrm:Ping");
+ ServiceClient serviceClient = new ServiceClient (configContext,null);
+
serviceClient.setOptions(clientOptions);
- clientOptions.setProperty(Sandesha2ClientAPI.MESSAGE_NUMBER,new Long(1));
+ clientOptions.setProperty(SandeshaClientConstants.MESSAGE_NUMBER,new Long(1));
serviceClient.fireAndForget(getPingOMBlock("ping1"));
- clientOptions.setProperty(Sandesha2ClientAPI.MESSAGE_NUMBER,new Long(3));
+ clientOptions.setProperty(SandeshaClientConstants.MESSAGE_NUMBER,new Long(3));
serviceClient.fireAndForget(getPingOMBlock("ping3"));
boolean complete = false;
while (!complete) {
- SequenceReport sequenceReport = Sandesha2ClientAPI.getOutgoingSequenceReport(toEPR,sequenceKey,configContext);
+ SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
if (sequenceReport!=null && sequenceReport.getCompletedMessages().size()==2)
complete = true;
else {
@@ -133,14 +132,13 @@
}
}
}
-
- InteropClientAPI.closeSequence(toEPR,sequenceKey,serviceClient,configContext);
-
- clientOptions.setProperty(Sandesha2ClientAPI.MESSAGE_NUMBER,new Long(4));
- serviceClient.fireAndForget(getPingOMBlock("ping4"));
+ SandeshaClient.closeSequence(serviceClient);
+
+// clientOptions.setProperty(SandeshaClient.MESSAGE_NUMBER,new Long(4));
+// serviceClient.fireAndForget(getPingOMBlock("ping4"));
- Sandesha2ClientAPI.terminateSequence(toEPR,sequenceKey,serviceClient,configContext);
+// SandeshaClient.terminateSequence(serviceClient);
serviceClient.finalizeInvoke();
}
Modified: webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_4.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_4.java?rev=396229&r1=396228&r2=396229&view=diff
==============================================================================
--- webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_4.java (original)
+++ webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_4.java Sat Apr 22 23:59:12 2006
@@ -21,8 +21,10 @@
import java.io.InputStream;
import java.util.Properties;
-import javax.xml.namespace.QName;
-
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
@@ -32,13 +34,9 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.client.Sandesha2ClientAPI;
-import org.apache.sandesha2.client.reports.SequenceReport;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAP12Constants;
+import org.apache.sandesha2.client.SandeshaClient;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.client.SequenceReport;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -101,7 +99,7 @@
return;
}
- String axis2_xml = AXIS2_CLIENT_PATH + "axis2.xml";
+ String axis2_xml = AXIS2_CLIENT_PATH + "client_axis2.xml";
ConfigurationContext configContext = ConfigurationContextFactory
.createConfigurationContextFromFileSystem(AXIS2_CLIENT_PATH,
axis2_xml);
@@ -112,32 +110,33 @@
clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean(true));
clientOptions.setTo(new EndpointReference(toEPR));
+ clientOptions.setAction("urn:wsrm:Ping");
+
ServiceClient serviceClient = new ServiceClient(configContext, null);
String replyAddress = serviceClient.getMyEPR(Constants.TRANSPORT_HTTP).getAddress() + "/" + ServiceClient.ANON_OUT_ONLY_OP;
- clientOptions.setProperty(Sandesha2ClientAPI.AcksTo,replyAddress);
+ clientOptions.setProperty(SandeshaClientConstants.AcksTo,replyAddress);
clientOptions.setReplyTo(new EndpointReference (replyAddress));
clientOptions.setTransportInProtocol(Constants.TRANSPORT_HTTP);
String sequenceKey = "sequence1";
- clientOptions.setProperty(Sandesha2ClientAPI.SEQUENCE_KEY, sequenceKey);
+ clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY, sequenceKey);
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE);
// //uncomment this to send messages without chunking.
- clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+// clientOptions.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,AddressingConstants.Submission.WSA_NAMESPACE);
+
+// clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
// //uncomment this to send messages in SOAP 1.2
- clientOptions.setProperty(Sandesha2ClientAPI.RM_SPEC_VERSION,
+ clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,
Sandesha2Constants.SPEC_VERSIONS.WSRX); // uncomment this to
// send the messages
// according to the WSRX
// spec.
- serviceClient.engageModule(new QName("sandesha2")); // engaging the
- // sandesha2 module.
-
serviceClient.setOptions(clientOptions);
serviceClient.fireAndForget(getPingOMBlock("ping1"));
@@ -146,8 +145,7 @@
boolean complete = false;
while (!complete) {
- SequenceReport sequenceReport = Sandesha2ClientAPI.getOutgoingSequenceReport(
- toEPR, sequenceKey, configContext);
+ SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
if (sequenceReport!=null && sequenceReport.getCompletedMessages().size()==3)
complete = true;
else {
@@ -159,7 +157,7 @@
}
}
- Sandesha2ClientAPI.terminateSequence(toEPR,sequenceKey,serviceClient,configContext);
+ SandeshaClient.terminateSequence(serviceClient);
// serviceClient.finalizeInvoke();
}
Modified: webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_1.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_1.java?rev=396229&r1=396228&r2=396229&view=diff
==============================================================================
--- webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_1.java (original)
+++ webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_1.java Sat Apr 22 23:59:12 2006
@@ -23,6 +23,11 @@
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPBody;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
@@ -33,14 +38,10 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.client.Sandesha2ClientAPI;
+import org.apache.sandesha2.client.SandeshaClient;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.client.SequenceReport;
import org.apache.sandesha2.util.SandeshaUtil;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAP12Constants;
-import org.apache.ws.commons.soap.SOAPBody;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -59,7 +60,7 @@
private static String transportToIP = "127.0.0.1";
private static String transportToPort = "8070";
private static String servicePart = "/axis2/services/RMInteropService";
- private static String toEPR = "http://" + toIP + ":" + toPort + servicePart;
+ private static String toAddress = "http://" + toIP + ":" + toPort + servicePart;
private static String transportToEPR = "http://" + transportToIP + ":" + transportToPort + servicePart;
private static String SANDESHA2_HOME = "<SANDESHA2_HOME>"; //Change this to ur path.
@@ -85,7 +86,7 @@
properties.load(in);
}
- toEPR = properties.getProperty("to");
+ toAddress = properties.getProperty("to");
transportToEPR = properties.getProperty("transportTo");
new Scenario_2_1 ().run();
@@ -98,7 +99,7 @@
return;
}
- String axis2_xml = AXIS2_CLIENT_PATH + "axis2.xml";
+ String axis2_xml = AXIS2_CLIENT_PATH + "client_axis2.xml";
ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(AXIS2_CLIENT_PATH,axis2_xml);
@@ -107,47 +108,79 @@
Options clientOptions = new Options ();
clientOptions.setProperty(Options.COPY_PROPERTIES,new Boolean (true));
- clientOptions.setTo(new EndpointReference (toEPR));
+
+ EndpointReference toEPR = new EndpointReference (toAddress);
+
+
+ OMFactory factory = OMAbstractFactory.getOMFactory();
+ OMNamespace namespace = factory.createOMNamespace("urn:wsrm:InteropOptions","rmi");
+ OMElement acceptOfferElem = factory.createOMElement("acceptOffer",namespace);
+ OMElement useOfferElem = factory.createOMElement("useOffer",namespace);
+ acceptOfferElem.setText("true");
+ useOfferElem.setText("true");
+ toEPR.addReferenceParameter(acceptOfferElem);
+ toEPR.addReferenceParameter(useOfferElem);
+// clientOptions.setManageSession(true); // without this reference params wont go.
+ serviceClient.setTargetEPR(toEPR);
+
+ clientOptions.setTo(toEPR);
String acksTo = serviceClient.getMyEPR(Constants.TRANSPORT_HTTP).getAddress();
- clientOptions.setProperty(Sandesha2ClientAPI.AcksTo,acksTo);
+ clientOptions.setProperty(SandeshaClientConstants.AcksTo,acksTo);
String sequenceKey = "sequence4";
- clientOptions.setProperty(Sandesha2ClientAPI.SEQUENCE_KEY,sequenceKey);
+ clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setAction("urn:wsrm:EchoString");
+
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE); //uncomment this to send messages without chunking.
- clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
+// clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
- clientOptions.setProperty(Sandesha2ClientAPI.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
+ clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
- clientOptions.setProperty(Sandesha2ClientAPI.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID()); //Uncomment this to offer a sequenceID for the incoming sequence.
+// clientOptions.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,AddressingConstants.Submission.WSA_NAMESPACE);
+
+ clientOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID()); //Uncomment this to offer a sequenceID for the incoming sequence.
//You must set the following two properties in the request-reply case.
clientOptions.setTransportInProtocol(Constants.TRANSPORT_HTTP);
clientOptions.setUseSeparateListener(true);
serviceClient.setOptions(clientOptions);
- serviceClient.engageModule(new QName ("sandesha2")); //engaging the sandesha2 module.
-
+
Callback callback1 = new TestCallback ("Callback 1");
- serviceClient.sendReceiveNonblocking(getEchoOMBlock("echo1",sequenceKey),callback1);
+ serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo1",sequenceKey),callback1);
Callback callback2 = new TestCallback ("Callback 2");
- serviceClient.sendReceiveNonblocking(getEchoOMBlock("echo2",sequenceKey),callback2);
+ serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo2",sequenceKey),callback2);
Callback callback3 = new TestCallback ("Callback 3");
- serviceClient.sendReceiveNonblocking(getEchoOMBlock("echo3",sequenceKey),callback3);
+ serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo3",sequenceKey),callback3);
while (!callback3.isComplete()) {
Thread.sleep(1000);
}
+ SequenceReport sequenceReport = null;
+ boolean complete = false;
+ while (!complete) {
+// sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
+ if (sequenceReport!=null && sequenceReport.getCompletedMessages().size()==3)
+ complete = true;
+ else {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
- Sandesha2ClientAPI.terminateSequence(toEPR,sequenceKey,serviceClient,configContext);
+ SandeshaClient.terminateSequence(serviceClient);
// serviceClient.finalizeInvoke();
}
Modified: webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_2.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_2.java?rev=396229&r1=396228&r2=396229&view=diff
==============================================================================
--- webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_2.java (original)
+++ webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_2.java Sat Apr 22 23:59:12 2006
@@ -23,6 +23,11 @@
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPBody;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
@@ -33,13 +38,8 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.client.Sandesha2ClientAPI;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAP12Constants;
-import org.apache.ws.commons.soap.SOAPBody;
+import org.apache.sandesha2.client.SandeshaClient;
+import org.apache.sandesha2.client.SandeshaClientConstants;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -97,7 +97,7 @@
return;
}
- String axis2_xml = AXIS2_CLIENT_PATH + "axis2.xml";
+ String axis2_xml = AXIS2_CLIENT_PATH + "client_axis2.xml";
ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(AXIS2_CLIENT_PATH,axis2_xml);
@@ -109,44 +109,47 @@
clientOptions.setTo(new EndpointReference (toEPR));
String acksTo = serviceClient.getMyEPR(Constants.TRANSPORT_HTTP).getAddress();
- clientOptions.setProperty(Sandesha2ClientAPI.AcksTo,acksTo);
+ clientOptions.setProperty(SandeshaClientConstants.AcksTo,acksTo);
String sequenceKey = "sequence4";
- clientOptions.setProperty(Sandesha2ClientAPI.SEQUENCE_KEY,sequenceKey);
+ clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE); //uncomment this to send messages without chunking.
- clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
+// clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
- clientOptions.setProperty(Sandesha2ClientAPI.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
+ clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
-// clientOptions.setProperty(Sandesha2ClientAPI.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID()); //Uncomment this to offer a sequenceID for the incoming sequence.
+// clientOptions.setProperty(SandeshaClient.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID()); //Uncomment this to offer a sequenceID for the incoming sequence.
+
+// clientOptions.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,AddressingConstants.Submission.WSA_NAMESPACE);
+
+ clientOptions.setAction("urn:wsrm:EchoString");
//You must set the following two properties in the request-reply case.
clientOptions.setTransportInProtocol(Constants.TRANSPORT_HTTP);
clientOptions.setUseSeparateListener(true);
serviceClient.setOptions(clientOptions);
- serviceClient.engageModule(new QName ("sandesha2")); //engaging the sandesha2 module.
-
+
Callback callback1 = new TestCallback ("Callback 1");
- serviceClient.sendReceiveNonblocking(getEchoOMBlock("echo1",sequenceKey),callback1);
+ serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo1",sequenceKey),callback1);
Callback callback2 = new TestCallback ("Callback 2");
- serviceClient.sendReceiveNonblocking(getEchoOMBlock("echo2",sequenceKey),callback2);
+ serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo2",sequenceKey),callback2);
Callback callback3 = new TestCallback ("Callback 3");
- serviceClient.sendReceiveNonblocking(getEchoOMBlock("echo3",sequenceKey),callback3);
+ serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo3",sequenceKey),callback3);
while (!callback3.isComplete()) {
Thread.sleep(1000);
}
- Sandesha2ClientAPI.terminateSequence(toEPR,sequenceKey,serviceClient,configContext);
+ SandeshaClient.terminateSequence(serviceClient);
}
Modified: webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_3.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_3.java?rev=396229&r1=396228&r2=396229&view=diff
==============================================================================
--- webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_3.java (original)
+++ webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_3.java Sat Apr 22 23:59:12 2006
@@ -23,6 +23,11 @@
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPBody;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
@@ -33,13 +38,9 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.client.Sandesha2ClientAPI;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAP12Constants;
-import org.apache.ws.commons.soap.SOAPBody;
+import org.apache.sandesha2.client.SandeshaClient;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.util.SandeshaUtil;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -58,7 +59,7 @@
private static String transportToIP = "127.0.0.1";
private static String transportToPort = "8070";
private static String servicePart = "/axis2/services/RMInteropService";
- private static String toEPR = "http://" + toIP + ":" + toPort + servicePart;
+ private static String toAddress = "http://" + toIP + ":" + toPort + servicePart;
private static String transportToEPR = "http://" + transportToIP + ":" + transportToPort + servicePart;
private static String SANDESHA2_HOME = "<SANDESHA2_HOME>"; //Change this to ur path.
@@ -84,7 +85,7 @@
properties.load(in);
}
- toEPR = properties.getProperty("to");
+ toAddress = properties.getProperty("to");
transportToEPR = properties.getProperty("transportTo");
new Scenario_2_3 ().run();
@@ -97,7 +98,7 @@
return;
}
- String axis2_xml = AXIS2_CLIENT_PATH + "axis2.xml";
+ String axis2_xml = AXIS2_CLIENT_PATH + "client_axis2.xml";
ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(AXIS2_CLIENT_PATH,axis2_xml);
@@ -105,48 +106,65 @@
Options clientOptions = new Options ();
+ EndpointReference toEPR = new EndpointReference (toAddress);
+
+
+ OMFactory factory = OMAbstractFactory.getOMFactory();
+ OMNamespace namespace = factory.createOMNamespace("urn:wsrm:InteropOptions","rmi");
+ OMElement acceptOfferElem = factory.createOMElement("acceptOffer",namespace);
+ OMElement useOfferElem = factory.createOMElement("useOffer",namespace);
+ acceptOfferElem.setText("false");
+ useOfferElem.setText("false");
+ toEPR.addReferenceParameter(acceptOfferElem);
+ toEPR.addReferenceParameter(useOfferElem);
+// clientOptions.setManageSession(true); // without this reference params wont go.
+ serviceClient.setTargetEPR(toEPR);
+
clientOptions.setProperty(Options.COPY_PROPERTIES,new Boolean (true));
- clientOptions.setTo(new EndpointReference (toEPR));
+ clientOptions.setTo(toEPR);
+
+ clientOptions.setAction("urn:wsrm:EchoString");
String acksTo = serviceClient.getMyEPR(Constants.TRANSPORT_HTTP).getAddress();
- clientOptions.setProperty(Sandesha2ClientAPI.AcksTo,acksTo);
+ clientOptions.setProperty(SandeshaClientConstants.AcksTo,acksTo);
String sequenceKey = "sequence4";
- clientOptions.setProperty(Sandesha2ClientAPI.SEQUENCE_KEY,sequenceKey);
+ clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE); //uncomment this to send messages without chunking.
- clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
+// clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
- clientOptions.setProperty(Sandesha2ClientAPI.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
+// clientOptions.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,AddressingConstants.Submission.WSA_NAMESPACE);
+
+ clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.WSRX); //uncomment this to send the messages according to the WSRX spec.
- clientOptions.setProperty(Sandesha2ClientAPI.OFFERED_SEQUENCE_ID,"a"); //single characted offers are declined by the server
+ clientOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID()); //single characted offers are declined by the server
//You must set the following two properties in the request-reply case.
clientOptions.setTransportInProtocol(Constants.TRANSPORT_HTTP);
clientOptions.setUseSeparateListener(true);
serviceClient.setOptions(clientOptions);
- serviceClient.engageModule(new QName ("sandesha2")); //engaging the sandesha2 module.
-
+
Callback callback1 = new TestCallback ("Callback 1");
- serviceClient.sendReceiveNonblocking(getEchoOMBlock("echo1",sequenceKey),callback1);
+ serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo1",sequenceKey),callback1);
Callback callback2 = new TestCallback ("Callback 2");
- serviceClient.sendReceiveNonblocking(getEchoOMBlock("echo2",sequenceKey),callback2);
+ serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo2",sequenceKey),callback2);
Callback callback3 = new TestCallback ("Callback 3");
- serviceClient.sendReceiveNonblocking(getEchoOMBlock("echo3",sequenceKey),callback3);
+ serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo3",sequenceKey),callback3);
while (!callback3.isComplete()) {
Thread.sleep(1000);
}
- Sandesha2ClientAPI.terminateSequence(toEPR,sequenceKey,serviceClient,configContext);
+ SandeshaClient.terminateSequence(serviceClient);
// serviceClient.finalizeInvoke();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org