Author: chamikara
Date: Sat Sep 23 08:26:08 2006
New Revision: 449260
URL: http://svn.apache.org/viewvc?view=rev&rev=449260
Log:
Changed the module.xml to add a policy jar file.
Updated samples and interop clients.
Modified:
webservices/sandesha/trunk/java/interop/conf/services.xml
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_1.java
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_2.java
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_3.java
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_4.java
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_1.java
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_2.java
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_3.java
webservices/sandesha/trunk/java/maven.xml
webservices/sandesha/trunk/java/project.properties
webservices/sandesha/trunk/java/samples/conf/userguide/services.xml
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/simpleServer/SimpleSandesha2Server.java
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/AsyncEchoClient.java
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/RMSampleService.java
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/SyncEchoClient.java
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/SyncPingClient.java
webservices/sandesha/trunk/java/test-resources/test.module.xml
Modified: webservices/sandesha/trunk/java/interop/conf/services.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/conf/services.xml?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
--- webservices/sandesha/trunk/java/interop/conf/services.xml (original)
+++ webservices/sandesha/trunk/java/interop/conf/services.xml Sat Sep 23
08:26:08 2006
@@ -15,13 +15,13 @@
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
</operation>
- <supported-policy-namespaces
namespaces="http://ws.apache.org/sandesha2/policy"; />
+<!-- <supported-policy-namespaces
namespaces="http://ws.apache.org/sandesha2/policy"; />
<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
xmlns:wsrm="http://ws.apache.org/sandesha2/policy";
wsu:Id="RMPolicy">
- </wsp:Policy>
+ </wsp:Policy>-->
</service>
Modified:
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_1.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_1.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_1.java
(original)
+++
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_1.java
Sat Sep 23 08:26:08 2006
@@ -91,7 +91,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(AXIS2_CLIENT_PATH,axis2_xml);
Options clientOptions = new Options ();
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
- clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean
(true));
+// clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean
(true));
clientOptions.setTo(new EndpointReference (toEPR));
String sequenceKey = "sequence1";
@@ -129,7 +129,7 @@
}
SandeshaClient.terminateSequence(serviceClient);
- serviceClient.finalizeInvoke();
+// serviceClient.finalizeInvoke();
}
private static OMElement getPingOMBlock(String text) {
Modified:
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_2.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_2.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_2.java
(original)
+++
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_2.java
Sat Sep 23 08:26:08 2006
@@ -25,6 +25,7 @@
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;
@@ -90,7 +91,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(AXIS2_CLIENT_PATH,axis2_xml);
Options clientOptions = new Options ();
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
- clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean
(true));
+// clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean
(true));
clientOptions.setTo(new EndpointReference (toEPR));
String sequenceKey = "sequence1";
@@ -100,7 +101,7 @@
//
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.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
//uncomment this to send messages in SOAP 1.2
clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_1);
//uncomment this to send the messages according to the v1_1 spec.
@@ -150,7 +151,7 @@
}
}
- serviceClient.finalizeInvoke();
+// serviceClient.finalizeInvoke();
}
private static OMElement getPingOMBlock(String text) {
Modified:
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_3.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_3.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_3.java
(original)
+++
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_3.java
Sat Sep 23 08:26:08 2006
@@ -90,7 +90,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(AXIS2_CLIENT_PATH,axis2_xml);
Options clientOptions = new Options ();
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
- clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean
(true));
+// clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean
(true));
clientOptions.setTo(new EndpointReference (toEPR));
String sequenceKey = "sequence1";
@@ -132,10 +132,32 @@
SandeshaClient.closeSequence(serviceClient);
-
clientOptions.setProperty(SandeshaClientConstants.MESSAGE_NUMBER,new Long(4));
- serviceClient.fireAndForget(getPingOMBlock("ping4"));
+// try {
+// Thread.sleep(3000);
+// } catch (InterruptedException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+
+//
clientOptions.setProperty(SandeshaClientConstants.MESSAGE_NUMBER,new Long(4));
+// serviceClient.fireAndForget(getPingOMBlock("ping4"));
- SandeshaClient.terminateSequence(serviceClient);
+ try {
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ SandeshaClient.terminateSequence(serviceClient);
+
+ try {
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
serviceClient.finalizeInvoke();
}
Modified:
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_4.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_4.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_4.java
(original)
+++
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_1_4.java
Sat Sep 23 08:26:08 2006
@@ -104,17 +104,19 @@
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,
transportToEPR);
- clientOptions.setProperty(Options.COPY_PROPERTIES, new
Boolean(true));
+// 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;
+// String replyAddress =
serviceClient.getMyEPR(Constants.TRANSPORT_HTTP).getAddress() + "/" +
ServiceClient.ANON_OUT_ONLY_OP;
+ String acksToAddress =
serviceClient.getMyEPR(Constants.TRANSPORT_HTTP).getAddress();
-
clientOptions.setProperty(SandeshaClientConstants.AcksTo,replyAddress);
- clientOptions.setReplyTo(new EndpointReference (replyAddress));
+
clientOptions.setProperty(SandeshaClientConstants.AcksTo,acksToAddress);
+
+// clientOptions.setReplyTo(new EndpointReference (replyAddress));
clientOptions.setTransportInProtocol(Constants.TRANSPORT_HTTP);
String sequenceKey = "sequence1";
Modified:
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_1.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_1.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_1.java
(original)
+++
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_1.java
Sat Sep 23 08:26:08 2006
@@ -41,6 +41,8 @@
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.client.SequenceReport;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
+import org.apache.sandesha2.storage.inmemory.InMemorySenderBeanMgr;
import org.apache.sandesha2.util.SandeshaUtil;
public class Scenario_2_1 {
@@ -104,11 +106,10 @@
Options clientOptions = new Options ();
- clientOptions.setProperty(Options.COPY_PROPERTIES,new Boolean
(true));
+// clientOptions.setProperty(Options.COPY_PROPERTIES,new Boolean
(true));
EndpointReference toEPR = new EndpointReference (toAddress);
-
OMFactory factory = OMAbstractFactory.getOMFactory();
OMNamespace namespace =
factory.createOMNamespace("urn:wsrm:InteropOptions","rmi");
OMElement acceptOfferElem =
factory.createOMElement("acceptOffer",namespace);
@@ -177,7 +178,9 @@
}
}
+ Thread.sleep(6000);
SandeshaClient.terminateSequence(serviceClient);
+
// serviceClient.finalizeInvoke();
}
Modified:
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_2.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_2.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_2.java
(original)
+++
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_2.java
Sat Sep 23 08:26:08 2006
@@ -102,7 +102,7 @@
Options clientOptions = new Options ();
- clientOptions.setProperty(Options.COPY_PROPERTIES,new Boolean
(true));
+// clientOptions.setProperty(Options.COPY_PROPERTIES,new Boolean
(true));
clientOptions.setTo(new EndpointReference (toEPR));
String acksTo =
serviceClient.getMyEPR(Constants.TRANSPORT_HTTP).getAddress();
Modified:
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_3.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_3.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_3.java
(original)
+++
webservices/sandesha/trunk/java/interop/src/sandesha2/interop/rm1_1/clients/Scenario_2_3.java
Sat Sep 23 08:26:08 2006
@@ -117,7 +117,7 @@
// clientOptions.setManageSession(true); // without this reference
params wont go.
serviceClient.setTargetEPR(toEPR);
- clientOptions.setProperty(Options.COPY_PROPERTIES,new Boolean
(true));
+// clientOptions.setProperty(Options.COPY_PROPERTIES,new Boolean
(true));
clientOptions.setTo(toEPR);
clientOptions.setAction("urn:wsrm:EchoString");
Modified: webservices/sandesha/trunk/java/maven.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/maven.xml?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
--- webservices/sandesha/trunk/java/maven.xml (original)
+++ webservices/sandesha/trunk/java/maven.xml Sat Sep 23 08:26:08 2006
@@ -8,6 +8,7 @@
<ant:property name="build.dist.dir" value="${maven.build.dir}/dist"/>
<ant:property name="build.temp.dir" value="${maven.build.dir}/temp"/>
+ <ant:property name="build.classes.dir"
value="${maven.build.dir}/classes"/>
<ant:property name="build.repo.dir" value="${maven.build.dir}/repos"/>
<ant:property name="build.samples.dir" value="${maven.build.dir}/samples"/>
<ant:property name="build.samples.services.dir"
value="${build.samples.dir}/services"/>
@@ -15,7 +16,8 @@
<ant:property name="build.interop.dir" value="${maven.build.dir}/interop"/>
<ant:property name="mar.name" value="${dist.module.name}.mar"/>
- <ant:property name="jar.name" value="${dist.name}.jar"/>
+ <ant:property name="policy.jar.name"
value="${pom.artifactId}-policy-${sandesha2.version}.jar"/>
+ <ant:property name="jar.name" value="${dist.name}.jar"/>
<ant:property name="client.jar.name"
value="${pom.artifactId}-client-${sandesha2.version}.jar"/>
<ant:property name="dir.samples" value="samples"/>
@@ -31,7 +33,7 @@
<ant:property name="repo.addressing.mar.path"
value="${maven.repo.local}/axis2/mars" />
<ant:property name="repo.addressing.mar"
value="${repo.addressing.mar.path}/${repo.addressing.mar.full.name}" />
- <goal name="build:all"
prereqs="mar,jar,client:jar,sample:create,repo:create,test:test" />
+ <goal name="build:all"
prereqs="mar,jar,client:jar,policy:jar,sample:create,repo:create,test:test" />
<goal name="all:jar" prereqs="mar,jar,client:jar" />
@@ -43,6 +45,14 @@
<!-- Befor running the tests the repo should be created-->
<preGoal name="test:test">
<attainGoal name="repo:create"/>
+
+ <!-- Copying the policy Assertion files-->
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${dir.config}/rmpolicy/">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+
</preGoal>
<goal name="mar" prereqs="java:compile">
@@ -90,6 +100,33 @@
<delete dir="${build.temp.dir}" />
</goal>
+
+ <goal name="policy:jar" prereqs="java:compile">
+ <ant:property name="policy.jar.temp.path"
value="${build.temp.dir}/policyjar" />
+
+ <ant:mkdir dir="${policy.jar.temp.path}" />
+
+ <copy todir="${policy.jar.temp.path}">
+ <fileset dir="${basedir}/target/classes" >
+ <include name="**/policy/**/*.class"/>
+ <include name="**/*Sandesha2Constants*.class"/>
+ <include name="**/*.properties" />
+ </fileset>
+ </copy>
+
+ <copy todir="${policy.jar.temp.path}" >
+ <fileset dir="${dir.config}/rmpolicy" >
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <ant:jar jarfile="${maven.build.dir}/${policy.jar.name}"
basedir="${policy.jar.temp.path}" />
+
+ <copy file="${maven.build.dir}/${policy.jar.name}"
+ toDir="${maven.repo.local}/${pom.artifactId}/jars"/>
+
+ <delete dir="${build.temp.dir}" />
+ </goal>
<goal name="client:jar" prereqs="java:compile">
<ant:property name="client.path" value="${build.temp.dir}/client/" />
Modified: webservices/sandesha/trunk/java/project.properties
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.properties?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
--- webservices/sandesha/trunk/java/project.properties (original)
+++ webservices/sandesha/trunk/java/project.properties Sat Sep 23 08:26:08 2006
@@ -26,7 +26,7 @@
annogen.version=0.1.0
backport_util_concurrent.version=2.1
-addressing.version=1.0
+addressing.version=SNAPSHOT
axiom.version=SNAPSHOT
axis2.version=SNAPSHOT
commons.codec.version=1.3
Modified: webservices/sandesha/trunk/java/samples/conf/userguide/services.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/samples/conf/userguide/services.xml?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
--- webservices/sandesha/trunk/java/samples/conf/userguide/services.xml
(original)
+++ webservices/sandesha/trunk/java/samples/conf/userguide/services.xml Sat Sep
23 08:26:08 2006
@@ -21,16 +21,16 @@
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
</operation>
- <supported-policy-namespaces
namespaces="http://ws.apache.org/sandesha2/policy"; />
+<!-- <supported-policy-namespaces
namespaces="http://ws.apache.org/sandesha2/policy"; />-->
- <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+<!-- <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
xmlns:wsrm="http://ws.apache.org/sandesha2/policy";
wsu:Id="RMPolicy">
- <!-- Following policy value has been overrided from the default
values.-->>
+ <!-#- Following policy value has been overrided from the default
values.-#->>
<wsrm:AcknowledgementInterval>3500</wsrm:AcknowledgementInterval>
- </wsp:Policy>
+ </wsp:Policy>-->
</service>
Modified:
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/simpleServer/SimpleSandesha2Server.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/samples/src/sandesha2/samples/simpleServer/SimpleSandesha2Server.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/simpleServer/SimpleSandesha2Server.java
(original)
+++
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/simpleServer/SimpleSandesha2Server.java
Sat Sep 23 08:26:08 2006
@@ -25,7 +25,7 @@
public class SimpleSandesha2Server {
- private static String SANDESHA2_HOME = "<SANDESHA2_HOME>"; //Change
this to ur path.
+ private static String SANDESHA2_HOME =
"/home/chamikara/checkouts/sandesha2/java"; //Change this to ur path.
private static String AXIS2_SERVER_PATH = SANDESHA2_HOME +
File.separator + "target" + File.separator +"repos" + File.separator + "server"
+ File.separator; //this will be available after a maven build
@@ -52,6 +52,5 @@
SimpleHTTPServer server = new SimpleHTTPServer
(configContext,8080);
server.start();
-
}
}
Modified:
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/AsyncEchoClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/AsyncEchoClient.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/AsyncEchoClient.java
(original)
+++
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/AsyncEchoClient.java
Sat Sep 23 08:26:08 2006
@@ -101,6 +101,8 @@
String sequenceKey = SandeshaUtil.getUUID(); //sequence key
for thie sequence.
clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
+// clientOptions.setReplyTo(new EndpointReference
(AddressingConstants.Final.WSA_ANONYMOUS_URL));
+
clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
//
clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE);
//uncomment this to send messages without chunking.
Modified:
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/RMSampleService.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/RMSampleService.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/RMSampleService.java
(original)
+++
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/RMSampleService.java
Sat Sep 23 08:26:08 2006
@@ -63,7 +63,6 @@
String resultText =
(previousText==null)?textStr:previousText+textStr;
sequenceStrings.put(sequenceStr,resultText);
-
OMFactory fac = OMAbstractFactory.getOMFactory();
OMNamespace applicationNamespace =
fac.createOMNamespace(applicationNamespaceName,"ns1");
OMElement echoStringResponseElem =
fac.createOMElement(echoStringResponse, applicationNamespace);
Modified:
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/SyncEchoClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/SyncEchoClient.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/SyncEchoClient.java
(original)
+++
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/SyncEchoClient.java
Sat Sep 23 08:26:08 2006
@@ -103,11 +103,15 @@
//
clientOptions.setProperty(SandeshaClient.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID());
//Uncomment this to offer a sequenceID for the incoming sequence.
serviceClient.setOptions(clientOptions);
-
+
Callback callback1 = new TestCallback ("Callback 1");
serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo1",sequenceKey),callback1);
+
+ clientOptions.setAction("urn:wsrm:EchoString");
Callback callback2 = new TestCallback ("Callback 2");
serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo2",sequenceKey),callback2);
+
+ clientOptions.setAction("urn:wsrm:EchoString");
clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE,
"true");
Callback callback3 = new TestCallback ("Callback 3");
Modified:
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/SyncPingClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/SyncPingClient.java?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
---
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/SyncPingClient.java
(original)
+++
webservices/sandesha/trunk/java/samples/src/sandesha2/samples/userguide/SyncPingClient.java
Sat Sep 23 08:26:08 2006
@@ -89,7 +89,7 @@
//
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(SandeshaClient.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_1);
//uncomment this to send the messages according to the v1_1 spec.
Modified: webservices/sandesha/trunk/java/test-resources/test.module.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test-resources/test.module.xml?view=diff&rev=449260&r1=449259&r2=449260
==============================================================================
--- webservices/sandesha/trunk/java/test-resources/test.module.xml (original)
+++ webservices/sandesha/trunk/java/test-resources/test.module.xml Sat Sep 23
08:26:08 2006
@@ -77,46 +77,48 @@
<parameter name="sandesha2.db.password" locked="false"></parameter>
<parameter name="sandesha2.db.create.mode"
locked="false">update</parameter>
- <supported-policy-namespaces
namespaces="http://ws.apache.org/sandesha2/policy"; />
+ <supported-policy-namespaces
namespaces="http://ws.apache.org/sandesha2/policy"; />
- <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
-
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
- xmlns:wsrm="http://ws.apache.org/sandesha2/policy"; wsu:Id="RMPolicy">
-
- <wsrm:AcknowledgementInterval>3000</wsrm:AcknowledgementInterval>
-
- <wsrm:RetransmissionInterval>6000</wsrm:RetransmissionInterval>
-
- <!-- '-1' conveys that there is no limit to the max. number of
retransmissions.-->
- <wsrm:MaximumRetransmissionCount>10</wsrm:MaximumRetransmissionCount>
-
- <wsrm:ExponentialBackoff>false</wsrm:ExponentialBackoff>
-
- <wsrm:InactivityTimeout>60</wsrm:InactivityTimeout>
-
- <wsrm:InactivityTimeoutMeasure>seconds</wsrm:InactivityTimeoutMeasure>
-
- <wsrm:InvokeInOrder>true</wsrm:InvokeInOrder>
-
- <!-- These will not be overriden by service level policies -->
- <wsrm:MessageTypesToDrop>none</wsrm:MessageTypesToDrop>
-
- <!-- This will not be overriden by service level policies -->
- <wsrm:StorageManagers>
-
- <wsrm:InMemoryStorageManager>
- org.apache.sandesha2.storage.inmemory.InMemoryStorageManager
- </wsrm:InMemoryStorageManager>
-
- <wsrm:PermanentStorageManager>
- org.apache.sandesha2.storage.inmemory.InMemoryStorageManager
- </wsrm:PermanentStorageManager>
-
- </wsrm:StorageManagers>
-
- <!-- This will not be overriden by service level policies -->
-
<wsrm:SecurityManager>org.apache.sandesha2.security.UnitTestSecurityManager</wsrm:SecurityManager>
-
-</wsp:Policy>
+ <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+ xmlns:wsrm="http://ws.apache.org/sandesha2/policy";
wsu:Id="RMPolicy">
+ <wsrm:RMAssertion>
+ <wsp:Policy>
+
<wsrm:AcknowledgementInterval>3000</wsrm:AcknowledgementInterval>
+
+
<wsrm:RetransmissionInterval>6000</wsrm:RetransmissionInterval>
+
+ <!-- '-1' conveys that there is no limit to the max. number of
retransmissions.-->
+
<wsrm:MaximumRetransmissionCount>10</wsrm:MaximumRetransmissionCount>
+
+
<wsrm:ExponentialBackoff>false</wsrm:ExponentialBackoff>
+
+
<wsrm:InactivityTimeout>60</wsrm:InactivityTimeout>
+
+
<wsrm:InactivityTimeoutMeasure>seconds</wsrm:InactivityTimeoutMeasure>
+
+ <wsrm:InvokeInOrder>true</wsrm:InvokeInOrder>
+
+ <!-- These will not be overriden by service level policies -->
+
<wsrm:MessageTypesToDrop>none</wsrm:MessageTypesToDrop>
+
+ <!-- This will not be overriden by service level policies -->
+ <wsrm:StorageManagers>
+
+ <wsrm:InMemoryStorageManager>
+
org.apache.sandesha2.storage.inmemory.InMemoryStorageManager
+ </wsrm:InMemoryStorageManager>
+
+ <wsrm:PermanentStorageManager>
+
org.apache.sandesha2.storage.inmemory.InMemoryStorageManager
+ </wsrm:PermanentStorageManager>
+
+ </wsrm:StorageManagers>
+
+ <!-- This will not be overriden by service level policies -->
+
<wsrm:SecurityManager>org.apache.sandesha2.security.UnitTestSecurityManager</wsrm:SecurityManager>
+ </wsp:Policy>
+ </wsrm:RMAssertion>
+ </wsp:Policy>
</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
