You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2005/10/05 07:57:35 UTC

svn commit: r295001 - in /webservices/axis2/trunk/java/modules/core: src/org/apache/axis2/ src/org/apache/axis2/clientapi/ src/org/apache/axis2/util/ test/org/apache/axis2/engine/

Author: deepal
Date: Tue Oct  4 22:57:22 2005
New Revision: 295001

URL: http://svn.apache.org/viewcvs?rev=295001&view=rev
Log:
The idea of creating operation context using operationContextfactory is no need , since we have only one operationContexts and we handle MEPs using different OperationDescriptions.


Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/InstanceDispatcher.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/InstanceDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/InstanceDispatcher.java?rev=295001&r1=295000&r2=295001&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/InstanceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/InstanceDispatcher.java Tue Oct  4 22:57:22 2005
@@ -62,8 +62,8 @@
             return;
 
         } else { //  2. if null, create new opCtxt
-            operationContext =
-                    OperationContextFactory.createOperationContext(operationDesc.getAxisSpecifMEPConstant(), operationDesc);
+            operationContext =new OperationContext(operationDesc);
+//            operationContext = OperationContextFactory.createOperationContext(operationDesc.getAxisSpecifMEPConstant(), operationDesc);
             operationDesc.registerOperationContext(msgContext, operationContext);
 
             //  fill the service group context and service context info

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java?rev=295001&r1=295000&r2=295001&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java Tue Oct  4 22:57:22 2005
@@ -170,9 +170,11 @@
 
             checkTransport(msgctx);
             //find and set the Operation Context
-            OperationContext operationContext = OperationContextFactory.createOperationContext(WSDLConstants.MEP_CONSTANT_IN_OUT,
-                    axisop,
-                    serviceContext);
+//            OperationContext operationContext = OperationContextFactory.createOperationContext(WSDLConstants.MEP_CONSTANT_IN_OUT,
+//                    axisop,
+//                    serviceContext);
+
+            OperationContext operationContext = new OperationContext(axisop,serviceContext);
             axisop.registerOperationContext(msgctx,operationContext);
 
             //Send the SOAP Message and receive a response                
@@ -400,9 +402,11 @@
 
         public void doWork() {
             try {
-                msgctx.setOperationContext(OperationContextFactory.createOperationContext(WSDLConstants.MEP_CONSTANT_IN_OUT,
-                        axisop,
-                        serviceContext));
+                OperationContext opcontxt = new OperationContext(axisop,serviceContext);
+//                msgctx.setOperationContext(OperationContextFactory.createOperationContext(WSDLConstants.MEP_CONSTANT_IN_OUT,
+//                        axisop,
+//                        serviceContext));
+                msgctx.setOperationContext(opcontxt);
                 msgctx.setServiceContext(serviceContext);
                 //send the request and wait for reponse
                 MessageContext response =

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=295001&r1=295000&r2=295001&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 Tue Oct  4 22:57:22 2005
@@ -196,8 +196,8 @@
     public static ServiceContext fillContextInformation(OperationDescription operationDesc, ServiceDescription serviceDesc, ConfigurationContext configurationContext) throws AxisFault {
         MessageContext msgContext;
         //  2. if null, create new opCtxt
-        OperationContext operationContext =
-                OperationContextFactory.createOperationContext(operationDesc.getAxisSpecifMEPConstant(), operationDesc);
+        OperationContext operationContext = new  OperationContext(operationDesc);
+//        OperationContext operationContext = OperationContextFactory.createOperationContext(operationDesc.getAxisSpecifMEPConstant(), operationDesc);
 
         //  fill the service group context and service context info
         return fillServiceContextAndServiceGroupContext(serviceDesc, configurationContext);

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=295001&r1=295000&r2=295001&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Tue Oct  4 22:57:22 2005
@@ -21,6 +21,7 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.OperationContextFactory;
+import org.apache.axis2.context.OperationContext;
 import org.apache.axis2.description.*;
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.soap.SOAPFactory;
@@ -77,11 +78,13 @@
                         transportIn,
                         transport);
 
-        mc.setOperationContext(
-                OperationContextFactory.createOperationContext(
-                        WSDLConstants.MEP_CONSTANT_IN_OUT,
-                        axisOp
-                        ));
+        OperationContext opCOntext = new OperationContext(axisOp);
+
+//        mc.setOperationContext(OperationContextFactory.createOperationContext(
+//                        WSDLConstants.MEP_CONSTANT_IN_OUT,
+//                        axisOp
+//                        ));
+        mc.setOperationContext(opCOntext);
         mc.setTransportOut(transport);
         mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
         mc.setServerSide(true);