Hi folks,
I've got some changes that I'd like to put in, which clean up some of the
RESPONSE_WRITTEN code, using new util code in the Axis2 transport.
However, to get that working I need to build against Axis2 snapshot, not
the 1.2 version that the project.properties currently points to.
However, just updating the dependency, and fixing a bunch of trivial
compile errors and warnings, doesn't get the unit tests running. Has
anyone else been through this? I've a feeling that we need to update the
axis2.xml files, at least...
Here's the diff I've created so far, if anyone is interested.
Cheers,
Matt
Unless stated otherwise above:
IBM United Kingdom Limited - Registered in England and Wales with number
741598.
Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU
Index: project.properties
===================================================================
--- project.properties (revision 550833)
+++ project.properties (working copy)
@@ -26,7 +26,7 @@
sandesha2.version=SNAPSHOT
sandesha2.module.version=SNAPSHOT
-axis2.version=1.2
+axis2.version=SNAPSHOT
axiom.version=1.2.4
addressing.version=${axis2.version}
Index: modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
===================================================================
--- modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
(revision 550833)
+++ modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
(working copy)
@@ -78,7 +78,6 @@
public SandeshaTestCase(String name) {
super(name);
- File baseDir = new File("");
String testRource = "target" + File.separator + "test-classes";
resourceDir = new File(testRource).getPath();
Index:
modules/core/src/main/java/org/apache/sandesha2/workers/InvokerWorker.java
===================================================================
--- modules/core/src/main/java/org/apache/sandesha2/workers/InvokerWorker.java
(revision 550833)
+++ modules/core/src/main/java/org/apache/sandesha2/workers/InvokerWorker.java
(working copy)
@@ -87,19 +87,18 @@
&&
Sandesha2Constants.VALUE_TRUE.equals(postFaulureProperty))
postFailureInvocation = true;
- AxisEngine engine = new
AxisEngine(msgToInvoke.getConfigurationContext());
if (postFailureInvocation) {
makeMessageReadyForReinjection(msgToInvoke);
if (log.isDebugEnabled())
log.debug("Receiving message,
key=" + messageContextKey + ", msgCtx="
+
msgToInvoke.getEnvelope().getHeader());
- engine.receive(msgToInvoke);
+ AxisEngine.receive(msgToInvoke);
} else {
if (log.isDebugEnabled())
log.debug("Resuming message,
key=" + messageContextKey + ", msgCtx="
+
msgToInvoke.getEnvelope().getHeader());
msgToInvoke.setPaused(false);
- engine.resumeReceive(msgToInvoke);
+ AxisEngine.resumeReceive(msgToInvoke);
}
if(transaction!=null){
@@ -192,7 +191,6 @@
private void handleFault(RMMsgContext inRMMsgContext, Exception e) {
MessageContext inMsgContext =
inRMMsgContext.getMessageContext();
- AxisEngine engine = new
AxisEngine(inMsgContext.getConfigurationContext());
try {
MessageContext faultContext =
MessageContextBuilder.createFaultMessageContext(inMsgContext, e);
// Copy some of the parameters to the new message
context.
@@ -213,10 +211,10 @@
if (requestResponseTransport!=null)
requestResponseTransport.signalFaultReady(fault);
else
- engine.sendFault(faultContext);
+ AxisEngine.sendFault(faultContext);
} else
- engine.sendFault(faultContext);
+ AxisEngine.sendFault(faultContext);
} catch (AxisFault e1) {
if (log.isErrorEnabled())
Index: modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
===================================================================
--- modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
(revision 550833)
+++ modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
(working copy)
@@ -5,15 +5,14 @@
import java.util.Iterator;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.OutOnlyAxisOperation;
@@ -210,7 +209,6 @@
msgCtx.getOptions().setTimeOutInMilliSeconds(1000000);
try {
- AxisEngine engine = new AxisEngine
(msgCtx.getConfigurationContext());
InvocationResponse response =
InvocationResponse.CONTINUE;
SandeshaPolicyBean policy =
SandeshaUtil.getPropertyBean(msgCtx.getAxisOperation());
@@ -220,12 +218,12 @@
log.debug("Resuming a
send for message : " + msgCtx.getEnvelope().getHeader());
msgCtx.setPaused(false);
msgCtx.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.FALSE);
- response =
engine.resumeSend(msgCtx);
+ response =
AxisEngine.resumeSend(msgCtx);
} else {
if (log.isDebugEnabled())
log.debug("Sending a
message : " + msgCtx.getEnvelope().getHeader());
msgCtx.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.FALSE);
- engine.send(msgCtx); // TODO
check if this should return an invocation response
+ AxisEngine.send(msgCtx); //
TODO check if this should return an invocation response
}
} else {
// had to fully build the SOAP envelope
to support
@@ -249,7 +247,7 @@
if (log.isDebugEnabled())
log.debug("Resuming a send for
message : " + msgCtx.getEnvelope().getHeader());
- response = engine.resumeSend(msgCtx);
+ response =
AxisEngine.resumeSend(msgCtx);
}
if(log.isDebugEnabled()) log.debug("Engine
resume returned " + response);
if(response != InvocationResponse.SUSPEND) {
@@ -597,7 +595,7 @@
ServiceContext serviceCtx =
responseMessageContext.getServiceContext();
AxisOperation op =
msgCtx.getAxisService().getOperation(Sandesha2Constants.RM_IN_ONLY_OPERATION);
- responseMsgOpCtx =
ContextFactory.createOperationContext (op, serviceCtx);
+ responseMsgOpCtx =
OperationContextFactory.createOperationContext
(op.getAxisSpecificMEPConstant(), op, serviceCtx);
}
@@ -635,14 +633,8 @@
responseMessageContext.setSoapAction("");
}
- AxisEngine engine = new
AxisEngine(msgCtx.getConfigurationContext());
if (resenvelope!=null) {
- //we proceed only if we hv found a valid
envelope.
- if (isFaultEnvelope(resenvelope)) {
-
engine.receiveFault(responseMessageContext);
- } else {
- engine.receive(responseMessageContext);
- }
+ AxisEngine.receive(responseMessageContext);
}
} catch (Exception e) {
@@ -654,19 +646,4 @@
log.debug("Exit: SenderWorker::checkForSyncResponses");
}
- private boolean isFaultEnvelope(SOAPEnvelope envelope) {
- if (log.isDebugEnabled())
- log.debug("Enter: SenderWorker::isFaultEnvelope, " +
envelope.getBody().getFault());
- SOAPFault fault = envelope.getBody().getFault();
- if (fault != null) {
- if (log.isDebugEnabled())
- log.debug("Exit: SenderWorker::isFaultEnvelope,
TRUE");
- return true;
- }
-
- if (log.isDebugEnabled())
- log.debug("Exit: SenderWorker::isFaultEnvelope, FALSE");
- return false;
- }
-
}
Index:
modules/core/src/main/java/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
(working copy)
@@ -49,7 +49,7 @@
private static final Log log =
LogFactory.getLog(RMMessageReceiver.class);
- public final void receive(MessageContext msgCtx) throws AxisFault {
+ public final void invokeBusinessLogic(MessageContext msgCtx) throws
AxisFault {
if(log.isDebugEnabled()) log.debug("Entry:
RMMessageReceiver::receive");
RMMsgContext rmMsgCtx = null;
Index:
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
(working copy)
@@ -30,15 +30,12 @@
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.mail.MailBasedOutTransportInfo;
-import org.apache.axis2.util.MessageContextBuilder;
-import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
@@ -194,9 +191,6 @@
if (acksTo.hasAnonymousAddress()) {
//If acksTo is anonymous we will be sending the ack
here it self. Transport will use what ever mechanism to send the
//message. (for e.g. HTTP will use the back channel)
-
-
- AxisEngine engine = new
AxisEngine(ackRMMsgCtx.getMessageContext().getConfigurationContext());
// setting CONTEXT_WRITTEN since acksto is anonymous
@@ -206,7 +200,7 @@
// handler.
ServiceContext serviceCtx =
msgContext.getServiceContext();
- OperationContext opCtx =
ContextFactory.createOperationContext(ackOperation, serviceCtx);
+ OperationContext opCtx =
OperationContextFactory.createOperationContext(ackOperation.getAxisSpecificMEPConstant(),
ackOperation, serviceCtx);
rmMsgCtx.getMessageContext().setOperationContext(opCtx);
}
@@ -219,10 +213,8 @@
rmMsgCtx.getMessageContext().setProperty(Sandesha2Constants.ACK_WRITTEN,
"true");
- MailBasedOutTransportInfo outTrnInfo =
(MailBasedOutTransportInfo)
ackRMMsgCtx.getMessageContext().getOptions().getProperty(Constants.OUT_TRANSPORT_INFO);
-
try {
- engine.send(ackRMMsgCtx.getMessageContext());
+
AxisEngine.send(ackRMMsgCtx.getMessageContext());
} catch (AxisFault e1) {
throw new SandeshaException(e1.getMessage());
}
@@ -317,7 +309,7 @@
getMsgContext().setAxisOperation(ackOperation);
ServiceContext serviceCtx = getMsgContext().getServiceContext();
- OperationContext opcontext =
ContextFactory.createOperationContext(ackOperation, serviceCtx);
+ OperationContext opcontext =
OperationContextFactory.createOperationContext(ackOperation.getAxisSpecificMEPConstant(),
ackOperation, serviceCtx);
opcontext.setParent(getMsgContext().getServiceContext());
getConfigurationContext().registerOperationContext(ackRequestRMMsg.getMessageId(),
opcontext);
Index:
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(working copy)
@@ -256,9 +256,8 @@
// We have done all of our updates, so commit the
transaction
if(transaction != null && transaction.isActive())
transaction.commit();
- AxisEngine engine = new AxisEngine(context);
try{
- engine.send(outMessage);
+ AxisEngine.send(outMessage);
}
catch(AxisFault e){
FaultManager.makeCreateSequenceRefusedFault(createSeqRMMsg,
Index:
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
(working copy)
@@ -207,7 +207,7 @@
MessageContext
applicationMessage = storageManager.retrieveMessageContext(storageKey,
configCtx);
AxisOperation
operation = applicationMessage.getAxisOperation();
if(operation!=
null) {
- int mep
= operation.getAxisSpecifMEPConstant();
+ int mep
= operation.getAxisSpecificMEPConstant();
syncResponseNeeded = (mep == WSDLConstants.MEP_CONSTANT_OUT_IN);
}
}
Index:
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
(working copy)
@@ -291,7 +291,7 @@
// If we are doing sync 2-way over WSRM 1.0, then we may just
have received one of
// the reply messages that we were looking for. If so we can
remove the matching sender bean.
- int mep = msgCtx.getAxisOperation().getAxisSpecifMEPConstant();
+ int mep =
msgCtx.getAxisOperation().getAxisSpecificMEPConstant();
if(specVersion!=null &&
specVersion.equals(Sandesha2Constants.SPEC_VERSIONS.v1_0) &&
mep == WSDLConstants.MEP_CONSTANT_OUT_IN) {
RelatesTo relatesTo = msgCtx.getRelatesTo();
Index:
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
(working copy)
@@ -24,9 +24,9 @@
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisEngine;
import org.apache.commons.logging.Log;
@@ -158,12 +158,10 @@
MessageContext outMessage =
terminateSequenceResponse.getMessageContext();
EndpointReference toEPR = outMessage.getTo();
- AxisEngine engine = new
AxisEngine(terminateSeqMsg.getConfigurationContext());
-
outMessage.setServerSide(true);
try {
- engine.send(outMessage);
+ AxisEngine.send(outMessage);
} catch (AxisFault e) {
if (log.isDebugEnabled())
log.debug("Unable to send terminate
sequence response", e);
@@ -211,9 +209,8 @@
terminateSeqMsg.getOperationContext().setProperty(org.apache.axis2.Constants.RESPONSE_WRITTEN,
"true");
- AxisEngine engine = new
AxisEngine(context);
try {
- engine.send(message);
+ AxisEngine.send(message);
} catch (AxisFault e) {
if (log.isDebugEnabled())
log.debug("Unable to
send terminate sequence response", e);
@@ -379,7 +376,7 @@
rmMsgCtx.getRMSpecVersion(),
getMsgContext().getAxisService());
- OperationContext opcontext =
ContextFactory.createOperationContext(terminateOp,
getMsgContext().getServiceContext());
+ OperationContext opcontext =
OperationContextFactory.createOperationContext(terminateOp.getAxisSpecificMEPConstant(),
terminateOp, getMsgContext().getServiceContext());
opcontext.setParent(getMsgContext().getServiceContext());
getConfigurationContext().registerOperationContext(rmMsgCtx.getMessageId(),
opcontext);
Index:
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/LastMessageProcessor.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/LastMessageProcessor.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/LastMessageProcessor.java
(working copy)
@@ -115,8 +115,7 @@
outMessageContext.setProperty(RequestResponseTransport.TRANSPORT_CONTROL,
msgContext.getProperty(RequestResponseTransport.TRANSPORT_CONTROL));
msgContext.getOperationContext().setProperty
(Constants.RESPONSE_WRITTEN,Constants.VALUE_TRUE);
- AxisEngine engine = new AxisEngine
(rmMsgCtx.getConfigurationContext());
- engine.send(outMessageContext);
+ AxisEngine.send(outMessageContext);
}
Index:
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(working copy)
@@ -205,7 +205,7 @@
AxisOperation op = msgContext.getAxisOperation();
int mep = WSDLConstants.MEP_CONSTANT_INVALID;
if(op != null) {
- mep = op.getAxisSpecifMEPConstant();
+ mep = op.getAxisSpecificMEPConstant();
}
if(mep == WSDLConstants.MEP_CONSTANT_OUT_IN) {
String specVersion = null;
@@ -317,7 +317,7 @@
AxisOperation op = msgContext.getAxisOperation();
int mep = WSDLConstants.MEP_CONSTANT_INVALID;
if(op != null) {
- mep = op.getAxisSpecifMEPConstant();
+ mep = op.getAxisSpecificMEPConstant();
}
if(mep == WSDLConstants.MEP_CONSTANT_OUT_IN) {
Index:
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
(working copy)
@@ -7,9 +7,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.transport.RequestResponseTransport;
@@ -184,7 +184,7 @@
if(context == null) {
AxisOperation oldOperation =
returnMessage.getAxisOperation();
- context =
ContextFactory.createOperationContext(oldOperation,
returnMessage.getServiceContext()); //new OperationContext(oldOperation);
+ context =
OperationContextFactory.createOperationContext(oldOperation.getAxisSpecificMEPConstant(),
oldOperation, returnMessage.getServiceContext());
context.addMessageContext(pollMessage.getMessageContext());
pollMessage.getMessageContext().setOperationContext(context);
Index:
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
(working copy)
@@ -22,9 +22,9 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisEngine;
import org.apache.commons.logging.Log;
@@ -104,8 +104,6 @@
Iterator sequenceAckIter = ackRMMsgCtx
.getMessageParts(Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT);
- MessageContext closeSequenceMsg = rmMsgCtx.getMessageContext();
-
RMMsgContext closeSeqResponseRMMsg =
RMMsgCreator.createCloseSeqResponseMsg(rmMsgCtx, rmdBean);
MessageContext closeSequenceResponseMsg =
closeSeqResponseRMMsg.getMessageContext();
@@ -130,10 +128,8 @@
transaction = null;
}
- AxisEngine engine = new
AxisEngine(closeSequenceMsg.getConfigurationContext());
-
try {
- engine.send(closeSequenceResponseMsg);
+ AxisEngine.send(closeSequenceResponseMsg);
} catch (AxisFault e) {
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.couldNotSendCloseResponse,
sequenceId, e.toString());
@@ -163,7 +159,7 @@
getMsgContext().setAxisOperation(closeOperation);
- OperationContext opcontext =
ContextFactory.createOperationContext(closeOperation,
getMsgContext().getServiceContext());
+ OperationContext opcontext =
OperationContextFactory.createOperationContext(closeOperation.getAxisSpecificMEPConstant(),
closeOperation, getMsgContext().getServiceContext());
opcontext.setParent(getMsgContext().getServiceContext());
getConfigurationContext().registerOperationContext(rmMsgCtx.getMessageId(),opcontext);
Index: modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
===================================================================
--- modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
(revision 550833)
+++ modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
(working copy)
@@ -233,7 +233,7 @@
// If we get to here then we must have one of
the user's operations, so
// check the MEP.
- if(op.getAxisSpecifMEPConstant() ==
WSDLConstants.MEP_CONSTANT_OUT_IN) {
+ if(op.getAxisSpecificMEPConstant() ==
WSDLConstants.MEP_CONSTANT_OUT_IN) {
Parameter p = new
Parameter(Sandesha2Constants.SERVICE_CONTAINS_OUT_IN_MEPS, Boolean.TRUE);
service.addParameter(p);
break;
@@ -241,7 +241,7 @@
}
} else if(axisDescription instanceof AxisOperation) {
AxisOperation op = (AxisOperation) axisDescription;
- log.debug("Examining operation " + op.getName() + ",
mep " + op.getAxisSpecifMEPConstant());
+ log.debug("Examining operation " + op.getName() + ",
mep " + op.getAxisSpecificMEPConstant());
String name = null;
QName qName = op.getName();
@@ -251,7 +251,7 @@
// If we get to here then we must have one of
the user's operations, so
// check the MEP.
- if(op.getAxisSpecifMEPConstant() ==
WSDLConstants.MEP_CONSTANT_OUT_IN) {
+ if(op.getAxisSpecificMEPConstant() ==
WSDLConstants.MEP_CONSTANT_OUT_IN) {
Parameter p = new
Parameter(Sandesha2Constants.SERVICE_CONTAINS_OUT_IN_MEPS, Boolean.TRUE);
op.getParent().addParameter(p);
}
Index:
modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java
===================================================================
---
modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java
(revision 550833)
+++
modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java
(working copy)
@@ -27,10 +27,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisEngine;
import org.apache.commons.logging.Log;
@@ -323,7 +322,6 @@
ackRMMsgContext.addSOAPEnvelope();
MessageContext ackMsgContext =
ackRMMsgContext.getMessageContext();
- ConfigurationContext configContext =
ackMsgContext.getConfigurationContext();
// setting CONTEXT_WRITTEN since acksto is anonymous
if (ackRMMsgContext.getMessageContext().getOperationContext()
== null) {
@@ -331,7 +329,7 @@
// handler.
AxisOperation op = ackMsgContext.getAxisOperation();
- OperationContext opCtx =
ContextFactory.createOperationContext(op,
ackRMMsgContext.getMessageContext().getServiceContext());
+ OperationContext opCtx =
OperationContextFactory.createOperationContext(op.getAxisSpecificMEPConstant(),
op, ackRMMsgContext.getMessageContext().getServiceContext());
ackRMMsgContext.getMessageContext().setOperationContext(opCtx);
}
@@ -342,8 +340,7 @@
ackRMMsgContext.getMessageContext().setServerSide(true);
- AxisEngine engine = new AxisEngine(configContext);
- engine.send(ackMsgContext);
+ AxisEngine.send(ackMsgContext);
if (log.isDebugEnabled())
log.debug("Exit: AcknowledgementManager::sendAckNow");
Index: modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
===================================================================
--- modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
(revision 550833)
+++ modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
(working copy)
@@ -32,7 +32,6 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.util.MessageContextBuilder;
-import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
Index: modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
===================================================================
--- modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
(revision 550833)
+++ modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
(working copy)
@@ -504,8 +504,7 @@
//having a surrounded try block will make sure
that the error is logged here
//and that this does not disturb the processing
of a carrier message.
try {
- AxisEngine engine = new
AxisEngine(faultMessageContext.getConfigurationContext());
- engine.sendFault(faultMessageContext);
+
AxisEngine.sendFault(faultMessageContext);
} catch (Exception e) {
AxisFault fault = new
AxisFault(faultColdValue.getTextAsQName(), data.getReason(), "", "",
data.getDetail());
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.couldNotSendFaultDueToException,
fault.getMessage(), e.getMessage());
Index: modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java
===================================================================
--- modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java
(revision 550833)
+++ modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java
(working copy)
@@ -363,7 +363,6 @@
}
if(!rangeAdded){
- Long newIndex = new Long(r.lowerValue);
//A simple add.
//First cleanup and add from r.lower to r.upper
cleanUpRangesEnvelopedAndDiscoverNewRangesAdded(r,
r.lowerValue, r.upperValue, newRangesAdded);
Index: modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
===================================================================
--- modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
(revision 550833)
+++ modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
(working copy)
@@ -386,7 +386,7 @@
newMessageContext.setServiceContext(referenceMessage.getServiceContext());
newMessageContext.setServiceContextID(referenceMessage.getServiceContextID());
} else {
- ServiceContext serviceContext = new
ServiceContext
(referenceMessage.getAxisService(),newMessageContext.getServiceGroupContext());
+ ServiceContext serviceContext = new
ServiceContext();
newMessageContext.setServiceContext(serviceContext);
}
}
@@ -854,10 +854,8 @@
msgContext.setTransportOut(sandesha2TransportOutDesc);
// sending the message once through
Sandesha2TransportSender.
- AxisEngine engine = new
AxisEngine(configurationContext);
-
if (msgContext.isPaused())
- engine.resumeSend(msgContext);
+ AxisEngine.resumeSend(msgContext);
else {
//this invocation has to be a blocking one.
@@ -865,7 +863,7 @@
if (isTransportNonBlocking!=null &&
isTransportNonBlocking.booleanValue())
msgContext.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.FALSE);
- engine.send(msgContext);
+ AxisEngine.send(msgContext);
msgContext.setProperty(MessageContext.TRANSPORT_NON_BLOCKING,
isTransportNonBlocking);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
