Author: mlovett
Date: Tue Feb 13 05:59:17 2007
New Revision: 507004
URL: http://svn.apache.org/viewvc?view=rev&rev=507004
Log:
Fix compile errors caused by upstream Axis2 changes to the OperationContext
constructors
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?view=diff&rev=507004&r1=507003&r2=507004
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
Tue Feb 13 05:59:17 2007
@@ -32,6 +32,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisEngine;
import org.apache.commons.logging.Log;
@@ -183,7 +184,8 @@
if (rmMsgCtx.getMessageContext().getOperationContext()
== null) {
// operation context will be null when doing in
a GLOBAL
// handler.
- OperationContext opCtx = new
OperationContext(ackOperation);
+ ServiceContext serviceCtx =
msgContext.getServiceContext();
+ OperationContext opCtx = new
OperationContext(ackOperation, serviceCtx);
rmMsgCtx.getMessageContext().setOperationContext(opCtx);
}
@@ -290,9 +292,8 @@
getRMVersion(),
getMsgContext().getAxisService());
getMsgContext().setAxisOperation(ackOperation);
-
- OperationContext opcontext = new OperationContext(ackOperation);
- opcontext.setParent(getMsgContext().getServiceContext());
+ ServiceContext serviceCtx = getMsgContext().getServiceContext();
+ OperationContext opcontext = new OperationContext(ackOperation,
serviceCtx);
getConfigurationContext().registerOperationContext(ackRequestRMMsg.getMessageId(),
opcontext);
getMsgContext().setOperationContext(opcontext);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java?view=diff&rev=507004&r1=507003&r2=507004
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
Tue Feb 13 05:59:17 2007
@@ -172,8 +172,7 @@
rmMsgCtx.getMessageContext().getAxisService());
getMsgContext().setAxisOperation(closeOperation);
- OperationContext opcontext = new
OperationContext(closeOperation);
- opcontext.setParent(getMsgContext().getServiceContext());
+ OperationContext opcontext = new
OperationContext(closeOperation, getMsgContext().getServiceContext());
getConfigurationContext().registerOperationContext(rmMsgCtx.getMessageId(),opcontext);
getMsgContext().setOperationContext(opcontext);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java?view=diff&rev=507004&r1=507003&r2=507004
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
Tue Feb 13 05:59:17 2007
@@ -144,7 +144,7 @@
OperationContext context =
pollMessage.getMessageContext().getOperationContext();
if(context == null) {
AxisOperation oldOperation =
returnMessage.getAxisOperation();
- context = new OperationContext(oldOperation);
+ context = new OperationContext(oldOperation,
returnMessage.getServiceContext());
context.addMessageContext(pollMessage.getMessageContext());
pollMessage.getMessageContext().setOperationContext(context);
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?view=diff&rev=507004&r1=507003&r2=507004
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
Tue Feb 13 05:59:17 2007
@@ -368,8 +368,7 @@
getMsgContext().getAxisService());
OperationContext opcontext = OperationContextFactory
.createOperationContext(
-
WSDLConstants.MEP_CONSTANT_OUT_IN, terminateOp);
- opcontext.setParent(getMsgContext().getServiceContext());
+
WSDLConstants.MEP_CONSTANT_OUT_IN, terminateOp,
getMsgContext().getServiceContext());
getConfigurationContext().registerOperationContext(rmMsgCtx.getMessageId(),
opcontext);
getMsgContext().setOperationContext(opcontext);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java?view=diff&rev=507004&r1=507003&r2=507004
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
Tue Feb 13 05:59:17 2007
@@ -33,6 +33,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisEngine;
import org.apache.commons.logging.Log;
@@ -353,7 +354,8 @@
// operation context will be null when doing in a GLOBAL
// handler.
AxisOperation op = ackMsgContext.getAxisOperation();
- OperationContext opCtx = new OperationContext(op);
+ ServiceContext serviceCtx =
ackMsgContext.getServiceContext();
+ OperationContext opCtx = new OperationContext(op,
serviceCtx);
ackRMMsgContext.getMessageContext().setOperationContext(opCtx);
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=507004&r1=507003&r2=507004
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
Tue Feb 13 05:59:17 2007
@@ -365,7 +365,7 @@
newMessageContext.setAxisOperation(operation);
- OperationContext operationContext = new
OperationContext(operation);
+ OperationContext operationContext = new
OperationContext(operation, newMessageContext.getServiceContext());
newMessageContext.setOperationContext(operationContext);
operationContext.addMessageContext(newMessageContext);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java?view=diff&rev=507004&r1=507003&r2=507004
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
Tue Feb 13 05:59:17 2007
@@ -13,6 +13,8 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.engine.Handler.InvocationResponse;
import org.apache.axis2.transport.RequestResponseTransport;
@@ -520,7 +522,9 @@
OperationContext responseMsgOpCtx =
requestMsgOpCtx;
if
(requestMsgOpCtx.getAxisOperation().getMessageReceiver() == null) {
// Generate a new RM In Only
operation
- responseMsgOpCtx = new
OperationContext( msgCtx.getAxisService().getOperation(new
QName("RMInOnlyOperation")));
+ ServiceContext serviceCtx =
responseMessageContext.getServiceContext();
+ AxisOperation op =
msgCtx.getAxisService().getOperation(new QName("RMInOnlyOperation"));
+ responseMsgOpCtx = new
OperationContext(op, serviceCtx);
}
responseMessageContext.setOperationContext(responseMsgOpCtx);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
