jaliya 2005/04/25 21:36:25
Modified: sandesha/src/org/apache/sandesha/server/msgprocessors
AcknowledgementProcessor.java
CreateSequenceProcessor.java
Log:
Fix the problem with WS-Addressing ANONYMOUSE URI
Revision Changes Path
1.8 +1 -1
ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java
Index: AcknowledgementProcessor.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AcknowledgementProcessor.java 12 Apr 2005 02:15:33 -0000 1.7
+++ AcknowledgementProcessor.java 26 Apr 2005 04:36:25 -0000 1.8
@@ -90,7 +90,7 @@
RMMessageContext rmMsgContext = getAckRMMsgCtx(rmMessageContext,
ackRangeVector);
if (true ==
(rmMessageContext.getAddressingHeaders().getFrom().getAddress().toString()
-
.equals(org.apache.axis.message.addressing.Constants.NS_URI_ADDRESSING_DEFAULT)))
{
+ .equals(Constants.WSA.NS_ADDRESSING_ANONYMOUS))) {
// ||
("http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous".equals(rmMessageContext.getAddressingHeaders().getFrom()
// .getAddress().toString()))) {
//Now we have synchronized ack.
1.12 +3 -12
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CreateSequenceProcessor.java 12 Apr 2005 02:15:33 -0000 1.11
+++ CreateSequenceProcessor.java 26 Apr 2005 04:36:25 -0000 1.12
@@ -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.axis.message.addressing.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,15 +51,6 @@
if (rmHeaders.getSequenceAcknowledgement() != null) {
ackProcessor.processMessage(rmMessageContext);
}
-
-
- if (addrHeaders.getReplyTo() == null)
- rmMessageContext.setSync(true);
- else
- rmMessageContext.setSync(false);
-
- //TODO This should be sent by looking at the offer and the rest
-
//wsrm:CreateSequenceRefused
if (rmHeaders.getCreateSequence() == null)
@@ -101,7 +92,7 @@
rmMessageContext.setMessageType(org.apache.sandesha.Constants.MSG_TYPE_CREATE_SEQUENCE_RESPONSE);
if ((createSeq.getAcksTo() != null)) {
- if
((createSeq.getAcksTo().getAddress().toString().equals(Constants.NS_URI_ADDRESSING_DEFAULT)))
{
+ if
((createSeq.getAcksTo().getAddress().toString().equals(Constants.WSA.NS_ADDRESSING_ANONYMOUS)))
{
rmMessageContext.getMsgContext().setResponseMessage(new
Message(resEnvelope));
rmMessageContext.setSync(true);
return true;
@@ -116,7 +107,7 @@
return false;
}
} else if (addrHeaders.getReplyTo() == null ||
addrHeaders.getReplyTo().getAddress().toString()
- .equals(Constants.NS_URI_ADDRESSING_DEFAULT)) {
+ .equals(Constants.WSA.NS_ADDRESSING_ANONYMOUS)) {
//Inform that we have a synchronous response.
rmMessageContext.getMsgContext().setResponseMessage(new
Message(resEnvelope));
rmMessageContext.setSync(true);
