jaliya 2005/04/26 03:50:02
Modified: sandesha/interop/org/apache/sandesha/samples/interop
AsyncPingClient.java
sandesha/src/org/apache/sandesha/server/msgprocessors
CreateSequenceProcessor.java
Log:
fix the problem with anonymous URI
Revision Changes Path
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AsyncPingClient.java 11 Apr 2005 02:58:54 -0000 1.5
+++ AsyncPingClient.java 26 Apr 2005 10:50:02 -0000 1.6
@@ -51,7 +51,7 @@
//call.setProperty("replyTo","http://127.0.0.1:"+defaultClientPort+"/axis/services/RMService";);
//<wsrm:AcksTo> is used, if the user needs the CreateSequence
response or the faults related to
//that to be sent to a specific endpoint.
-
//call.setProperty("acksTo","http://127.0.0.1:"+defaultClientPort+"/axis/services/RMService";);
+
call.setProperty("acksTo","http://127.0.0.1:"+defaultClientPort+"/axis/services/RMService";);
//http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous
call.setTargetEndpointAddress(targetURL);
1.13 +37 -7
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CreateSequenceProcessor.java 26 Apr 2005 04:36:25 -0000 1.12
+++ CreateSequenceProcessor.java 26 Apr 2005 10:50:02 -0000 1.13
@@ -23,10 +23,10 @@
import org.apache.axis.components.uuid.UUIDGenFactory;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.addressing.AddressingHeaders;
+import org.apache.sandesha.Constants;
import org.apache.sandesha.EnvelopeCreator;
import org.apache.sandesha.IStorageManager;
import org.apache.sandesha.RMMessageContext;
-import org.apache.sandesha.Constants;
import org.apache.sandesha.ws.rm.CreateSequence;
import org.apache.sandesha.ws.rm.RMHeaders;
import org.apache.sandesha.ws.rm.SequenceOffer;
@@ -51,7 +51,7 @@
if (rmHeaders.getSequenceAcknowledgement() != null) {
ackProcessor.processMessage(rmMessageContext);
}
-
+
//wsrm:CreateSequenceRefused
if (rmHeaders.getCreateSequence() == null)
throw new AxisFault();
@@ -82,7 +82,21 @@
}
//END OFFER PROCESSING
-
+
+ if ((createSeq.getAcksTo() != null)) {
+ if
((createSeq.getAcksTo().getAddress().toString().equals(Constants.WSA.NS_ADDRESSING_ANONYMOUS)))
{
+ rmMessageContext.setSync(true);
+ } else {
+ rmMessageContext.setSync(false);
+
rmMessageContext.setOutGoingAddress(createSeq.getAcksTo().getAddress().toString());
+ }
+ } else if (addrHeaders.getReplyTo() == null ||
addrHeaders.getReplyTo().getAddress().toString().equals(Constants.WSA.NS_ADDRESSING_ANONYMOUS))
{
+ rmMessageContext.setSync(true);
+ } else {
+ rmMessageContext.setSync(false);
+
rmMessageContext.setOutGoingAddress(addrHeaders.getReplyTo().getAddress().toString());
+ }
+
SOAPEnvelope resEnvelope = null;
try {
resEnvelope =
EnvelopeCreator.createCreateSequenceResponseEnvelope(uuid, rmMessageContext);
@@ -91,7 +105,22 @@
}
rmMessageContext.setMessageType(org.apache.sandesha.Constants.MSG_TYPE_CREATE_SEQUENCE_RESPONSE);
- if ((createSeq.getAcksTo() != null)) {
+ if (rmMessageContext.getSync()) {
+ rmMessageContext.getMsgContext().setResponseMessage(new
Message(resEnvelope));
+ return true;
+
+ } else {
+ MessageContext msgContext = new
MessageContext(rmMessageContext.getMsgContext().getAxisEngine());
+ msgContext.setResponseMessage(new Message(resEnvelope));
+ rmMessageContext.setMsgContext(msgContext);
+
+ rmMessageContext.setSync(false);
+ storageManager.addCreateSequenceResponse(rmMessageContext);
+ return false;
+ }
+
+
+ /* if ((createSeq.getAcksTo() != null)) {
if
((createSeq.getAcksTo().getAddress().toString().equals(Constants.WSA.NS_ADDRESSING_ANONYMOUS)))
{
rmMessageContext.getMsgContext().setResponseMessage(new
Message(resEnvelope));
rmMessageContext.setSync(true);
@@ -106,7 +135,7 @@
storageManager.addCreateSequenceResponse(rmMessageContext);
return false;
}
- } else if (addrHeaders.getReplyTo() == null ||
addrHeaders.getReplyTo().getAddress().toString()
+ } else if (addrHeaders.getReplyTo() == null ||
addrHeaders.getReplyTo().getAddress().toString()
.equals(Constants.WSA.NS_ADDRESSING_ANONYMOUS)) {
//Inform that we have a synchronous response.
rmMessageContext.getMsgContext().setResponseMessage(new
Message(resEnvelope));
@@ -122,5 +151,6 @@
storageManager.addCreateSequenceResponse(rmMessageContext);
return false;
}
- }
- }
\ No newline at end of file
+ */
+ }
+}
\ No newline at end of file
