jaliya 2005/05/16 06:09:18
Modified: sandesha/config WSRMPolicy.xml
sandesha/interop build.xml
sandesha/interop/org/apache/sandesha/samples/interop
AsyncPingClient.java
sandesha/interop/org/apache/sandesha/samples/interop/testclient
InteropBean.java InteropStub.java
sandesha maven.xml
sandesha/src/org/apache/sandesha EnvelopeCreator.java
RMInitiator.java
sandesha/src/org/apache/sandesha/client RMSender.java
sandesha/test/org/apache/sandesha SimpleServerImpl.java
Log:
Changed the interop test classes
Revision Changes Path
1.4 +1 -1 ws-fx/sandesha/config/WSRMPolicy.xml
Index: WSRMPolicy.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/config/WSRMPolicy.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSRMPolicy.xml 16 May 2005 06:08:17 -0000 1.3
+++ WSRMPolicy.xml 16 May 2005 13:09:18 -0000 1.4
@@ -9,7 +9,7 @@
<wsp:Policy wsu:Id="MyPolicy" >
<wsrm:RMAssertion>
<!-- <wsrm:InactivityTimeout Milliseconds="600000"
/> -->
- <wsrm:InactivityTimeout Milliseconds="30000" />
+ <wsrm:InactivityTimeout Milliseconds="120000" />
<wsrm:BaseRetransmissionInterval
Milliseconds="3000" />
<wsrm:ExponentialBackoff />
<wsrm:AcknowledgementInterval
Milliseconds="200" />
1.9 +17 -21 ws-fx/sandesha/interop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 16 May 2005 06:08:17 -0000 1.8
+++ build.xml 16 May 2005 13:09:18 -0000 1.9
@@ -67,8 +67,8 @@
<!-- Following two were added on 01-03-2005-->
<property name="dir.config" value="..\config"/>
- <property name="test.report" value="${build.dir}\test-reports"/>
- <property name="build.interop" value="${build.dir}\interop-classes"/>
+ <property name="test.report" value="${build.dir}/test-reports"/>
+ <property name="build.interop" value="${build.dir}/interop-classes"/>
<property name="build.classes" value="${build.dir}/classes"/>
@@ -243,9 +243,7 @@
<mkdir dir="${build.classes}"/>
</target>
- <target name="compile"
- depends="compile.library"
- description="compile everything"/>
+ <target name="compile" depends="compile.library" description="compile
everything"/>
<target name="compile.library" depends="prepare-src">
@@ -256,18 +254,20 @@
<!-- <exclude name="**/MerlinPFX.java" unless="jdk14.present"/>
-->
<exclude name="**/BouncyCastle.java" unless="bc.present"/>
</javac>
+
+ <javac srcdir="${dir.interop}" destdir="${build.classes}" debug="on">
+ <classpath refid="classpath.library"/>
+ <exclude name="**/Merlin.java" unless="jdk14.present"/>
+ <!-- <exclude name="**/MerlinPFX.java" unless="jdk14.present"/>
-->
+ <exclude name="**/BouncyCastle.java" unless="bc.present"/>
+ </javac>
<!-- Copy Property files -->
<copy todir="${build.classes}">
-
- <!--
- <fileset dir="${dir.src}">
- <include name="**/*.properties"/>
- <exclude name="**/axis/**/*.properties"/>
- </fileset>
- -->
-
+
<fileset dir="${dir.config}">
+ <include name="client-config.wsdd"/>
+ <include name="server-config.wsdd"/>
<include name="sandesha.properties" />
<include name="log4j.properties" />
<include name="WSRMPolicy.xml" />
@@ -284,11 +284,7 @@
<classpath refid="classpath.library"/>
</javac>
- <!--ant dir="${dir.interop}"
- antfile="build.xml"
- target="compile"
- inheritAll="false">
- </ant-->
+
<copy todir="${build.interop}">
<fileset dir="${dir.interop}" includes="client-config.wsdd"/>
<fileset dir="${dir.config}" includes="sandesha.properties"/>
@@ -378,13 +374,13 @@
<target name="echo_sync_ack"
depends="run_interop_echo_string_sync_ack,shutdown_server"> </target>
<target name="echo_async_ack"
depends="run_interop_echo_string_async_ack,shutdown_server"> </target>
+
<target name="prepare-dist">
<mkdir dir="${dir.dist}" />
</target>
<target name="prepare-jar" depends="compile.library,prepare-dist"
description="prepares for creating jar">
- <property name="build.temp-jar" value="${build.dir}/temp-jar" />
<property name="sandesha.jar.name" value="sandesha-1.0.jar" />
<property name="dir.dist.jar" value="${dir.dist}/jar" />
<property name="sandesha.jar"
value="${dir.dist.jar}/${sandesha.jar.name}" />
@@ -399,7 +395,7 @@
</target>
<target name="prepare-war" depends="jar,compile.interop"
description="prepares for creating war">
-
+
<property name="sandesha.war.name" value="sandesha.war" />
<property name="webxml" value="${dir.interop}/webapp/web.xml" />
<property name="dir.dist.war" value="${dir.dist}/war" />
@@ -434,5 +430,5 @@
</target>
<target name="war" depends="create.war" description="creates the war
file" />
-
+
</project>
1.9 +1 -1
ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/AsyncPingClient.java
Index: AsyncPingClient.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/AsyncPingClient.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AsyncPingClient.java 9 May 2005 12:33:14 -0000 1.8
+++ AsyncPingClient.java 16 May 2005 13:09:18 -0000 1.9
@@ -43,7 +43,7 @@
Call call = (Call) service.createCall();
call.setProperty(Constants.ClientProperties.SYNC, new
Boolean(false));
- call.setProperty(Constants.ClientProperties.ACTION,
"sandesha:ping");
+ call.setProperty(Constants.ClientProperties.ACTION,
"urn:wsrm:ping");
call.setProperty(Constants.ClientProperties.ACKS_TO,
"http://127.0.0.1:"; + defaultClientPort +
"/axis/services/RMService");
1.3 +10 -1
ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/testclient/InteropBean.java
Index: InteropBean.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/testclient/InteropBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InteropBean.java 14 May 2005 02:45:39 -0000 1.2
+++ InteropBean.java 16 May 2005 13:09:18 -0000 1.3
@@ -13,7 +13,8 @@
private String terminate;
private String acks;
private String acksTo;
-
+ private boolean sendOffer;
+
public String getAcksTo() {
return acksTo;
}
@@ -42,6 +43,14 @@
return replyto;
}
+ public boolean isSendOffer() {
+ return sendOffer;
+ }
+
+ public void setSendOffer(boolean sendOffer) {
+ this.sendOffer = sendOffer;
+ }
+
public String getTarget() {
return target;
}
1.6 +139 -159
ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/testclient/InteropStub.java
Index: InteropStub.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/testclient/InteropStub.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InteropStub.java 16 May 2005 06:08:17 -0000 1.5
+++ InteropStub.java 16 May 2005 13:09:18 -0000 1.6
@@ -7,181 +7,161 @@
package org.apache.sandesha.samples.interop.testclient;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
-
import org.apache.axis.client.Call;
import org.apache.axis.client.Service;
import org.apache.axis.encoding.XMLType;
import org.apache.axis.message.addressing.util.AddressingUtils;
-import org.apache.axis.utils.XMLUtils;
import org.apache.sandesha.Constants;
import org.apache.sandesha.RMInitiator;
import org.apache.sandesha.RMTransport;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.ParameterMode;
-
-/**
- * @author root
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
public class InteropStub {
-
-
- public void runPing(InteropBean bean){
-
-
+ public void runPing(InteropBean bean) {
+
String target = bean.getTarget();
- String from = bean.getFrom();
- String replyTo = bean.getReplyto();
- String acksTo = bean.getAcksTo();
- String acks = bean.getAcks();
- String terminate = bean.getTerminate();
- String operation = bean.getOperation();
- int messages = bean.getNoOfMsgs();
-
- if(replyTo!=null && replyTo.equalsIgnoreCase("anonymous"))
- replyTo = AddressingUtils.getAnonymousRoleURI();
-
- if(from!=null && from.equalsIgnoreCase("anonymous"))
- from = AddressingUtils.getAnonymousRoleURI();
-
- if(acksTo!=null && acksTo.equalsIgnoreCase("anonymous"))
- acksTo = AddressingUtils.getAnonymousRoleURI();
-
-
- try {
- boolean sync = false;
-
- if(acksTo.equals(AddressingUtils.getAnonymousRoleURI())){
- sync = true;
- }
-
- System.out.println("********Running ping 2**********");
-
- RMInitiator.initClient(sync);
-
- Service service = new Service();
- Call call = (Call) service.createCall();
-
- System.out.println("Ping sync:" + sync);
- call.setProperty(Constants.ClientProperties.SYNC, new
Boolean(sync));
-
- call.setProperty(Constants.ClientProperties.ACTION,
"sandesha:ping");
-
-
- //these three properties are optional
-
call.setProperty(Constants.ClientProperties.ACKS_TO,acksTo);
-
- if(from!=null && from!="")
-
call.setProperty(Constants.ClientProperties.FROM,from);
-
- if(replyTo!=null && replyTo!="")
-
call.setProperty(Constants.ClientProperties.REPLY_TO,replyTo);
-
- call.setTargetEndpointAddress(target);
- call.setOperationName(new QName("RMInteropService",
operation));
- call.setTransport(new RMTransport(target, ""));
-
- call.addParameter("arg1", XMLType.XSD_STRING,
ParameterMode.IN);
-
- for(int i=1;i<=messages;i++){
-
call.setProperty(Constants.ClientProperties.MSG_NUMBER, new Long((i)));
- if(i==messages){
-
call.setProperty(Constants.ClientProperties.LAST_MESSAGE, new Boolean(true));
- }
- String msg = "Ping Message Number " + i;
- call.invoke(new Object[]{msg});
-
- }
-
- RMInitiator.stopClient();
-
- } catch (Exception e) {
- e.printStackTrace();
- }
+ String from = bean.getFrom();
+ String replyTo = bean.getReplyto();
+ String acksTo = bean.getAcksTo();
+ String acks = bean.getAcks();
+ String terminate = bean.getTerminate();
+ String operation = bean.getOperation();
+ int messages = bean.getNoOfMsgs();
+
+ if (replyTo != null && replyTo.equalsIgnoreCase("anonymous"))
+ replyTo = AddressingUtils.getAnonymousRoleURI();
+
+ if (from != null && from.equalsIgnoreCase("anonymous"))
+ from = AddressingUtils.getAnonymousRoleURI();
+
+ if (acksTo != null && acksTo.equalsIgnoreCase("anonymous"))
+ acksTo = AddressingUtils.getAnonymousRoleURI();
+
+ try {
+ boolean sync = false;
+ if (acksTo.equals(AddressingUtils.getAnonymousRoleURI())) {
+ sync = true;
+ }
+ System.out.println("=========== RUNNING THE \"Ping\" INTEROP
TEST ==========");
+
+ RMInitiator.initClient(sync);
+
+ Service service = new Service();
+ Call call = (Call) service.createCall();
+
+ call.setProperty(Constants.ClientProperties.SYNC, new
Boolean(sync));
+ call.setProperty(Constants.ClientProperties.ACTION,
"urn:wsrm:Ping");
+ call.setProperty(Constants.ClientProperties.ACKS_TO, acksTo);
+
+ if (from != null && from != "")
+ call.setProperty(Constants.ClientProperties.FROM, from);
+
+ if (replyTo != null && replyTo != "")
+ call.setProperty(Constants.ClientProperties.REPLY_TO,
replyTo);
+
+ call.setTargetEndpointAddress(target);
+ call.setOperationName(new QName("http://tempuri.org";, "Ping"));
+ call.setTransport(new RMTransport(target, ""));
+
+ call.addParameter("Text", XMLType.XSD_STRING, ParameterMode.IN);
+
+ for (int i = 1; i <= messages; i++) {
+ call.setProperty(Constants.ClientProperties.MSG_NUMBER, new
Long((i)));
+ if (i == messages) {
+
call.setProperty(Constants.ClientProperties.LAST_MESSAGE, new Boolean(true));
+ }
+ String msg = "Sandesha Ping Message Number " + i;
+ call.invoke(new Object[]{msg});
+ }
+
+ RMInitiator.stopClient();
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
-
- public void runEcho(InteropBean bean){
-
+
+ public void runEcho(InteropBean bean) {
+
String target = bean.getTarget();
- String from = bean.getFrom();
- String replyTo = bean.getReplyto();
- String acksTo = bean.getAcksTo();
- String acks = bean.getAcks();
- String terminate = bean.getTerminate();
- String operation = bean.getOperation();
- int messages = bean.getNoOfMsgs();
-
- if(replyTo!=null && replyTo.equalsIgnoreCase("anonymous"))
- replyTo = AddressingUtils.getAnonymousRoleURI();
-
- if(from!=null && from.equalsIgnoreCase("anonymous"))
- from = AddressingUtils.getAnonymousRoleURI();
-
- if(acksTo!=null && acksTo.equalsIgnoreCase("anonymous"))
- acksTo = AddressingUtils.getAnonymousRoleURI();
-
-
- String seq=new Long(System.currentTimeMillis()).toString();
-
- try {
- boolean sync = false;
-
- System.out.println("********Running echo 1**********");
-
- RMInitiator.initClient(sync);
-
- Service service = new Service();
- Call call = (Call) service.createCall();
-
- System.out.println("Echo sync:" + sync);
- call.setProperty(Constants.ClientProperties.SYNC, new
Boolean(sync));
-
- call.setProperty(Constants.ClientProperties.ACTION,
"urn:wsrm:echoString");
-
-
- //these three properties are optional. If not set they
will be set depending on sync.
-
call.setProperty(Constants.ClientProperties.ACKS_TO,acksTo);
-
- if(from!=null && from!="")
-
call.setProperty(Constants.ClientProperties.FROM,from);
-
- if(replyTo!=null && replyTo!="")
-
call.setProperty(Constants.ClientProperties.REPLY_TO,replyTo);
-
- System.out.println("reply to is :" + replyTo);
- call.setTargetEndpointAddress(target);
- call.setOperationName(new QName("RMInteropService",
operation));
- call.setTransport(new RMTransport(target, ""));
-
- call.addParameter("arg1", XMLType.XSD_STRING, ParameterMode.IN);
- call.addParameter("arg2", XMLType.XSD_STRING, ParameterMode.IN);
+ String from = bean.getFrom();
+ String replyTo = bean.getReplyto();
+ String acksTo = bean.getAcksTo();
+ String acks = bean.getAcks();
+ String terminate = bean.getTerminate();
+ String operation = bean.getOperation();
+ boolean sendOffer = bean.isSendOffer();
+
+ int messages = bean.getNoOfMsgs();
+
+ if (replyTo != null && replyTo.equalsIgnoreCase("anonymous"))
+ replyTo = AddressingUtils.getAnonymousRoleURI();
+
+ if (from != null && from.equalsIgnoreCase("anonymous"))
+ from = AddressingUtils.getAnonymousRoleURI();
+
+ if (acksTo != null && acksTo.equalsIgnoreCase("anonymous"))
+ acksTo = AddressingUtils.getAnonymousRoleURI();
+
+ String seq = new Long(System.currentTimeMillis()).toString();
+
+ try {
+ boolean sync = false;
+ if (acksTo.equalsIgnoreCase("anonymous"))
+ sync = true;
+
+ System.out.println("=========== RUNNING THE \"echoString\"
INTEROP TEST ==========");
+
+ //We start the listener to be in the safe side.
+ //User may specify some external(not in sandesha endpoint)
replyTo address, then
+ //he/she will not be able to retrieve the responses to this
client, yet they can verify
+ //the reliablility of the sent messages.
+ RMInitiator.initClient(false);
+
+ Service service = new Service();
+ Call call = (Call) service.createCall();
+
+ System.out.println("Echo sync:" + sync);
+ call.setProperty(Constants.ClientProperties.SYNC, new
Boolean(sync));
+ call.setProperty(Constants.ClientProperties.ACTION,
"urn:wsrm:echoString");
+ call.setProperty(Constants.ClientProperties.ACKS_TO, acksTo);
+
+ if (from != null && from != "")
+ call.setProperty(Constants.ClientProperties.FROM, from);
+
+ if (replyTo != null && replyTo != "")
+ call.setProperty(Constants.ClientProperties.REPLY_TO,
replyTo);
+
+ if (sendOffer) {
+ call.setProperty(Constants.ClientProperties.SEND_OFFER, new
Boolean(true));
+ }
+
+ call.setTargetEndpointAddress(target);
+ call.setOperationName(new QName("http://tempuri.org/";,
"echoString"));
+ call.setTransport(new RMTransport(target, ""));
+
+ call.addParameter("Text", XMLType.XSD_STRING, ParameterMode.IN);
+ call.addParameter("Sequence", XMLType.XSD_STRING,
ParameterMode.IN);
call.setReturnType(org.apache.axis.encoding.XMLType.XSD_STRING);
- for(int i=1;i<=messages;i++){
-
call.setProperty(Constants.ClientProperties.MSG_NUMBER, new Long((i)));
- String msg = "ECHO " + i;
-
-
- if(i==messages){
-
call.setProperty(Constants.ClientProperties.LAST_MESSAGE, new Boolean(true));
- }
-
- String ret = (String) call.invoke(new
Object[]{msg,seq});
- System.out.println("Got response from server "
+ ret);
- }
+ for (int i = 1; i <= messages; i++) {
+ call.setProperty(Constants.ClientProperties.MSG_NUMBER, new
Long((i)));
+ String msg = "Sandesha Echo String " + i;
+
+ if (i == messages) {
+
call.setProperty(Constants.ClientProperties.LAST_MESSAGE, new Boolean(true));
+ }
+
+ String ret = (String) call.invoke(new Object[]{msg, seq});
+ System.out.println("Got response from server " + ret);
+ }
RMInitiator.stopClient();
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
-
}
1.6 +32 -38 ws-fx/sandesha/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 16 Mar 2005 04:22:45 -0000 1.5
+++ maven.xml 16 May 2005 13:09:18 -0000 1.6
@@ -2,58 +2,52 @@
<!-- $Revision$ $Date$ -->
-<project default="jar"
- xmlns:j="jelly:core"
- xmlns:maven="jelly:maven"
- xmlns:deploy="deploy"
- xmlns:ant="jelly:ant">
+<project default="jar" xmlns:j="jelly:core" xmlns:maven="jelly:maven"
xmlns:deploy="deploy" xmlns:ant="jelly:ant">
<goal name="setclasspath">
<path id="test.classpath">
<path refid="maven.dependency.classpath"/>
</path>
</goal>
-
- <preGoal name="java:compile">
- <copy file="config/sandesha.properties"
todir="${maven.build.dir}/classes"/>
- <copy file="config/log4j.properties"
todir="${maven.build.dir}/classes"/>
- <copy file="config/commons-logging.properties"
todir="${maven.build.dir}/classes"/>
- <copy file="config/WSRMPolicy.xml" todir="${maven.build.dir}/classes"/>
- </preGoal>
-
- <preGoal name="interop:compile">
- <copy file="config/sandesha.properties"
todir="${maven.build.dir}/classes"/>
- <copy file="config/log4j.properties"
todir="${maven.build.dir}/classes"/>
- <copy file="config/commons-logging.properties"
todir="${maven.build.dir}/classes"/>
- <copy file="config/WSRMPolicy.xml" todir="${maven.build.dir}/classes"/>
- </preGoal>
+
+ <preGoal name="java:compile">
+ <copy file="config/sandesha.properties"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/log4j.properties"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/commons-logging.properties"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/WSRMPolicy.xml"
todir="${maven.build.dir}/classes"/>
+ </preGoal>
<postGoal name="jar">
<ant:mkdir dir="${basedir}/target/lib"/>
<deploy:copy-deps todir="${basedir}/target/lib"/>
<copy file="lib/xerces.jar" todir="${basedir}/target/lib"/>
</postGoal>
-
- <preGoal name="interop:compile">
- <ant:mkdir dir="${basedir}/target/interop-classes"/>
+
+ <preGoal name="interop.jar">
+ <copy file="config/sandesha.properties"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/client-config.wsdd"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/server-config.wsdd"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/log4j.properties"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/commons-logging.properties"
todir="${maven.build.dir}/classes"/>
+ <copy file="config/WSRMPolicy.xml"
todir="${maven.build.dir}/classes"/>
+ <ant:javac srcdir="interop" destdir="${maven.build.dir}/classes"
includes="**/*.java" debug="${maven.compile.debug}" optimize="${optimize}"
deprecation="${maven.compile.deprecation}">
+ <classpath>
+ <pathelement location="${maven.build.dest}"/>
+ <path refid="maven.dependency.classpath"/>
+ </classpath>
+ </ant:javac>
</preGoal>
- <goal name="interop:compile" prereqs="java:compile">
- <ant:javac srcdir="interop"
destdir="${maven.build.dir}/interop-classes" includes="**/*.java"
- debug="${maven.compile.debug}"
- optimize="${optimize}"
- deprecation="${maven.compile.deprecation}">
- <classpath>
- <pathelement location="${maven.build.dest}"/>
- <path refid="maven.dependency.classpath"/>
- </classpath>
- </ant:javac>
+ <!-- to transforme htmls to xdocs -->
+ <preGoal name="xdoc:jelly-transform">
+ <attainGoal name="html2xdoc"/>
+ </preGoal>
+
+ <goal name="interop.jar" prereqs="java:compile">
+ <ant:property name="sandesha.jar.name" value="sandesha-interop.jar"/>
+ <ant:mkdir dir="${basedir}/dist/jar"/>
+ <ant:jar basedir="${maven.build.dir}/classes"
destfile="${sandesha.jar.name}"/>
</goal>
- <!-- to transforme htmls to xdocs -->
- <preGoal name="xdoc:jelly-transform">
- <attainGoal name="html2xdoc"/>
- </preGoal>
-
</project>
1.38 +10 -1
ws-fx/sandesha/src/org/apache/sandesha/EnvelopeCreator.java
Index: EnvelopeCreator.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/EnvelopeCreator.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- EnvelopeCreator.java 16 May 2005 06:08:17 -0000 1.37
+++ EnvelopeCreator.java 16 May 2005 13:09:18 -0000 1.38
@@ -209,8 +209,17 @@
seq.setLastMessage(new LastMessage());
}
+
+
seq.toSoapEnvelop(responseEnvelope);
+ if (rmMessageContext.getReTransmissionCount() > 0) {
+ AckRequested ackReq = new AckRequested();
+ ackReq.setIdentifier(seqId);
+ ackReq.toSoapEnvelop(responseEnvelope);
+ }
+
+
//TODO
//Adding relatesTo header
//List relatesToList = addressingHeaders.getRelatesTo();
@@ -278,7 +287,7 @@
id.setIdentifier(rmMessageContext.getSequenceID());
seq.setIdentifier(id);
- if (rmMessageContext.getReTransmissionCount() != 0) {
+ if (rmMessageContext.getReTransmissionCount() > 0) {
AckRequested ackReq = new AckRequested();
ackReq.setIdentifier(id);
rmHeaders.setAckRequest(ackReq);
1.18 +4 -9 ws-fx/sandesha/src/org/apache/sandesha/RMInitiator.java
Index: RMInitiator.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/RMInitiator.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RMInitiator.java 16 May 2005 06:08:17 -0000 1.17
+++ RMInitiator.java 16 May 2005 13:09:18 -0000 1.18
@@ -104,7 +104,7 @@
}
}
- public static RMStatus stopClient() throws AxisFault{
+ public static RMStatus stopClient() throws AxisFault {
//This should check whether we have received all the acks or
reponses if any
IStorageManager storageManager = new ClientStorageManager();
storageManager.isAllSequenceComplete();
@@ -122,20 +122,15 @@
}
}
+
if (listenerStarted) {
sas.stop();
-
-
- //FOR JSP
- listenerStarted = false;
- //END JSP
listenerStarted = false;
}
sender.setRunning(false);
-
- //FOR JSP
senderStarted = false;
- //END JSP
+
+ storageManager.clearStorage();
return new RMStatus();
}
1.42 +2 -3
ws-fx/sandesha/src/org/apache/sandesha/client/RMSender.java
Index: RMSender.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/RMSender.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- RMSender.java 16 May 2005 06:08:17 -0000 1.41
+++ RMSender.java 16 May 2005 13:09:18 -0000 1.42
@@ -129,12 +129,11 @@
boolean sync) throws
Exception {
String msgID = Constants.UUID + uuidGen.nextUUID();
String offerID = null;
- if (reqRMMsgContext.isHasResponse()) {
+ if (reqRMMsgContext.isHasResponse() &&
reqRMMsgContext.isSendOffer()) {
offerID = Constants.UUID + uuidGen.nextUUID();
storageManager.addRequestedSequence(offerID);
storageManager.addOffer(msgID, offerID);
-
- }
+ }
RMMessageContext createSeqRMMsgContext =
RMMessageCreator.createCreateSeqMsg(
reqRMMsgContext, Constants.CLIENT, msgID, offerID);
1.7 +1 -2
ws-fx/sandesha/test/org/apache/sandesha/SimpleServerImpl.java
Index: SimpleServerImpl.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/test/org/apache/sandesha/SimpleServerImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleServerImpl.java 14 May 2005 06:52:31 -0000 1.6
+++ SimpleServerImpl.java 16 May 2005 13:09:18 -0000 1.7
@@ -11,8 +11,7 @@
try {
SimpleAxisServer sas = new SimpleAxisServer();
- //sas.setServerSocket(new
ServerSocket(PropertyLoader.getSimpleAxisServerPort()));
- sas.setServerSocket(new ServerSocket(7070));
+ sas.setServerSocket(new
ServerSocket(PropertyLoader.getSimpleAxisServerPort()));
Thread serverThread = new Thread(sas);
serverThread.start();
} catch (Exception e) {
