Author: chamikara
Date: Thu Dec 1 01:04:08 2005
New Revision: 350213
URL: http://svn.apache.org/viewcvs?rev=350213&view=rev
Log:
Changes to comply with recent changes of Axis2
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?rev=350213&r1=350212&r2=350213&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
Thu Dec 1 01:04:08 2005
@@ -84,7 +84,7 @@
ServiceContext serviceContext = msgContext.getServiceContext();
Object debug = null;
if (serviceContext != null) {
- debug =
serviceContext.getProperty(ClientAPI.SANDESHA_DEBUG_MODE);
+ debug =
msgContext.getProperty(ClientAPI.SANDESHA_DEBUG_MODE);
if (debug != null && "on".equals(debug)) {
System.out.println("DEBUG:
SandeshaGlobalInHandler got a '"
+
SandeshaUtil.getMessageTypeString(rmMessageContext
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?rev=350213&r1=350212&r2=350213&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
Thu Dec 1 01:04:08 2005
@@ -87,7 +87,7 @@
ServiceContext serviceContext = msgCtx.getServiceContext();
Object debug = null;
if (serviceContext != null) {
- debug =
serviceContext.getProperty(ClientAPI.SANDESHA_DEBUG_MODE);
+ debug =
msgCtx.getProperty(ClientAPI.SANDESHA_DEBUG_MODE);
if (debug != null && "on".equals(debug)) {
System.out.println("DEBUG: SandeshaInHandler
got a '"
+
SandeshaUtil.getMessageTypeString(rmMsgCtx
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java?rev=350213&r1=350212&r2=350213&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
Thu Dec 1 01:04:08 2005
@@ -37,6 +37,7 @@
import org.apache.axis2.soap.SOAPFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.derby.iapi.util.Operator;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.SandeshaException;
@@ -95,9 +96,10 @@
msgCtx.setProperty(Sandesha2Constants.APPLICATION_PROCESSING_DONE, "true");
ServiceContext serviceContext = msgCtx.getServiceContext();
+ OperationContext operationContext =
msgCtx.getOperationContext();
Object debug = null;
if (serviceContext != null) {
- debug =
serviceContext.getProperty(ClientAPI.SANDESHA_DEBUG_MODE);
+ debug =
msgCtx.getProperty(ClientAPI.SANDESHA_DEBUG_MODE);
if (debug != null && "on".equals(debug)) {
System.out.println("DEBUG: SandeshaOutHandler
got a '"
+
SandeshaUtil.getMessageTypeString(rmMsgCtx
@@ -167,7 +169,8 @@
"TO End Point Reference is not
set correctly. This is a must for the sandesha client side.");
internalSequenceId = toEPR.getAddress();
- String sequenceKey = (String) context
+ OperationContext opContext =
msgCtx.getOperationContext();
+ String sequenceKey = (String) msgCtx
.getProperty(ClientAPI.SEQUENCE_KEY);
if (sequenceKey != null)
internalSequenceId = internalSequenceId +
sequenceKey;
@@ -211,7 +214,7 @@
String acksTo = null;
if (serviceContext != null) {
- acksTo = (String) serviceContext
+ acksTo = (String) msgCtx
.getProperty(ClientAPI.AcksTo);
}
@@ -500,9 +503,9 @@
} else {
//client side
- ServiceContext serviceContext = msg.getServiceContext();
- if (serviceContext != null) {
- Object obj =
serviceContext.getProperty(ClientAPI.LAST_MESSAGE);
+ OperationContext operationContext =
msg.getOperationContext();
+ if (operationContext != null) {
+ Object obj =
msg.getProperty(ClientAPI.LAST_MESSAGE);
if (obj != null && "true".equals(obj)) {
lastMessage = true;
sequence.setLastMessage(new
LastMessage(factory));
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java?rev=350213&r1=350212&r2=350213&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
Thu Dec 1 01:04:08 2005
@@ -143,10 +143,10 @@
CreateSequence createSequencePart = new CreateSequence(factory);
//Adding sequence offer - if present
- ServiceContext serviceContext = applicationMsgContext
- .getServiceContext();
- if (serviceContext != null) {
- String offeredSequence = (String) serviceContext
+ OperationContext operationcontext = applicationMsgContext
+ .getOperationContext();
+ if (operationcontext != null) {
+ String offeredSequence = (String) applicationMsgContext
.getProperty(ClientAPI.OFFERED_SEQUENCE_ID);
if (offeredSequence != null &&
!"".equals(offeredSequence)) {
SequenceOffer offerPart = new
SequenceOffer(factory);
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java?rev=350213&r1=350212&r2=350213&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
Thu Dec 1 01:04:08 2005
@@ -533,6 +533,7 @@
referenceMessage
.getProperty(Sandesha2Constants.WSP.RM_POLICY_BEAN));
+ //newMessageContext.
return newMessageContext;
} catch (AxisFault e) {
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java?rev=350213&r1=350212&r2=350213&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
Thu Dec 1 01:04:08 2005
@@ -97,7 +97,7 @@
throws SandeshaException {
AbstractContext context =
firstAplicationMsgCtx.getSystemContext();
-
+
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(firstAplicationMsgCtx
.getSystemContext());
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java?rev=350213&r1=350212&r2=350213&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
Thu Dec 1 01:04:08 2005
@@ -149,7 +149,7 @@
.getServiceContext();
Object debug = null;
if (serviceContext !=
null) {
- debug =
serviceContext
+ debug =
msgToInvoke
.getProperty(ClientAPI.SANDESHA_DEBUG_MODE);
if (debug !=
null && "on".equals(debug)) {
System.out
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java?rev=350213&r1=350212&r2=350213&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java Thu
Dec 1 01:04:08 2005
@@ -92,7 +92,7 @@
.getServiceContext();
Object debug = null;
if (serviceContext != null) {
- debug = serviceContext
+ debug = msgCtx
.getProperty(ClientAPI.SANDESHA_DEBUG_MODE);
if (debug != null &&
"on".equals(debug)) {
System.out
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
