axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r350227 - in /webservices/axis2/trunk/java/modules: addressing/src/org/apache/axis2/handlers/addressing/ core/src/org/apache/axis2/client/ core/src/org/apache/axis2/context/ core/src/org/apache/axis2/deployment/ core/src/org/apache/axis2/de...
Date Thu, 01 Dec 2005 11:05:46 GMT
Author: deepal
Date: Thu Dec  1 03:04:39 2005
New Revision: 350227

URL: http://svn.apache.org/viewcvs?rev=350227&view=rev
Log:
Fixing the JIRA 309 ,

as in Inflow the out flow has divided into two parts , in the out path first it will run the
operation chain , after that the global out chain will be invoked , and the global phase list
consist of PolicyDetermination and MessageOut.

did some refactoring 

Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/TestConstants.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
Thu Dec  1 03:04:39 2005
@@ -96,7 +96,7 @@
                 Constants.SERVICE_GROUP_ID, Constants.AXIS2_NAMESPACE_PREFIX));
         if (serviceGroupId != null) {
             String groupId = serviceGroupId.getText();
-            ServiceGroupContext serviceGroupContext = msgContext.getSystemContext().getServiceGroupContext(groupId);
+            ServiceGroupContext serviceGroupContext = msgContext.getConfigurationContext().getServiceGroupContext(groupId);
             if (serviceGroupContext == null) {
                 throw new AxisFault("Invalid Service Group Id." + groupId);
             }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
Thu Dec  1 03:04:39 2005
@@ -395,12 +395,12 @@
     public MessageContext send(MessageContext msgctx,
                                TransportInDescription transportIn) throws AxisFault {
 
-        AxisEngine engine = new AxisEngine(msgctx.getSystemContext());
+        AxisEngine engine = new AxisEngine(msgctx.getConfigurationContext());
         engine.send(msgctx);
 
         //create the response
         MessageContext response =
-                new MessageContext(msgctx.getSystemContext(),
+                new MessageContext(msgctx.getConfigurationContext(),
                         msgctx.getSessionContext(),
                         msgctx.getTransportIn(),
                         msgctx.getTransportOut());
@@ -418,7 +418,7 @@
 
         if (resenvelope != null) {
             response.setEnvelope(resenvelope);
-            engine = new AxisEngine(msgctx.getSystemContext());
+            engine = new AxisEngine(msgctx.getConfigurationContext());
             engine.receive(response);
         } else {
             throw new AxisFault(Messages.getMessage("blockingInvocationExpectsResponse"));

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
Thu Dec  1 03:04:39 2005
@@ -556,7 +556,7 @@
         this.serviceContextID = serviceContextID;
     }
 
-    public ConfigurationContext getSystemContext() {
+    public ConfigurationContext getConfigurationContext() {
         return configurationContext;
     }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
Thu Dec  1 03:04:39 2005
@@ -264,6 +264,7 @@
         }
         try {
             ((AxisConfigurationImpl) axisConfig).setRepository(axis2repository);
+            validateSystemPredefinedPhases();
             engageModules();
         } catch (AxisFault axisFault) {
             log.info(Messages.getMessage(DeploymentErrorMsgs.MODULE_VAL_FAILED, axisFault.getMessage()));
@@ -350,10 +351,10 @@
         } catch (Exception e) {
             throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.INVALID_PHASE));
         }
-
         ((AxisConfigurationImpl) axisConfig).setInPhasesUptoAndIncludingPostDispatch(
                 phasesinfo.getGlobalInflow());
         ((AxisConfigurationImpl) axisConfig).setInFaultPhases(phasesinfo.getIN_FaultPhases());
+        axisConfig.setGlobalOutPhase(phasesinfo.getGlobalOutPhaseList());
     }
 
     public ModuleDescription getModule(QName moduleName) throws AxisFault {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml Thu
Dec  1 03:04:39 2005
@@ -134,6 +134,7 @@
         <!--      user can add his own phases to this area  -->
         <phase name="userphase1"/>
         <!--system predefined phase-->
+        <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
     </phaseOrder>

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
Thu Dec  1 03:04:39 2005
@@ -119,11 +119,34 @@
         return desc;
     }
 
+    public ArrayList getGlobalOutPhaseList() throws DeploymentException {
+        /**
+         * I have assumed that     PolicyDetermination and  MessageProcessing are global
out phase
+         */
+        ArrayList globalPhaseList = new ArrayList();
+        for (int i = 0; i < OUTPhases.size(); i++) {
+            Phase phase = (Phase) OUTPhases.get(i);
+            String phaseName = phase.getPhaseName();
+            if (PhaseMetadata.PHASE_POLICY_DETERMINATION.equals(phaseName) ||
+                    PhaseMetadata.PHASE_MESSAGE_OUT.equals(phaseName)) {
+                globalPhaseList.add(copyPhase(phase));
+            }
+        }
+        return globalPhaseList;
+    }
+
     public ArrayList getOperationOutPhases() throws DeploymentException {
         ArrayList oprationOUTPhases = new ArrayList();
         for (int i = 0; i < OUTPhases.size(); i++) {
             Phase phase = (Phase) OUTPhases.get(i);
-            oprationOUTPhases.add(copyPhase(phase));
+            String phaseName = phase.getPhaseName();
+            if (PhaseMetadata.PHASE_POLICY_DETERMINATION.equals(phaseName) ||
+                    PhaseMetadata.PHASE_MESSAGE_OUT.equals(phaseName)) {
+                //todo pls check this
+            } else {
+                oprationOUTPhases.add(copyPhase(phase));
+            }
+
         }
         return oprationOUTPhases;
     }
@@ -146,7 +169,7 @@
         return oprationOUT_FaultPhases;
     }
 
-    public void setOperationPhases(AxisOperation axisOperation) throws DeploymentException{
+    public void setOperationPhases(AxisOperation axisOperation) throws DeploymentException
{
         if (axisOperation != null) {
             axisOperation.setRemainingPhasesInFlow(getOperationInPhases());
             axisOperation.setPhasesOutFlow(getOperationOutPhases());
@@ -159,7 +182,6 @@
      * To copy phase informatoin from one to another
      *
      * @param phase
-     * @return
      */
     private Phase copyPhase(Phase phase) throws DeploymentException {
         Phase newPhase = new Phase(phase.getPhaseName());

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
Thu Dec  1 03:04:39 2005
@@ -514,7 +514,7 @@
         } else {
             // So this message is part of an ongoing MEP
             //			operationContext =
-            ConfigurationContext configContext = msgContext.getSystemContext();
+            ConfigurationContext configContext = msgContext.getConfigurationContext();
             operationContext =
                     configContext.getOperationContext( msgContext.getRelatesTo().getValue());
 
@@ -548,7 +548,7 @@
         } else {
             // So this message is part of an ongoing MEP
             //			operationContext =
-            ConfigurationContext configContext = msgContext.getSystemContext();
+            ConfigurationContext configContext = msgContext.getConfigurationContext();
             operationContext = configContext.getOperationContext(msgContext.getRelatesTo().getValue());
 
             if (null == operationContext) {
@@ -564,7 +564,7 @@
     }
 
     public void registerOperationContext(MessageContext msgContext, OperationContext operationContext)
throws AxisFault {
-        msgContext.getSystemContext().registerOperationContext(
+        msgContext.getConfigurationContext().registerOperationContext(
                 msgContext.getMessageID(), operationContext);
         operationContext.addMessageContext(msgContext);
         msgContext.setOperationContext(operationContext);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
Thu Dec  1 03:04:39 2005
@@ -657,11 +657,11 @@
             serviceContext =
                     new ServiceContext(this, msgContext.getServiceGroupContext());
             //TODO Once the ServiceContext is bound to an incomming serviceContext ID(like
a cookie,reference Property) FIX this
-            //			msgContext.getSystemContext().registerServiceContext(serviceContext.getServiceContextID(),
+            //			msgContext.getConfigurationContext().registerServiceContext(serviceContext.getServiceContextID(),
             // serviceContext);
         } else {
             serviceContext =
-                    msgContext.getSystemContext()
+                    msgContext.getConfigurationContext()
                             .getServiceContext(msgContext.getServiceContextID());
         }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
Thu Dec  1 03:04:39 2005
@@ -63,7 +63,7 @@
         if (msgctx.getRelatesTo() != null) {
             String relatesTo = msgctx.getRelatesTo().getValue();
             if (relatesTo != null || "".equals(relatesTo)) {
-                OperationContext operationContext = msgctx.getSystemContext().getOperationContext(relatesTo);
+                OperationContext operationContext = msgctx.getConfigurationContext().getOperationContext(relatesTo);
                 if (operationContext != null) {
                     msgctx.setAxisOperation(operationContext.getAxisOperation());
                     msgctx.setOperationContext(operationContext);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
Thu Dec  1 03:04:39 2005
@@ -72,7 +72,7 @@
             if (values[0] != null) {
                 serviceName = new QName(values[0]);
                 AxisConfiguration registry =
-                        messageContext.getSystemContext().getAxisConfiguration();
+                        messageContext.getConfigurationContext().getAxisConfiguration();
                 return registry.getService(serviceName.getLocalPart());
 
             }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Thu Dec  1 03:04:39 2005
@@ -117,6 +117,11 @@
      */
     public ArrayList getInPhasesUptoAndIncludingPostDispatch();
 
+    //to get the out flow correpodning to the global out flow;
+    public ArrayList getGlobalOutPhases();
+
+    public void setGlobalOutPhase(ArrayList outPhases);
+
     public ArrayList getInFaultFlow();
 
     public Hashtable getFaultyServices();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
Thu Dec  1 03:04:39 2005
@@ -330,21 +330,21 @@
         return serviceGroups.values().iterator();
     }
 
-    public void setOutPhases(ArrayList outPhases) {
-        this.outPhases = outPhases;
+    public ArrayList getInPhasesUptoAndIncludingPostDispatch() {
+        return inPhasesUptoAndIncludingPostDispatch;
     }
 
+    //to get the out flow correpodning to the global out flow;
+    public ArrayList getGlobalOutPhases() {
+       return this.outPhases;
+    }
 
-    public ArrayList getInPhasesUptoAndIncludingPostDispatch() {
-        return inPhasesUptoAndIncludingPostDispatch;
+    public void setGlobalOutPhase(ArrayList outPhases) {
+        this.outPhases = outPhases;
     }
 
     public void setInPhasesUptoAndIncludingPostDispatch(ArrayList inPhasesUptoAndIncludingPostDispatch)
{
         this.inPhasesUptoAndIncludingPostDispatch = inPhasesUptoAndIncludingPostDispatch;
-    }
-
-    public ArrayList getOutFlow() {
-        return outPhases;
     }
 
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
Thu Dec  1 03:04:39 2005
@@ -21,7 +21,6 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.OperationContext;
 import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.om.OMAbstractFactory;
@@ -31,7 +30,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.*;
 import java.util.ArrayList;
 
 /**
@@ -78,6 +76,10 @@
             resumeInvocationPhases(phases, msgContext);
         } else {
             invokePhases(phases, msgContext);
+            ArrayList globaleOutphase = msgContext.getConfigurationContext().
+                    getAxisConfiguration().getGlobalOutPhases();
+            //invoking global phase.
+            invokePhases(globaleOutphase, msgContext);
         }
 
         if (!msgContext.isPaused()) {
@@ -100,13 +102,13 @@
      */
     public void receive(MessageContext msgContext) throws AxisFault {
 
-        ConfigurationContext sysCtx = msgContext.getSystemContext();
-        AxisOperation axisOperation = null;
+        ConfigurationContext sysCtx = msgContext.getConfigurationContext();
+        AxisOperation axisOperation;
         ArrayList preCalculatedPhases =
                 sysCtx
                         .getAxisConfiguration()
                         .getInPhasesUptoAndIncludingPostDispatch();
-        ArrayList operationSpecificPhases = null;
+        ArrayList operationSpecificPhases;
 
         if (msgContext.isPaused()) {
             // the message has paused, so rerun them from the position they stoped. The Handler
@@ -194,7 +196,7 @@
         if (opContext == null) {
             //If we do not have a OperationContext that means this may be a incoming 
             //Dual Channel response. So try to dispatch the Service 
-            ConfigurationContext sysCtx = msgContext.getSystemContext();
+            ConfigurationContext sysCtx = msgContext.getConfigurationContext();
             ArrayList phases =
                     sysCtx
                             .getAxisConfiguration()
@@ -262,7 +264,7 @@
         faultContext.setOperationContext(processingContext.getOperationContext());
         faultContext.setProcessingFault(true);
         faultContext.setServerSide(true);
-        SOAPEnvelope envelope = null;
+        SOAPEnvelope envelope;
 
         faultContext.setProperty(HTTPConstants.HTTPOutTransportInfo,
                 processingContext.getProperty(HTTPConstants.HTTPOutTransportInfo));
@@ -327,7 +329,7 @@
             SOAPFault fault,
             Throwable e) {
         SOAPProcessingException soapException = null;
-        String soapNamespaceURI = "";
+        String soapNamespaceURI;
 
         // get the current SOAP version
         if (!context.isSOAP11()) {
@@ -342,7 +344,7 @@
         } else if (e instanceof AxisFault) {
             if (e.getCause() instanceof SOAPProcessingException) {
                 soapException = (SOAPProcessingException) e.getCause();
-            } 
+            }
         } else {
             // we have recd an instance of just the Exception class
         }
@@ -355,7 +357,7 @@
         } else if (soapException != null) {
             soapFaultCode = soapException.getFaultCode();
         } else if (e instanceof AxisFault) {
-            soapFaultCode = ((AxisFault)e).getFaultCode();
+            soapFaultCode = ((AxisFault) e).getFaultCode();
         }
 
         // defaulting to fault code Sender, if no message is available
@@ -373,7 +375,7 @@
         } else if (soapException != null) {
             message = soapException.getMessage();
         } else if (e instanceof AxisFault) {
-            message = ((AxisFault)e).getMessage();
+            message = ((AxisFault) e).getMessage();
         }
 
         // defaulting to reason, unknown, if no reason is available
@@ -415,7 +417,7 @@
     }
 
     private void verifyContextBuilt(MessageContext msgctx) throws AxisFault {
-        if (msgctx.getSystemContext() == null) {
+        if (msgctx.getConfigurationContext() == null) {
             throw new AxisFault(
                     Messages.getMessage("cannotBeNullConfigurationContext"));
         }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
Thu Dec  1 03:04:39 2005
@@ -68,7 +68,7 @@
             axisOperation.registerOperationContext(msgContext, operationContext);
 
             //  fill the service group context and service context info
-            msgContext.getSystemContext().
+            msgContext.getConfigurationContext().
                     fillServiceContextAndServiceGroupContext(msgContext);
         }
     }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
Thu Dec  1 03:04:39 2005
@@ -65,7 +65,7 @@
             if (values[0] != null) {
                 serviceName = values[0];
                 AxisConfiguration registry =
-                        messageContext.getSystemContext().getAxisConfiguration();
+                        messageContext.getConfigurationContext().getAxisConfiguration();
                 return registry.getService(serviceName);
             }
         }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
Thu Dec  1 03:04:39 2005
@@ -78,7 +78,7 @@
                 if (values[0] != null) {
                     serviceName = values[0];
                     AxisConfiguration registry =
-                            messageContext.getSystemContext().getAxisConfiguration();
+                            messageContext.getConfigurationContext().getAxisConfiguration();
                     return registry.getService(serviceName);
                 }
             }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java
Thu Dec  1 03:04:39 2005
@@ -166,8 +166,22 @@
                     break;
                 }
                 case PhaseMetadata.OUT_FLOW: {
+                    ArrayList phases = new ArrayList();
+                    Iterator itr_ops = axisOperation.getPhasesOutFlow().iterator();
+                    while (itr_ops.hasNext()) {
+                        Object o = itr_ops.next();
+                        phases.add(o);
+                    }
+                    if (axisConfig != null) {
+                        Iterator itr_axis_config =
+                                axisConfig.getGlobalOutPhases().iterator();
+                        while (itr_axis_config.hasNext()) {
+                            Object o = itr_axis_config.next();
+                            phases.add(o);
+                        }
+                    }
                     phaseHolder =
-                            new PhaseHolder(axisOperation.getPhasesOutFlow());
+                            new PhaseHolder(phases);
                     break;
                 }
                 case PhaseMetadata.FAULT_IN_FLOW: {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
Thu Dec  1 03:04:39 2005
@@ -59,7 +59,7 @@
                 }
             }
         };
-        messageCtx.getSystemContext().getThreadPool().execute(theadedTask);
+        messageCtx.getConfigurationContext().getThreadPool().execute(theadedTask);
     }
 
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
Thu Dec  1 03:04:39 2005
@@ -117,7 +117,7 @@
         } else if (
             scopeParam != null
                 && Constants.APPLICATION_SCOPE.equals(scopeParam.getValue())) {
-            ConfigurationContext globalContext = msgContext.getSystemContext();
+            ConfigurationContext globalContext = msgContext.getConfigurationContext();
             synchronized (globalContext) {
                 Object obj =
                     globalContext.getProperty(serviceName.getLocalPart());

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Thu Dec  1 03:04:39 2005
@@ -876,7 +876,7 @@
     private boolean isProxyListed(MessageContext msgCtx) throws AxisFault {
         boolean returnValue = false;
         Parameter par = null;
-        proxyOutSetting = msgCtx.getSystemContext()
+        proxyOutSetting = msgCtx.getConfigurationContext()
                 .getAxisConfiguration()
                 .getTransportOut(new QName(Constants.TRANSPORT_HTTP));
         if (proxyOutSetting != null) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
Thu Dec  1 03:04:39 2005
@@ -188,7 +188,7 @@
     }
 
     /**
-     * Method getSystemContext
+     * Method getConfigurationContext
      *
      * @return the system context
      */

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Thu Dec
 1 03:04:39 2005
@@ -54,7 +54,7 @@
 
     public static MessageContext createOutMessageContext(MessageContext inMessageContext)
throws AxisFault {
         MessageContext newmsgCtx =
-                new MessageContext(inMessageContext.getSystemContext(),
+                new MessageContext(inMessageContext.getConfigurationContext(),
                         inMessageContext.getSessionContext(),
                         inMessageContext.getTransportIn(),
                         inMessageContext.getTransportOut());
@@ -189,7 +189,7 @@
         if (serviceNameAndGroup != null) {
             String[] serviceNameAndGroupStrings = serviceNameAndGroup.split(":");
             AxisConfiguration registry =
-                    messageContext.getSystemContext().getAxisConfiguration();
+                    messageContext.getConfigurationContext().getAxisConfiguration();
             if (serviceNameAndGroupStrings[0] != null) {
                 AxisServiceGroup axisServiceGroup = registry.getServiceGroup(serviceNameAndGroupStrings[0]);
                 String serviceNameStr = "";

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java
(original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java
Thu Dec  1 03:04:39 2005
@@ -97,7 +97,7 @@
 //            ((AxisConfigurationImpl) axisSytem).setInPhases(inPhase);
             ((AxisConfigurationImpl) axisSytem).setInFaultPhases(inPhase);
             ((AxisConfigurationImpl) axisSytem).setOutFaultPhases(inPhase);
-            ((AxisConfigurationImpl) axisSytem).setOutPhases(inPhase);
+            ((AxisConfigurationImpl) axisSytem).setGlobalOutPhase(inPhase);
 
             Handler han = null;
             PhaseHolder ph = new PhaseHolder(inPhase);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/TestConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/TestConstants.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/TestConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/TestConstants.java
Thu Dec  1 03:04:39 2005
@@ -29,7 +29,7 @@
 public interface TestConstants {
     public static final EndpointReference targetEPR = new EndpointReference(
             "http://127.0.0.1:" + (UtilServer.TESTING_PORT)
-                    + "/axis/services/EchoXMLService/echoOMElement");
+                    + "/axis2/services/EchoXMLService/echoOMElement");
 
     public static final QName serviceName = new QName("EchoXMLService");
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=350227&r1=350226&r2=350227&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
Thu Dec  1 03:04:39 2005
@@ -43,7 +43,7 @@
         receiver.getSystemContext().getAxisConfiguration().addService(service);
         Utils.resolvePhases(receiver.getSystemContext().getAxisConfiguration(),
                 service);
-//        ServiceGroupContext serviceGroupContext = service.getParent().getServiceGroupContext(receiver.getSystemContext());
+//        ServiceGroupContext serviceGroupContext = service.getParent().getServiceGroupContext(receiver.getConfigurationContext());
     }
 
     public static synchronized void unDeployService(QName service) throws AxisFault {



Mime
View raw message