jaliya 2005/05/02 01:38:09
Modified: sandesha/src/org/apache/sandesha EnvelopeCreator.java
sandesha/src/org/apache/sandesha/server Sender.java
sandesha/src/org/apache/sandesha/util RMMessageCreator.java
sandesha/src/org/apache/sandesha/ws/rm AcksTo.java
RMHeaders.java
Log:
Made some changes by testing interops
Revision Changes Path
1.33 +1 -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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- EnvelopeCreator.java 2 May 2005 04:40:49 -0000 1.32
+++ EnvelopeCreator.java 2 May 2005 08:38:09 -0000 1.33
@@ -296,7 +296,7 @@
//Setting from the Client
outGoingAddressingHaders.setFrom(addressingHeaders.getFrom());
outGoingAddressingHaders.setTo(addressingHeaders.getTo());
- if (addressingHeaders.getReplyTo() != null)
+ if (addressingHeaders.getReplyTo() != null &&
rmMessageContext.isHasResponse())
outGoingAddressingHaders.setReplyTo(addressingHeaders.getReplyTo());
try {
Action action = new Action(new
URI(rmMessageContext.getAction()));
1.36 +1 -0 ws-fx/sandesha/src/org/apache/sandesha/server/Sender.java
Index: Sender.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/Sender.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Sender.java 2 May 2005 04:17:09 -0000 1.35
+++ Sender.java 2 May 2005 08:38:09 -0000 1.36
@@ -262,6 +262,7 @@
SOAPEnvelope requestEnvelope = null;
//Need to create the response envelope.
+
requestEnvelope =
EnvelopeCreator.createServiceRequestEnvelope(rmMessageContext);
rmMessageContext.getMsgContext().setRequestMessage(new
Message(requestEnvelope));
rmMessageContext.setLastPrecessedTime(System.currentTimeMillis());
1.13 +13 -8
ws-fx/sandesha/src/org/apache/sandesha/util/RMMessageCreator.java
Index: RMMessageCreator.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/util/RMMessageCreator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RMMessageCreator.java 2 May 2005 04:17:09 -0000 1.12
+++ RMMessageCreator.java 2 May 2005 08:38:09 -0000 1.13
@@ -85,9 +85,12 @@
if (endPoint == Constants.CLIENT) {
csAddrHeaders.setTo(addrHeaders.getTo());
csAddrHeaders.setFaultTo(addrHeaders.getFaultTo());
+ csAddrHeaders.setReplyTo(addrHeaders.getReplyTo());
+ csAddrHeaders.setFrom(addrHeaders.getFrom());
} else {
csAddrHeaders.setTo(new
To(addrHeaders.getReplyTo().getAddress().toString()));
csAddrHeaders.setFaultTo(new FaultTo(new
Address(rmMsgCtx.getAddressingHeaders().getTo().toString())));
+ csAddrHeaders.setFrom(new From(new
Address(rmMsgCtx.getAddressingHeaders().getTo().toString())));
}
csAddrHeaders.setAction(new Action(new
URI(Constants.WSRM.ACTION_CREATE_SEQUENCE)));
@@ -209,18 +212,20 @@
//Need to use the anonymous_URI if the client is synchronous.
if (!sync) {
if (fromURL != null) {
- from = new From(new Address(fromURL));
+ from = new From(new Address(fromURL));
} else {
from = new From(new
Address(rmMsgContext.getSourceURL()));
}
addrHeaders.setFrom(from);
- if (replyToURL != null) {
- replyTo = new ReplyTo(new Address(replyToURL));
- addrHeaders.setReplyTo(replyTo);
- } else {
- replyTo = new ReplyTo(new
Address(rmMsgContext.getSourceURL()));
- addrHeaders.setReplyTo(replyTo);
- }
+ // if (rmMsgContext.isHasResponse()) {
+ if (replyToURL != null) {
+ replyTo = new ReplyTo(new Address(replyToURL));
+ addrHeaders.setReplyTo(replyTo);
+ } else {
+ replyTo = new ReplyTo(new
Address(rmMsgContext.getSourceURL()));
+ addrHeaders.setReplyTo(replyTo);
+ }
+ // }
} else {
if (fromURL != null) {
1.3 +1 -1 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/AcksTo.java
Index: AcksTo.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/AcksTo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AcksTo.java 12 Apr 2005 02:15:33 -0000 1.2
+++ AcksTo.java 2 May 2005 08:38:09 -0000 1.3
@@ -72,7 +72,7 @@
*/
public MessageElement toSOAPEnvelope(MessageElement msgElement) throws
SOAPException {
MessageElement messageElement = new MessageElement("",
Constants.WSRM.NS_PREFIX_RM, Constants.WSRM.NS_URI_RM);
- messageElement.setName("AcksTo");
+ messageElement.setName(Constants.WSRM.ACKS_TO);
address.append(messageElement);
msgElement.addChildElement(messageElement);
return msgElement;
1.16 +3 -8
ws-fx/sandesha/src/org/apache/sandesha/ws/rm/RMHeaders.java
Index: RMHeaders.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/RMHeaders.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RMHeaders.java 11 Apr 2005 02:58:55 -0000 1.15
+++ RMHeaders.java 2 May 2005 08:38:09 -0000 1.16
@@ -79,23 +79,18 @@
if (createSequence != null) {
createSequence.toSoapEnvelop(env);
}
-
if (createSequenceResponse != null) {
createSequenceResponse.toSoapEnvelop(env);
}
-
- if (ackRequest != null) {
- ackRequest.toSoapEnvelop(env);
- }
-
if (sequenceAcknowledgement != null) {
sequenceAcknowledgement.toSoapEnvelop(env);
}
-
if (sequence != null) {
sequence.toSoapEnvelop(env);
}
-
+ if (ackRequest != null) {
+ ackRequest.toSoapEnvelop(env);
+ }
if (terminateSequence != null) {
terminateSequence.toSoapEnvelop(env);
}
