jaliya 2005/02/22 05:49:03
Modified: sandesha/src/org/apache/sandesha EnvelopeCreator.java
RMInitiator.java
sandesha/src/org/apache/sandesha/client
ClientPropertyValidator.java
sandesha/src/org/apache/sandesha/server/msgprocessors
CreateSequenceProcessor.java
Log:
Modifed after inter-op test with IBM
Revision Changes Path
1.18 +1 -4
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- EnvelopeCreator.java 21 Feb 2005 12:08:21 -0000 1.17
+++ EnvelopeCreator.java 22 Feb 2005 13:49:02 -0000 1.18
@@ -426,10 +426,6 @@
AddressingHeaders outGoingAddressingHaders = new
AddressingHeaders(terSeqEnv);
Identifier seqId = new Identifier();
seqId.setIdentifier(rmMessageContext.getSequenceID());
- Sequence seq = new Sequence();
- seq.setIdentifier(seqId);
- seq.toSoapEnvelop(terSeqEnv);
-
Action terSeqAction = new Action(new
URI(Constants.ACTION_TERMINATE_SEQUENCE));
outGoingAddressingHaders.setAction(terSeqAction);
@@ -445,6 +441,7 @@
TerminateSequence terSeq = new TerminateSequence();
+ terSeq.setIdentifier(seqId);
terSeq.toSoapEnvelop(terSeqEnv);
1.3 +36 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RMInitiator.java 16 Feb 2005 04:21:20 -0000 1.2
+++ RMInitiator.java 22 Feb 2005 13:49:02 -0000 1.3
@@ -18,6 +18,8 @@
import org.apache.axis.Handler;
import org.apache.axis.SimpleChain;
+import org.apache.axis.deployment.wsdd.WSDDDocument;
+import org.apache.axis.deployment.wsdd.WSDDDeployment;
import org.apache.axis.configuration.SimpleProvider;
import org.apache.axis.description.JavaServiceDesc;
import org.apache.axis.handlers.soap.SOAPService;
@@ -29,8 +31,13 @@
import org.apache.sandesha.server.ServerStorageManager;
import org.apache.sandesha.ws.rm.handlers.RMServerRequestHandler;
import org.apache.sandesha.ws.rm.providers.RMProvider;
+import org.w3c.dom.Document;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.namespace.QName;
import java.io.IOException;
+import java.io.File;
import java.net.ServerSocket;
/**
@@ -89,6 +96,34 @@
}
private static void startListener() {
+ /*
+ try {
+ SimpleAxisServer sas = new SimpleAxisServer();
+ DocumentBuilderFactory dbf =
DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ DocumentBuilder db = dbf.newDocumentBuilder();
+
+ //Need to change the path
+ Document doc = db.parse(new File("config\\listener-config.wsdd"));
+
//"C:/SandeshaPrj/SandeshaIMPL/PrjWorkspace/bin/server-config.wsdd"));
+ WSDDDocument wsdddoc = new WSDDDocument(doc);
+ WSDDDeployment wsdddep = wsdddoc.getDeployment();
+ sas.setMyConfig(wsdddep);
+ //Set the port 9090 to the SimpleAxisServer.
+
+ sas.getMyConfig().getServiceByNamespaceURI("RMService");
+
+
+ sas.setServerSocket(new ServerSocket(9090));
+ Thread serverThread = new Thread(sas);
+ serverThread.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ */
+
+
sas = new SimpleAxisServer();
try {
SimpleProvider sp = new SimpleProvider();
@@ -135,7 +170,7 @@
} catch (IOException ex) {
ex.printStackTrace();
}
-
+
}
}
\ No newline at end of file
1.9 +2 -0
ws-fx/sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java
Index: ClientPropertyValidator.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ClientPropertyValidator.java 21 Feb 2005 12:08:21 -0000 1.8
+++ ClientPropertyValidator.java 22 Feb 2005 13:49:03 -0000 1.9
@@ -134,6 +134,8 @@
sourceURI = "http://"; + addr.getHostAddress() + ":" +
Constants.SOURCE_ADDRESS_PORT
+ "/axis/services/RMService";
+ //sourceURI="http://192.248.18.51:8080/axis/services/RMService";;
+
return sourceURI;
}
1.6 +13 -0
ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/CreateSequenceProcessor.java
Index: CreateSequenceProcessor.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/CreateSequenceProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CreateSequenceProcessor.java 20 Feb 2005 08:49:45 -0000 1.5
+++ CreateSequenceProcessor.java 22 Feb 2005 13:49:03 -0000 1.6
@@ -40,9 +40,22 @@
}
public boolean processMessage(RMMessageContext rmMessageContext) throws
AxisFault {
+
+
+
AddressingHeaders addrHeaders =
rmMessageContext.getAddressingHeaders();
RMHeaders rmHeaders = rmMessageContext.getRMHeaders();
+
+
+ AcknowledgementProcessor ackProcessor = new
AcknowledgementProcessor(this.storageManager);
+ if (rmHeaders.getSequenceAcknowledgement() != null) {
+ ackProcessor.processMessage(rmMessageContext);
+ }
+
+
+
+
if (addrHeaders.getReplyTo() == null)
rmMessageContext.setSync(true);
else
