You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ja...@apache.org on 2004/10/11 12:57:59 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha/server CreateSequenceProcessor.java AcknowledgementProcessor.java CreateSequenceResponseProcessor.java CompositeProcessor.java
jaliya 2004/10/11 03:57:58
Modified: sandesha/src/org/apache/sandesha/server
CreateSequenceProcessor.java
AcknowledgementProcessor.java
CreateSequenceResponseProcessor.java
CompositeProcessor.java
Log:
Few modifications, Mainly code formatting, The server is working with the existing client
Revision Changes Path
1.9 +15 -22 ws-fx/sandesha/src/org/apache/sandesha/server/CreateSequenceProcessor.java
Index: CreateSequenceProcessor.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/CreateSequenceProcessor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CreateSequenceProcessor.java 9 Oct 2004 08:50:23 -0000 1.8
+++ CreateSequenceProcessor.java 11 Oct 2004 10:57:58 -0000 1.9
@@ -49,14 +49,13 @@
if (addrHeaders.getReplyTo() != null) {
/*
- * We should let the user to decide on the UUID generation process.
- * If the user specify a method or service for generating UUIDs then
+ * We may let the user to decide on the UUID generation process. If
+ * the user specify a method or service for generating UUIDs then
* this request will be used to invoke that service and a UUID is
* acquired. However if we want to do it, the user shoudl specify
* the provider for that service as an parameter in the RM
- * Configuration.
- *
- * Currently the RMProvider will send create sequence responses.
+ * Configuration. Currently the RMProvider will send create sequence
+ * responses.
*/
UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
String uuid = uuidGen.nextUUID();
@@ -70,33 +69,27 @@
.createCreateSequenceResponseEnvelope(uuid,
rmMessageContext);
- //MessageContext msgContext= rmMessageContext.getMsgContext();
- //msgContext.setResponseMessage(new Message(resEnvelope));
- //rmMessageContext.setMsgContext(msgContext);
-
//Set the message type.
rmMessageContext
.setMessageType(org.apache.sandesha.Constants.MSG_TYPE_CREATE_SEQUENCE_RESPONSE);
-
+
//FIX THIS FIX THIS
//Need to change the ANONYMOUS URI to the new one after completion.
//We have some synchronous stuff here
-
-
- if((addrHeaders.getReplyTo().getAddress().toString().equals(
- "http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous"))||(addrHeaders.getReplyTo().getAddress().toString().equals(Constants.NS_URI_ANONYMOUS))){
-
- //Inform that we have a synchronous response.
-
-
- rmMessageContext.getMsgContext().setResponseMessage(
+
+ if ((addrHeaders.getReplyTo().getAddress().toString()
+ .equals("http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous"))
+ || (addrHeaders.getReplyTo().getAddress().toString()
+ .equals(Constants.NS_URI_ANONYMOUS))) {
+
+ //Inform that we have a synchronous response.
+ rmMessageContext.getMsgContext().setResponseMessage(
new Message(resEnvelope));
return true;
} else {
//FIX THIS FIX THIS
//This should be storageManger.addCreateSequenceResponse();
-
-
+
MessageContext msgContext = new MessageContext(rmMessageContext
.getMsgContext().getAxisEngine());
msgContext.setResponseMessage(new Message(resEnvelope));
@@ -109,7 +102,7 @@
}
} else {
- throw new RMException("replyTo cannot be null!");
+ throw new RMException("REPLY TO CANNOT BE NULL!");
}
}
1.9 +6 -8 ws-fx/sandesha/src/org/apache/sandesha/server/AcknowledgementProcessor.java
Index: AcknowledgementProcessor.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/AcknowledgementProcessor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AcknowledgementProcessor.java 9 Oct 2004 08:50:23 -0000 1.8
+++ AcknowledgementProcessor.java 11 Oct 2004 10:57:58 -0000 1.9
@@ -43,7 +43,6 @@
}
public boolean processMessage(RMMessageContext rmMessageContext) {
-
SequenceAcknowledgement seqAcknowledgement = rmMessageContext
.getRMHeaders().getSequenceAcknowledgement();
String seqID = seqAcknowledgement.getIdentifier().getIdentifier();
@@ -54,7 +53,6 @@
AcknowledgementRange ackRange = (AcknowledgementRange) ite.next();
long msgNumber = ackRange.getMaxValue();
while (ackRange.getMaxValue() >= msgNumber) {
-
storageManger.setAcknowledged(seqID, msgNumber);
//storageManager.setAcknowledged(String seqID,long msgNumber)
msgNumber++;
@@ -88,7 +86,6 @@
ackRange.setMaxValue(messageNumber);
ackRange.setMinValue(messageNumber);
ackRangeVector.add(ackRange);
-
}
SOAPEnvelope ackEnvelope = EnvelopeCreator
@@ -123,13 +120,15 @@
e.printStackTrace();
//TODO: Log the error
}
-
+
//FIX THIS FIX THIS //FIX THIS FIX THIS //FIX THIS FIX THIS
//Need to change this to the new Anonymous URI.
if (((rmMessageContext.getAddressingHeaders().getFrom().getAddress()
.toString()
- .equals(org.apache.axis.message.addressing.Constants.NS_URI_ANONYMOUS)) == true)||(rmMessageContext.getAddressingHeaders().getFrom().getAddress()
- .toString().equals("http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous"))) {
+ .equals(org.apache.axis.message.addressing.Constants.NS_URI_ANONYMOUS)) == true)
+ || (rmMessageContext.getAddressingHeaders().getFrom()
+ .getAddress().toString()
+ .equals("http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous"))) {
//Now we have synchronized ack.
//The original message context is used to send the ack
// asynchronously to the client.
@@ -166,7 +165,6 @@
if (size > 1) {
for (long i = 1; i <= size; i++) {
-
if (i + 1 > size) {
found = true;
@@ -188,7 +186,7 @@
ackRange.setMaxValue(max);
ackRange.setMinValue(min);
vec.add(ackRange);
-
+
min = ((Long) listOfMsgNumbers.get(new Long(i + 1)))
.longValue();
}
1.7 +4 -8 ws-fx/sandesha/src/org/apache/sandesha/server/CreateSequenceResponseProcessor.java
Index: CreateSequenceResponseProcessor.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/CreateSequenceResponseProcessor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CreateSequenceResponseProcessor.java 9 Oct 2004 08:50:23 -0000 1.6
+++ CreateSequenceResponseProcessor.java 11 Oct 2004 10:57:58 -0000 1.7
@@ -44,14 +44,10 @@
RelatesTo relatesTo = (RelatesTo) rmMessageContext
.getAddressingHeaders().getRelatesTo().get(0);
String sequenceID = createSeqRes.getIdentifier().toString();
-
-
- storageManager.setApprovedOutSequence(relatesTo.getURI().toString(),sequenceID);
-
- //Delete the CreateSequence request message in the create sequence
- // request queue.
- //storageManager..removeCreateSequenceRequest(messageID);
-
+ //Approve the sequences. Now we can start sending the messages using
+ // that sequence.
+ storageManager.setApprovedOutSequence(relatesTo.getURI().toString(),
+ sequenceID);
//No response to this message.
return false;
}
1.7 +5 -6 ws-fx/sandesha/src/org/apache/sandesha/server/CompositeProcessor.java
Index: CompositeProcessor.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/CompositeProcessor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CompositeProcessor.java 9 Oct 2004 08:50:23 -0000 1.6
+++ CompositeProcessor.java 11 Oct 2004 10:57:58 -0000 1.7
@@ -38,13 +38,13 @@
//if the message is and Ack then process the ack
//if the message has a body then insert it to the inqueue
-
+
RMHeaders rmHeaders = rmMessageContext.getRMHeaders();
AcknowledgementProcessor ackProcessor = new AcknowledgementProcessor(
this.storageManger);
if (rmHeaders.getSequenceAcknowledgement() != null) {
-
+
ackProcessor.processMessage(rmMessageContext);
}
@@ -80,10 +80,10 @@
// context.
msgContext.setRequestMessage(reqMsg);
msgContext.setResponseMessage(resMsg);
-
+
rmMsgContext.setReqEnv(reqMsg.getSOAPEnvelope());
rmMsgContext.setResEnv(resMsg.getSOAPEnvelope());
-
+
rmMsgContext.setMsgContext(msgContext);
//Set the message type for this message.
rmMsgContext
@@ -96,14 +96,13 @@
System.out.println("INSERT THE REQUEST MESSAGE.....\n");
//Insert the message to the INQUEUE
storageManger.insertRequestMessage(rmMsgContext);
-
}
//Send an Ack for every message received by the server.
//This should be changed according to the WS-policy.
return ackProcessor.sendAcknowledgement(rmMessageContext);
}
-
+
return false;
}