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 di...@apache.org on 2005/09/04 02:22:44 UTC
svn commit: r267523 - in
/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha:
EnvelopeCreator.java server/SenderWorker.java
server/msgprocessors/FaultProcessor.java util/RMMessageCreator.java
Author: dims
Date: Sat Sep 3 17:22:40 2005
New Revision: 267523
URL: http://svn.apache.org/viewcvs?rev=267523&view=rev
Log:
Propagate the soap version correctly
Modified:
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/EnvelopeCreator.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java
webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/RMMessageCreator.java
Modified: webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/EnvelopeCreator.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/EnvelopeCreator.java?rev=267523&r1=267522&r2=267523&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/EnvelopeCreator.java (original)
+++ webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/EnvelopeCreator.java Sat Sep 3 17:22:40 2005
@@ -48,7 +48,7 @@
throws Exception {
AddressingHeaders addressingHeaders = rmMessageContext.getAddressingHeaders();
- SOAPEnvelope envelope = createBasicEnvelop();
+ SOAPEnvelope envelope = createBasicEnvelope(rmMessageContext);
AddressingHeaders outGoingAddressingHaders = new AddressingHeaders(envelope);
Action action = new Action(new URI(Constants.WSRM.ACTION_CREATE_SEQUENCE_RESPONSE));
@@ -107,7 +107,7 @@
throws Exception {
AddressingHeaders addressingHeaders = rmMsgCtx.getAddressingHeaders();
- SOAPEnvelope envelope = createBasicEnvelop();
+ SOAPEnvelope envelope = createBasicEnvelope(rmMsgCtx);
addressingHeaders.toEnvelope(envelope);
CreateSequence crSeq = rmMsgCtx.getRMHeaders().getCreateSequence();
@@ -115,9 +115,9 @@
return envelope;
}
- public static SOAPEnvelope createBasicEnvelop() throws Exception {
+ public static SOAPEnvelope createBasicEnvelope(RMMessageContext rmMessageContext) throws Exception {
- SOAPEnvelope soapEnv = new SOAPEnvelope();
+ SOAPEnvelope soapEnv = new SOAPEnvelope(rmMessageContext.getMsgContext().getSOAPConstants());
addNamespaceDeclarations(soapEnv);
return soapEnv;
}
@@ -136,7 +136,7 @@
throws Exception {
AddressingHeaders addressingHeaders = rmMessageContext.getAddressingHeaders();
- SOAPEnvelope envelope = createBasicEnvelop();
+ SOAPEnvelope envelope = createBasicEnvelope(rmMessageContext);
AddressingHeaders outGoingAddressingHaders = new AddressingHeaders(envelope);
Action action = new Action(new URI(Constants.WSRM.SEQUENCE_ACKNOWLEDGEMENT_ACTION));
@@ -178,7 +178,7 @@
public static SOAPEnvelope createServiceResponseEnvelope(RMMessageContext rmMessageContext)
throws Exception {
AddressingHeaders addressingHeaders = rmMessageContext.getAddressingHeaders();
- SOAPEnvelope responseEnvelope = createBasicEnvelop();
+ SOAPEnvelope responseEnvelope = createBasicEnvelope(rmMessageContext);
setBodyForResponseEnvelope(responseEnvelope, rmMessageContext);
@@ -241,7 +241,9 @@
SOAPEnvelope requestEnvelope;
String str = rmMessageContext.getMsgContext().getRequestMessage().getSOAPPartAsString();
- requestEnvelope = new Message(str).getSOAPEnvelope();
+ Message msg = new Message(str);
+ msg.setMessageContext(rmMessageContext.getMsgContext());
+ requestEnvelope = msg.getSOAPEnvelope();
AddressingHeaders addressingHeaders = rmMessageContext.getAddressingHeaders();
RMHeaders rmHeaders = new RMHeaders();
@@ -301,7 +303,7 @@
public static SOAPEnvelope createTerminatSeqMessage(RMMessageContext rmMessageContext)
throws Exception {
AddressingHeaders addressingHeaders = rmMessageContext.getAddressingHeaders();
- SOAPEnvelope terSeqEnv = createBasicEnvelop();
+ SOAPEnvelope terSeqEnv = createBasicEnvelope(rmMessageContext);
AddressingHeaders outGoingAddressingHaders = new AddressingHeaders(terSeqEnv);
Identifier seqId = new Identifier();
Modified: webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java?rev=267523&r1=267522&r2=267523&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java (original)
+++ webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/SenderWorker.java Sat Sep 3 17:22:40 2005
@@ -250,6 +250,7 @@
Service service = new Service();
Call call = (Call) service.createCall();
+ call.setSOAPVersion(rmMessageContext.getMsgContext().getSOAPConstants());
if (rmMessageContext.getAddressingHeaders().getAction() != null) {
call.setSOAPActionURI(rmMessageContext.getAddressingHeaders().getAction().toString());
@@ -319,6 +320,7 @@
Service service = new Service();
Call call = (Call) service.createCall();
call.setTargetEndpointAddress(rmMessageContext.getOutGoingAddress());
+ call.setSOAPVersion(rmMessageContext.getMsgContext().getSOAPConstants());
call.setClientHandlers(requestChain, responseChain);
if (rmMessageContext.getMsgContext().getRequestMessage() != null) {
Modified: webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java?rev=267523&r1=267522&r2=267523&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java (original)
+++ webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java Sat Sep 3 17:22:40 2005
@@ -100,7 +100,7 @@
private boolean sendFaultSync(MessageContext msgContext) throws Exception {
SOAPFault soapFault = new SOAPFault(axisFault);
- SOAPEnvelope sEnv = new SOAPEnvelope();
+ SOAPEnvelope sEnv = new SOAPEnvelope(msgContext.getSOAPConstants());
sEnv.getBody().addChildElement(soapFault);
msgContext.setResponseMessage(new Message(sEnv));
return true;
Modified: webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/RMMessageCreator.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/RMMessageCreator.java?rev=267523&r1=267522&r2=267523&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/RMMessageCreator.java (original)
+++ webservices/sandesha/branches/sandesha_1_0/src/org/apache/sandesha/util/RMMessageCreator.java Sat Sep 3 17:22:40 2005
@@ -172,7 +172,7 @@
terSeqRMMsgContext.setSequenceID(rmMsgCtx.getSequenceID());
AddressingHeaders addHeaders = getAddressingHeadersForTerminateSequence(rmMsgCtx, endPoint);
- SOAPEnvelope soe = new SOAPEnvelope();
+ SOAPEnvelope soe = new SOAPEnvelope(rmMsgCtx.getMsgContext().getSOAPConstants());
addHeaders.toEnvelope(soe);
AddressingHeaders terSqAddrHeaders = new AddressingHeaders(soe);
terSqAddrHeaders.setAction(new Action(new URI(Constants.WSRM.ACTION_TERMINATE_SEQUENCE)));
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org