Author: chamikara
Date: Thu Dec  1 19:46:14 2005
New Revision: 351566

URL: http://svn.apache.org/viewcvs?rev=351566&view=rev
Log:
Some changes due to recent modifications to Axis2

Modified:
    
webservices/sandesha/trunk/src/org/apache/sandesha2/AcknowledgementManager.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java
    
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/msgprocessors/AcknowledgementProcessor.java
    
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
    
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
    
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
    
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
    
webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.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/AcknowledgementManager.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/AcknowledgementManager.java?rev=351566&r1=351565&r2=351566&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/AcknowledgementManager.java 
(original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/AcknowledgementManager.java 
Thu Dec  1 19:46:14 2005
@@ -49,7 +49,7 @@
        public static void piggybackAckIfPresent(

                        RMMsgContext applicationRMMsgContext) throws 
SandeshaException {

                ConfigurationContext configurationContext = 
applicationRMMsgContext

-                               .getMessageContext().getSystemContext();

+                               .getMessageContext().getConfigurationContext();

                StorageManager storageManager = SandeshaUtil

                                
.getSandeshaStorageManager(configurationContext);

                SenderBeanMgr retransmitterBeanMgr = storageManager


Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java?rev=351566&r1=351565&r2=351566&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java 
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java Thu 
Dec  1 19:46:14 2005
@@ -235,7 +235,7 @@
                if (msgContext == null)

                        return null;

 

-               return msgContext.getSystemContext();

+               return msgContext.getConfigurationContext();

        }

 

        public void setSOAPAction(String SOAPAction) {


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=351566&r1=351565&r2=351566&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 19:46:14 2005
@@ -69,7 +69,7 @@
                                .checkForPossibleFaults(msgContext);

                if (faultMessageContext != null) {

                        ConfigurationContext configurationContext = msgContext

-                                       .getSystemContext();

+                                       .getConfigurationContext();

                        AxisEngine engine = new 
AxisEngine(configurationContext);

                        engine.send(faultMessageContext.getMessageContext());

                        return;

@@ -79,7 +79,7 @@
                                .initializeMessage(msgContext);

 

                ConfigurationContext context = 
rmMessageContext.getMessageContext()

-                               .getSystemContext();

+                               .getConfigurationContext();

 

                ServiceContext serviceContext = msgContext.getServiceContext();

                Object debug = null;

@@ -132,7 +132,7 @@
                        if (sequenceId != null && msgNo > 0) {

                                StorageManager storageManager = SandeshaUtil

                                                
.getSandeshaStorageManager(rmMsgContext

-                                                               
.getMessageContext().getSystemContext());

+                                                               
.getMessageContext().getConfigurationContext());

                                SequencePropertyBeanMgr seqPropMgr = 
storageManager

                                                .getSequencePropretyBeanMgr();

                                SequencePropertyBean receivedMsgsBean = 
seqPropMgr.retrieve(

@@ -220,7 +220,7 @@
 

                        StorageManager storageManager = SandeshaUtil

                                        
.getSandeshaStorageManager(rmMsgContext.getMessageContext()

-                                                       .getSystemContext());

+                                                       
.getConfigurationContext());

                        SequencePropertyBeanMgr seqPropMgr = storageManager

                                        .getSequencePropretyBeanMgr();

                        SequencePropertyBean receivedMsgsBean = 
seqPropMgr.retrieve(


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=351566&r1=351565&r2=351566&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 19:46:14 2005
@@ -55,7 +55,7 @@
 

        public void invoke(MessageContext msgCtx) throws AxisFault {

        

-               ConfigurationContext context = msgCtx.getSystemContext();

+               ConfigurationContext context = msgCtx.getConfigurationContext();

                if (context == null)

                        throw new AxisFault("ConfigurationContext is null");

 


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=351566&r1=351565&r2=351566&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 19:46:14 2005
@@ -29,17 +29,14 @@
 import org.apache.axis2.context.OperationContextFactory;

 import org.apache.axis2.context.ServiceContext;

 import org.apache.axis2.description.AxisService;

-import org.apache.axis2.description.Parameter;

-import org.apache.axis2.description.ParameterImpl;

 import org.apache.axis2.handlers.AbstractHandler;

 import org.apache.axis2.soap.SOAPBody;

 import org.apache.axis2.soap.SOAPEnvelope;

 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.Sandesha2Constants;

 import org.apache.sandesha2.SandeshaException;

 import org.apache.sandesha2.Sandesha2Constants.ClientAPI;

 import org.apache.sandesha2.policy.RMPolicyBean;

@@ -77,7 +74,7 @@
 

        public void invoke(MessageContext msgCtx) throws AxisFault {

 

-               ConfigurationContext context = msgCtx.getSystemContext();

+               ConfigurationContext context = msgCtx.getConfigurationContext();

                if (context == null)

                        throw new AxisFault("ConfigurationContext is null");

 

@@ -349,7 +346,7 @@
 

                        StorageManager storageManager = SandeshaUtil

                                        
.getSandeshaStorageManager(applicationMsg

-                                                       .getSystemContext());

+                                                       
.getConfigurationContext());

 

                        SequencePropertyBeanMgr seqPropMgr = storageManager

                                        .getSequencePropretyBeanMgr();

@@ -366,7 +363,7 @@
                        throw new SandeshaException("Context is null");

 

                StorageManager storageManager = SandeshaUtil

-                               
.getSandeshaStorageManager(applicationMsg.getSystemContext());

+                               
.getSandeshaStorageManager(applicationMsg.getConfigurationContext());

                CreateSeqBeanMgr createSeqMgr = 
storageManager.getCreateSeqBeanMgr();

 

                CreateSeqBean createSeqBean = new 
CreateSeqBean(internalSequenceId,

@@ -407,7 +404,7 @@
                        throw new SandeshaException("Context is null");

 

                StorageManager storageManager = SandeshaUtil

-                               
.getSandeshaStorageManager(msg.getSystemContext());

+                               
.getSandeshaStorageManager(msg.getConfigurationContext());

                SequencePropertyBeanMgr sequencePropertyMgr = storageManager

                                .getSequencePropretyBeanMgr();

 


Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?rev=351566&r1=351565&r2=351566&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
 Thu Dec  1 19:46:14 2005
@@ -58,7 +58,7 @@
 

                StorageManager storageManager = SandeshaUtil

                                
.getSandeshaStorageManager(rmMsgCtx.getMessageContext()

-                                               .getSystemContext());

+                                               .getConfigurationContext());

                SenderBeanMgr retransmitterMgr = storageManager

                                .getRetransmitterBeanMgr();

                SequencePropertyBeanMgr seqPropMgr = storageManager

@@ -169,7 +169,7 @@
 

                StorageManager storageManager = SandeshaUtil

                                
.getSandeshaStorageManager(incomingAckRMMsg.getMessageContext()

-                                               .getSystemContext());

+                                               .getConfigurationContext());

 

                SequencePropertyBeanMgr seqPropMgr = storageManager

                                .getSequencePropretyBeanMgr();


Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=351566&r1=351565&r2=351566&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
 Thu Dec  1 19:46:14 2005
@@ -95,7 +95,7 @@
 

                StorageManager storageManager = SandeshaUtil

                                
.getSandeshaStorageManager(rmMsgCtx.getMessageContext()

-                                               .getSystemContext());

+                                               .getConfigurationContext());

                SequencePropertyBeanMgr seqPropMgr = storageManager

                                .getSequencePropretyBeanMgr();

 

@@ -104,7 +104,7 @@
                                
.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);

                String sequenceId = sequence.getIdentifier().getIdentifier();

                ConfigurationContext configCtx = rmMsgCtx.getMessageContext()

-                               .getSystemContext();

+                               .getConfigurationContext();

                if (configCtx == null)

                        throw new SandeshaException("Configuration Context is 
null");

 

@@ -196,7 +196,7 @@
                                }

 

                                //Starting the invoker if stopped.

-                               
SandeshaUtil.startInvokerIfStopped(msgCtx.getSystemContext());

+                               
SandeshaUtil.startInvokerIfStopped(msgCtx.getConfigurationContext());

 

                        }

                }

@@ -241,7 +241,7 @@
                SOAPFactory factory = 
SOAPAbstractFactory.getSOAPFactory(SandeshaUtil

                                .getSOAPVersion(msgCtx.getEnvelope()));

                StorageManager storageManager = SandeshaUtil

-                               
.getSandeshaStorageManager(msgCtx.getSystemContext());

+                               
.getSandeshaStorageManager(msgCtx.getConfigurationContext());

                SequencePropertyBeanMgr seqPropMgr = storageManager

                                .getSequencePropretyBeanMgr();

 

@@ -249,7 +249,7 @@
                                
.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);

                String sequenceId = sequence.getIdentifier().getIdentifier();

                ConfigurationContext configCtx = rmMsgCtx.getMessageContext()

-                               .getSystemContext();

+                               .getConfigurationContext();

                if (configCtx == null)

                        throw new SandeshaException("Configuration Context is 
null");

 

@@ -319,7 +319,7 @@
                if 
(Sandesha2Constants.WSA.NS_URI_ANONYMOUS.equals(acksTo.getAddress())) {

 

                        AxisEngine engine = new 
AxisEngine(ackRMMsgCtx.getMessageContext()

-                                       .getSystemContext());

+                                       .getConfigurationContext());

 

                        //setting CONTEXT_WRITTEN since acksto is anonymous

                        if (rmMsgCtx.getMessageContext().getOperationContext() 
== null) {


Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?rev=351566&r1=351565&r2=351566&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
 Thu Dec  1 19:46:14 2005
@@ -70,7 +70,7 @@
                        String newSequenceId = SequenceManager

                                        .setupNewSequence(createSeqRMMsg);

                        ConfigurationContext context = 
createSeqRMMsg.getMessageContext()

-                                       .getSystemContext();

+                                       .getConfigurationContext();

                        if (newSequenceId == null)

                                throw new AxisFault(

                                                "Internal error - Generated 
sequence id is null");


Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?rev=351566&r1=351565&r2=351566&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
 Thu Dec  1 19:46:14 2005
@@ -80,7 +80,7 @@
                        throw new SandeshaException("New sequence Id is null");

 

                ConfigurationContext configCtx = createSeqResponseRMMsgCtx

-                               .getMessageContext().getSystemContext();

+                               .getMessageContext().getConfigurationContext();

                String createSeqMsgId = 
createSeqResponseRMMsgCtx.getMessageContext()

                                .getRelatesTo().getValue();

 


Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?rev=351566&r1=351565&r2=351566&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
 Thu Dec  1 19:46:14 2005
@@ -63,7 +63,7 @@
                if (sequenceId==null || "".equals(sequenceId))

                        throw new SandeshaException ("Invalid sequence id");

                

-               ConfigurationContext context = 
terminateSeqMsg.getSystemContext();

+               ConfigurationContext context = 
terminateSeqMsg.getConfigurationContext();

 

                

                TerminateManager.terminateReceivingSide(context,sequenceId);


Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java?rev=351566&r1=351565&r2=351566&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java 
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java 
Thu Dec  1 19:46:14 2005
@@ -142,7 +142,7 @@
                        throw new SandeshaException(
                                        "CreateSequence message does not have a 
CreateSequence part");
 
-               ConfigurationContext context = 
messageContext.getSystemContext();
+               ConfigurationContext context = 
messageContext.getConfigurationContext();
                StorageManager storageManager = (StorageManager) SandeshaUtil
                                .getSandeshaStorageManager(context);
                if (storageManager == null)
@@ -275,7 +275,7 @@
                }
 
                StorageManager storageManager = SandeshaUtil
-                               
.getSandeshaStorageManager(messageContext.getSystemContext());
+                               
.getSandeshaStorageManager(messageContext.getConfigurationContext());
 
                NextMsgBeanMgr mgr = storageManager.getNextMsgBeanMgr();
                SOAPEnvelope envelope = messageContext.getEnvelope();
@@ -392,7 +392,7 @@
 
                        StorageManager storageManager = SandeshaUtil
                                        
.getSandeshaStorageManager(referenceMessage
-                                                       .getSystemContext());
+                                                       
.getConfigurationContext());
 
                        //setting contexts.
                        faultMsgContext.setAxisServiceGroup(referenceMessage

Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java?rev=351566&r1=351565&r2=351566&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
 (original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
 Thu Dec  1 19:46:14 2005
@@ -40,7 +40,7 @@
                MessageContext messageContext = SandeshaUtil

                                .getStoredMessageContext(storedKey);

 

-               if (messageContext.getSystemContext() == null)

+               if (messageContext.getConfigurationContext() == null)

                        return retransmitterBean;

 

                RMPolicyBean policyBean = (RMPolicyBean) messageContext


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=351566&r1=351565&r2=351566&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 19:46:14 2005
@@ -31,6 +31,7 @@
 import org.apache.axis2.context.ServiceContext;

 import org.apache.axis2.description.AxisOperation;

 import org.apache.axis2.description.AxisOperationFactory;

+import org.apache.axis2.description.Flow;

 import org.apache.axis2.soap.SOAPEnvelope;

 import org.apache.axis2.soap.SOAPFactory;

 import org.apache.sandesha2.Sandesha2Constants;

@@ -84,7 +85,7 @@
                                .getMessageContext();

                if (applicationMsgContext == null)

                        throw new SandeshaException("Application message is 
null");

-               ConfigurationContext context = 
applicationMsgContext.getSystemContext();

+               ConfigurationContext context = 
applicationMsgContext.getConfigurationContext();

                if (context == null)

                        throw new SandeshaException("Configuration Context is 
null");

 

@@ -101,7 +102,7 @@
                        // except for configCtx).

                        AxisOperation createSequenceOperation = 
AxisOperationFactory

                                        
.getAxisOperation(AxisOperation.MEP_CONSTANT_OUT_IN);

-

+                       

                        createSeqmsgContext = 
SandeshaUtil.createNewRelatedMessageContext(

                                        applicationRMMsg, 
createSequenceOperation);

                        OperationContext createSeqOpCtx = createSeqmsgContext

@@ -246,7 +247,7 @@
 

                terminateMessage.setMessageID(SandeshaUtil.getUUID());

 

-               ConfigurationContext configCtx = 
referenceMessage.getSystemContext();

+               ConfigurationContext configCtx = 
referenceMessage.getConfigurationContext();

                if (configCtx == null)

                        throw new SandeshaException("Configuration Context is 
null");

 

@@ -369,7 +370,7 @@
                sequenceAck.setIdentifier(id);

 

                ConfigurationContext ctx = applicationMsg.getMessageContext()

-                               .getSystemContext();

+                               .getConfigurationContext();

                StorageManager storageManager = SandeshaUtil

                                .getSandeshaStorageManager(ctx);

                SequencePropertyBeanMgr seqPropMgr = storageManager


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=351566&r1=351565&r2=351566&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 19:46:14 2005
@@ -472,7 +472,7 @@
                        MessageContext referenceMessage = referenceRMMessage

                                        .getMessageContext();

                        ConfigurationContext configContext = referenceMessage

-                                       .getSystemContext();

+                                       .getConfigurationContext();

                        AxisConfiguration axisConfiguration = 
configContext.getAxisConfiguration();

                        

                        MessageContext newMessageContext = new 
MessageContext(configContext);


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=351566&r1=351565&r2=351566&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 19:46:14 2005
@@ -58,7 +58,7 @@
                try {

                        storageManager = SandeshaUtil

                                        
.getSandeshaStorageManager(createSequenceMsg

-                                                       
.getMessageContext().getSystemContext());

+                                                       
.getMessageContext().getConfigurationContext());

                } catch (SandeshaException e) {

                        e.printStackTrace();

                }

@@ -96,11 +96,11 @@
                        MessageContext firstAplicationMsgCtx, String 
iternalSequenceId)

                        throws SandeshaException {

 

-               AbstractContext context = 
firstAplicationMsgCtx.getSystemContext();

+               AbstractContext context = 
firstAplicationMsgCtx.getConfigurationContext();

  

                StorageManager storageManager = SandeshaUtil

                                .getSandeshaStorageManager(firstAplicationMsgCtx

-                                               .getSystemContext());

+                                               .getConfigurationContext());

 

                SequencePropertyBeanMgr seqPropMgr = storageManager

                                .getSequencePropretyBeanMgr();


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=351566&r1=351565&r2=351566&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 19:46:14 2005
@@ -142,7 +142,7 @@
 

                                                try {

                                                        //Invoking the message.

-                                                       new 
AxisEngine(msgToInvoke.getSystemContext())

+                                                       new 
AxisEngine(msgToInvoke.getConfigurationContext())

                                                                        
.receive(msgToInvoke);

 

                                                        ServiceContext 
serviceContext = msgToInvoke


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=351566&r1=351565&r2=351566&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 19:46:14 2005
@@ -133,7 +133,7 @@
                                                        //terminate sending 
side.

                                                        TerminateSequence 
terminateSequence = (TerminateSequence) 
rmMsgCtx.getMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ);

                                                        String sequenceID = 
terminateSequence.getIdentifier().getIdentifier();

-                                                       ConfigurationContext 
configContext = msgCtx.getSystemContext();

+                                                       ConfigurationContext 
configContext = msgCtx.getConfigurationContext();

                                                        

                                                        
TerminateManager.terminateSendingSide(configContext,sequenceID);

                                                }

@@ -217,7 +217,7 @@
                if (responsePresent) {

                        //create the response

                        MessageContext response = new MessageContext(msgCtx

-                                       .getSystemContext(), 
msgCtx.getSessionContext(), msgCtx

+                                       .getConfigurationContext(), 
msgCtx.getSessionContext(), msgCtx

                                        .getTransportIn(), 
msgCtx.getTransportOut());

                        response.setProperty(MessageContext.TRANSPORT_IN, msgCtx

                                        
.getProperty(MessageContext.TRANSPORT_IN));

@@ -256,7 +256,7 @@
                        }

 

                        if (resenvelope != null) {

-                               AxisEngine engine = new 
AxisEngine(msgCtx.getSystemContext());

+                               AxisEngine engine = new 
AxisEngine(msgCtx.getConfigurationContext());

                                response.setEnvelope(resenvelope);

                                engine.receive(response);

                        }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to