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 2005/07/02 13:17:36 UTC
cvs commit: ws-sandesha/src/org/apache/sandesha/util RMMessageCreator.java
jaliya 2005/07/02 04:17:36
Modified: samples build.xml
src/org/apache/sandesha/client RMSender.java
src/org/apache/sandesha/util RMMessageCreator.java
Log:
Added a way to override addressing headers from client
Revision Changes Path
1.4 +4 -4 ws-sandesha/samples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-sandesha/samples/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 11 Jun 2005 08:24:56 -0000 1.3
+++ build.xml 2 Jul 2005 11:17:35 -0000 1.4
@@ -29,10 +29,10 @@
<echo message=" "/>
<echo message="----------------------------------------------------------------------------"/>
<echo message=" Available Targets Are "/>
- <echo message=" ping_sync -->runs interop test for AsyncPing "/>
- <echo message=" ping_async -->runs interop test for SyncPing "/>
- <echo message=" echo_sync_ack -->runs interop test for EchoStirng "/>
- <echo message=" echo_async_ack -->runs interop test for EchoStirng "/>
+ <echo message=" ping_sync -->AsyncPing Sample "/>
+ <echo message=" ping_async -->SyncPing Sample "/>
+ <echo message=" echo_sync_ack -->EchoStirng Sample "/>
+ <echo message=" echo_async_ack -->EchoStirng Sample "/>
<echo message=" clean --> cleans up all generated files and "/>
<echo message=" usage --> provides help on using the build tool (default) "/>
<echo message="----------------------------------------------------------------------------"/>
1.49 +5 -5 ws-sandesha/src/org/apache/sandesha/client/RMSender.java
Index: RMSender.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/client/RMSender.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- RMSender.java 2 Jul 2005 04:59:54 -0000 1.48
+++ RMSender.java 2 Jul 2005 11:17:35 -0000 1.49
@@ -75,7 +75,7 @@
tempSeqID = reqMsgCtx.getSequenceID();
- reqMsgCtx = processFirstRequestMessage(reqMsgCtx, reqMsgCtx.getSync());
+ reqMsgCtx = processRequestMessage(reqMsgCtx, reqMsgCtx.getSync());
if (reqMsgCtx.isHasResponse()) {
RMMessageContext responseMessageContext = null;
@@ -133,7 +133,7 @@
* @return
* @throws Exception
*/
- private RMMessageContext processFirstRequestMessage(RMMessageContext reqRMMsgContext,
+ private RMMessageContext processRequestMessage(RMMessageContext reqRMMsgContext,
boolean sync) throws Exception {
synchronized (lock) {
@@ -153,10 +153,10 @@
createSeqRMMsgContext.setSync(sync);
storageManager.addCreateSequenceRequest(createSeqRMMsgContext);
- processRequestMessage(reqRMMsgContext);
+ processMessage(reqRMMsgContext);
} else {
- processRequestMessage(reqRMMsgContext);
+ processMessage(reqRMMsgContext);
}
}
@@ -165,7 +165,7 @@
return reqRMMsgContext;
}
- private RMMessageContext processRequestMessage(RMMessageContext reqRMMsgContext)
+ private RMMessageContext processMessage(RMMessageContext reqRMMsgContext)
throws Exception {
if (reqRMMsgContext.isLastMessage()) {
storageManager.insertTerminateSeqMessage(RMMessageCreator.createTerminateSeqMsg(reqRMMsgContext, Constants.CLIENT));
1.21 +16 -0 ws-sandesha/src/org/apache/sandesha/util/RMMessageCreator.java
Index: RMMessageCreator.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/util/RMMessageCreator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- RMMessageCreator.java 22 Jun 2005 13:38:12 -0000 1.20
+++ RMMessageCreator.java 2 Jul 2005 11:17:36 -0000 1.21
@@ -199,6 +199,7 @@
}
}
+ setAddressingHeadersSetToMsgCtx(rmMsgCtx,csAddrHeaders);
return csAddrHeaders;
}
@@ -234,9 +235,24 @@
if (rmMsgCtx.isHasResponse() && csAddrHeaders.getReplyTo() == null)
csAddrHeaders.setReplyTo(new EndpointReference(rmMsgCtx.getSourceURL()));
}
+
+ setAddressingHeadersSetToMsgCtx(rmMsgCtx,csAddrHeaders);
+
return csAddrHeaders;
}
+ private static synchronized void setAddressingHeadersSetToMsgCtx(RMMessageContext rmMsgCtx, AddressingHeaders addrHeaders) throws URI.MalformedURIException {
+ if(addrHeaders.getFaultTo() == null && rmMsgCtx.getFaultTo() != null){
+ addrHeaders.setFaultTo(new EndpointReference(new Address(rmMsgCtx.getFaultTo())) );
+ }
+ if(addrHeaders.getFrom()==null&&rmMsgCtx.getFrom()!=null){
+ addrHeaders.setFrom((new EndpointReference(new Address(rmMsgCtx.getFrom()))));
+ }
+ if(addrHeaders.getReplyTo()==null&&rmMsgCtx.getReplyTo()!=null){
+ addrHeaders.setReplyTo(new EndpointReference(new Address(rmMsgCtx.getReplyTo())));
+ }
+ }
+
public static synchronized MessageContext cloneMsgContext(MessageContext msgContext) throws AxisFault {
MessageContext clone = new MessageContext(msgContext.getAxisEngine());
String str = msgContext.getRequestMessage().getSOAPPartAsString();
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org