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 sn...@apache.org on 2004/06/06 09:11:04 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha RMSequence.java
snimalan 2004/06/06 00:11:04
Modified: sandesha/src/org/apache/sandesha/ws/rm/providers
RMProvider.java
sandesha/src/org/apache/sandesha/server MessageInserter.java
sandesha/src/org/apache/sandesha RMSequence.java
Log:
MessageInserter RMSequence classes modified so that, For all call.invke(), they will set the soap action.
For all call.invoke(), invokeMessage() function create and the fuction uses where ever needed
Revision Changes Path
1.18 +3 -1 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java
Index: RMProvider.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RMProvider.java 13 May 2004 12:55:00 -0000 1.17
+++ RMProvider.java 6 Jun 2004 07:11:03 -0000 1.18
@@ -355,7 +355,9 @@
}
}
-
+ //msgContext.setUseSOAPAction(true);
+ //msgContext.setSOAPActionURI("fdfdf");
+
}
/**
1.10 +7 -5 ws-fx/sandesha/src/org/apache/sandesha/server/MessageInserter.java
Index: MessageInserter.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/MessageInserter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MessageInserter.java 11 May 2004 08:25:46 -0000 1.9
+++ MessageInserter.java 6 Jun 2004 07:11:04 -0000 1.10
@@ -18,7 +18,7 @@
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
-import org.apache.axis.client.Call;
+//import org.apache.axis.client.Call;
import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.addressing.Action;
@@ -140,14 +140,15 @@
Action action = new Action(actionURI);
action.toSOAPHeaderElement(ackResEnv);
Message ackResMsg = new Message(ackResEnv);
- Call call =
+ /* Call call =
new Call(
addressingHeaders
.getFrom()
.getAddress()
.toString());
call.setRequestMessage(ackResMsg);
- call.invoke();
+ call.invoke();*/
+ RMSequence.invokeMessage(addressingHeaders.getFrom().getAddress().toString(),ackResMsg,Constants.RM_SEQUENCE_ACKNOWLEDMENT_ACTION);
}
}
@@ -257,9 +258,10 @@
Action action = new Action(actionURI);
action.toSOAPHeaderElement(ackResEnv);
Message msg=new Message(ackResEnv);
- Call call=new Call(resTo.toString());
+ /* Call call=new Call(resTo.toString());
call.setRequestMessage(msg);
- call.invoke();
+ call.invoke();*/
+ RMSequence.invokeMessage(resTo.toString(),msg,action.toString());
}
}
}
1.15 +33 -17 ws-fx/sandesha/src/org/apache/sandesha/RMSequence.java
Index: RMSequence.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/RMSequence.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RMSequence.java 13 May 2004 12:55:00 -0000 1.14
+++ RMSequence.java 6 Jun 2004 07:11:04 -0000 1.15
@@ -62,6 +62,7 @@
import java.util.Vector;
import javax.xml.soap.SOAPException;
import java.lang.reflect.Method;
+import java.net.MalformedURLException;
/**
* class RMSequence
@@ -429,10 +430,12 @@
action.toSOAPHeaderElement(responseEnv);
// sending the ack
- Message responseMsg = new Message(responseEnv);
+ /* Message responseMsg = new Message(responseEnv);
Call call = new Call(resTo.toString());
call.setRequestMessage(responseMsg);
- call.invoke();
+ call.invoke();*/
+ invokeMessage(resTo.toString(),new Message(responseEnv),action.toString());
+
}
/**
@@ -801,10 +804,11 @@
createSeqReplyTo,
msgID);
//send the message to client
- Call call = new Call(resTo.toString());
+ /*Call call = new Call(resTo.toString());
Message msg = new Message(createSeqEnv);
call.setRequestMessage(msg);
- call.invoke();
+ call.invoke();*/
+ invokeMessage(resTo.toString(),new Message(createSeqEnv),org.apache.sandesha.Constants.ACTION_CREATE_SEQUENCE);
//check for the response and get the identifier
for (int i = 0;
@@ -901,7 +905,7 @@
msgID);
//send the message
- Call call =
+ /* Call call =
new Call(
rmMessge
.getAddressingHeaders()
@@ -910,7 +914,8 @@
.toString());
Message responseMsg = new Message(responseEnv);
call.setRequestMessage(responseMsg);
- call.invoke();
+ call.invoke();*/
+ invokeMessage(rmMessge.getAddressingHeaders().getFrom().getAddress().toString(),new Message(responseEnv),"wsrm:Response");
// set AckRequested
RMHeaders rmAckReqHeader = new RMHeaders();
@@ -918,7 +923,7 @@
ackReq.setIdentifier(responseSequenceIdentifier);
rmAckReqHeader.setAckRequest(ackReq);
rmAckReqHeader.toSoapEnvelop(responseEnv);
- call.setRequestMessage(responseMsg);
+ //call.setRequestMessage(responseMsg);
//wait for ack and resend
for (int i = 0;
@@ -931,7 +936,7 @@
i++) {
if (!rmMessge.isAcknowledged()) {
- call.invoke();
+ invokeMessage(rmMessge.getAddressingHeaders().getFrom().getAddress().toString(),new Message(responseEnv),"wsrm:Response");
} else {
break;
}
@@ -1004,9 +1009,9 @@
resTo,
createSeqReplyTo,
msgID);
- Call call = new Call(resTo.toString());
- call.invoke(createSeqEnv);
-
+ /*Call call = new Call(resTo.toString());
+ call.invoke(createSeqEnv);*/
+ invokeMessage(resTo.toString(),new Message(createSeqEnv),org.apache.sandesha.Constants.ACTION_CREATE_SEQUENCE);
for (int i = 0;
i
< org
@@ -1111,7 +1116,7 @@
ackMsgID);
//send the ack
Message ackMsg = new Message(ackEnv);
- Call ackCall =
+ /*Call ackCall =
new Call(
rmMessge
.getAddressingHeaders()
@@ -1119,10 +1124,11 @@
.getAddress()
.toString());
ackCall.setRequestMessage(ackMsg);
- ackCall.invoke();
+ ackCall.invoke();*/
+ invokeMessage(rmMessge.getAddressingHeaders().getFrom().getAddress().toString(),ackMsg,Constants.RM_SEQUENCE_ACKNOWLEDMENT_ACTION);
//send respponse and wait for ack if not retranmiss
- Call call =
+ /*Call call =
new Call(
rmMessge
.getAddressingHeaders()
@@ -1130,14 +1136,15 @@
.getAddress()
.toString());
call.setRequestMessage(responseMsg);
- call.invoke();
+ call.invoke();*/
+ invokeMessage(rmMessge.getAddressingHeaders().getReplyTo().getAddress().toString(),responseMsg,"wsrm:Response");
//set AckRequested
RMHeaders rmAckReqHeader = new RMHeaders();
AckRequested ackReq = new AckRequested();
ackReq.setIdentifier(responseSequenceIdentifier);
rmAckReqHeader.setAckRequest(ackReq);
rmAckReqHeader.toSoapEnvelop(responseEnv);
- call.setRequestMessage(responseMsg);
+ //call.setRequestMessage(responseMsg);
for (int i = 0;
i
@@ -1148,7 +1155,8 @@
.MAXIMAM_SERVER_RETRANSMISION_COUNT;
i++) {
if (!rmMessge.isAcknowledged()) {
- call.invoke();
+ //call.invoke();
+ invokeMessage(rmMessge.getAddressingHeaders().getReplyTo().getAddress().toString(),responseMsg,"wsrm:Response");
} else {
break;
}
@@ -1258,5 +1266,13 @@
return reqSOAPEnvelop;
}
+
+ public static void invokeMessage(String address,Message message,String action ) throws MalformedURLException, AxisFault{
+ Call call=new Call(address);
+ call.setRequestMessage(message);
+ call.setUseSOAPAction(true);
+ call.setSOAPActionURI(action);
+ call.invoke();
+ }
}
Re: cvs commit: ws-fx/sandesha/src/org/apache/sandesha RMSequence.java
Posted by Davanum Srinivas <da...@gmail.com>.
nimalan,
Please remove the unnecessary code instead of commenting it out. we
can always look at cvs history if we want :)
thanks,
dims
On 6 Jun 2004 07:11:04 -0000, snimalan@apache.org <sn...@apache.org> wrote:
>
> snimalan 2004/06/06 00:11:04
>
> Modified: sandesha/src/org/apache/sandesha/ws/rm/providers
> RMProvider.java
> sandesha/src/org/apache/sandesha/server MessageInserter.java
> sandesha/src/org/apache/sandesha RMSequence.java
> Log:
> MessageInserter RMSequence classes modified so that, For all call.invke(), they will set the soap action.
> For all call.invoke(), invokeMessage() function create and the fuction uses where ever needed
>
> Revision Changes Path
> 1.18 +3 -1 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java
>
> Index: RMProvider.java
> ===================================================================
> RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java,v
> retrieving revision 1.17
> retrieving revision 1.18
> diff -u -r1.17 -r1.18
> --- RMProvider.java 13 May 2004 12:55:00 -0000 1.17
> +++ RMProvider.java 6 Jun 2004 07:11:03 -0000 1.18
> @@ -355,7 +355,9 @@
> }
>
> }
> -
> + //msgContext.setUseSOAPAction(true);
> + //msgContext.setSOAPActionURI("fdfdf");
> +
> }
>
> /**
>
> 1.10 +7 -5 ws-fx/sandesha/src/org/apache/sandesha/server/MessageInserter.java
>
> Index: MessageInserter.java
> ===================================================================
> RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/MessageInserter.java,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -r1.9 -r1.10
> --- MessageInserter.java 11 May 2004 08:25:46 -0000 1.9
> +++ MessageInserter.java 6 Jun 2004 07:11:04 -0000 1.10
> @@ -18,7 +18,7 @@
>
> import org.apache.axis.Message;
> import org.apache.axis.MessageContext;
> -import org.apache.axis.client.Call;
> +//import org.apache.axis.client.Call;
> import org.apache.axis.components.logger.LogFactory;
> import org.apache.axis.message.SOAPEnvelope;
> import org.apache.axis.message.addressing.Action;
> @@ -140,14 +140,15 @@
> Action action = new Action(actionURI);
> action.toSOAPHeaderElement(ackResEnv);
> Message ackResMsg = new Message(ackResEnv);
> - Call call =
> + /* Call call =
> new Call(
> addressingHeaders
> .getFrom()
> .getAddress()
> .toString());
> call.setRequestMessage(ackResMsg);
> - call.invoke();
> + call.invoke();*/
> + RMSequence.invokeMessage(addressingHeaders.getFrom().getAddress().toString(),ackResMsg,Constants.RM_SEQUENCE_ACKNOWLEDMENT_ACTION);
> }
> }
>
> @@ -257,9 +258,10 @@
> Action action = new Action(actionURI);
> action.toSOAPHeaderElement(ackResEnv);
> Message msg=new Message(ackResEnv);
> - Call call=new Call(resTo.toString());
> + /* Call call=new Call(resTo.toString());
> call.setRequestMessage(msg);
> - call.invoke();
> + call.invoke();*/
> + RMSequence.invokeMessage(resTo.toString(),msg,action.toString());
> }
> }
> }
>
> 1.15 +33 -17 ws-fx/sandesha/src/org/apache/sandesha/RMSequence.java
>
> Index: RMSequence.java
> ===================================================================
> RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/RMSequence.java,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -r1.14 -r1.15
> --- RMSequence.java 13 May 2004 12:55:00 -0000 1.14
> +++ RMSequence.java 6 Jun 2004 07:11:04 -0000 1.15
> @@ -62,6 +62,7 @@
> import java.util.Vector;
> import javax.xml.soap.SOAPException;
> import java.lang.reflect.Method;
> +import java.net.MalformedURLException;
>
> /**
> * class RMSequence
> @@ -429,10 +430,12 @@
> action.toSOAPHeaderElement(responseEnv);
>
> // sending the ack
> - Message responseMsg = new Message(responseEnv);
> + /* Message responseMsg = new Message(responseEnv);
> Call call = new Call(resTo.toString());
> call.setRequestMessage(responseMsg);
> - call.invoke();
> + call.invoke();*/
> + invokeMessage(resTo.toString(),new Message(responseEnv),action.toString());
> +
> }
>
> /**
> @@ -801,10 +804,11 @@
> createSeqReplyTo,
> msgID);
> //send the message to client
> - Call call = new Call(resTo.toString());
> + /*Call call = new Call(resTo.toString());
> Message msg = new Message(createSeqEnv);
> call.setRequestMessage(msg);
> - call.invoke();
> + call.invoke();*/
> + invokeMessage(resTo.toString(),new Message(createSeqEnv),org.apache.sandesha.Constants.ACTION_CREATE_SEQUENCE);
>
> //check for the response and get the identifier
> for (int i = 0;
> @@ -901,7 +905,7 @@
> msgID);
>
> //send the message
> - Call call =
> + /* Call call =
> new Call(
> rmMessge
> .getAddressingHeaders()
> @@ -910,7 +914,8 @@
> .toString());
> Message responseMsg = new Message(responseEnv);
> call.setRequestMessage(responseMsg);
> - call.invoke();
> + call.invoke();*/
> + invokeMessage(rmMessge.getAddressingHeaders().getFrom().getAddress().toString(),new Message(responseEnv),"wsrm:Response");
>
> // set AckRequested
> RMHeaders rmAckReqHeader = new RMHeaders();
> @@ -918,7 +923,7 @@
> ackReq.setIdentifier(responseSequenceIdentifier);
> rmAckReqHeader.setAckRequest(ackReq);
> rmAckReqHeader.toSoapEnvelop(responseEnv);
> - call.setRequestMessage(responseMsg);
> + //call.setRequestMessage(responseMsg);
>
> //wait for ack and resend
> for (int i = 0;
> @@ -931,7 +936,7 @@
> i++) {
>
> if (!rmMessge.isAcknowledged()) {
> - call.invoke();
> + invokeMessage(rmMessge.getAddressingHeaders().getFrom().getAddress().toString(),new Message(responseEnv),"wsrm:Response");
> } else {
> break;
> }
> @@ -1004,9 +1009,9 @@
> resTo,
> createSeqReplyTo,
> msgID);
> - Call call = new Call(resTo.toString());
> - call.invoke(createSeqEnv);
> -
> + /*Call call = new Call(resTo.toString());
> + call.invoke(createSeqEnv);*/
> + invokeMessage(resTo.toString(),new Message(createSeqEnv),org.apache.sandesha.Constants.ACTION_CREATE_SEQUENCE);
> for (int i = 0;
> i
> < org
> @@ -1111,7 +1116,7 @@
> ackMsgID);
> //send the ack
> Message ackMsg = new Message(ackEnv);
> - Call ackCall =
> + /*Call ackCall =
> new Call(
> rmMessge
> .getAddressingHeaders()
> @@ -1119,10 +1124,11 @@
> .getAddress()
> .toString());
> ackCall.setRequestMessage(ackMsg);
> - ackCall.invoke();
> + ackCall.invoke();*/
> + invokeMessage(rmMessge.getAddressingHeaders().getFrom().getAddress().toString(),ackMsg,Constants.RM_SEQUENCE_ACKNOWLEDMENT_ACTION);
>
> //send respponse and wait for ack if not retranmiss
> - Call call =
> + /*Call call =
> new Call(
> rmMessge
> .getAddressingHeaders()
> @@ -1130,14 +1136,15 @@
> .getAddress()
> .toString());
> call.setRequestMessage(responseMsg);
> - call.invoke();
> + call.invoke();*/
> + invokeMessage(rmMessge.getAddressingHeaders().getReplyTo().getAddress().toString(),responseMsg,"wsrm:Response");
> //set AckRequested
> RMHeaders rmAckReqHeader = new RMHeaders();
> AckRequested ackReq = new AckRequested();
> ackReq.setIdentifier(responseSequenceIdentifier);
> rmAckReqHeader.setAckRequest(ackReq);
> rmAckReqHeader.toSoapEnvelop(responseEnv);
> - call.setRequestMessage(responseMsg);
> + //call.setRequestMessage(responseMsg);
>
> for (int i = 0;
> i
> @@ -1148,7 +1155,8 @@
> .MAXIMAM_SERVER_RETRANSMISION_COUNT;
> i++) {
> if (!rmMessge.isAcknowledged()) {
> - call.invoke();
> + //call.invoke();
> + invokeMessage(rmMessge.getAddressingHeaders().getReplyTo().getAddress().toString(),responseMsg,"wsrm:Response");
> } else {
> break;
> }
> @@ -1258,5 +1266,13 @@
>
> return reqSOAPEnvelop;
> }
> +
> + public static void invokeMessage(String address,Message message,String action ) throws MalformedURLException, AxisFault{
> + Call call=new Call(address);
> + call.setRequestMessage(message);
> + call.setUseSOAPAction(true);
> + call.setSOAPActionURI(action);
> + call.invoke();
> + }
>
> }
>
>