axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r289161 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/ core/src/org/apache/axis2/clientapi/ core/src/org/apache/axis2/description/ core/test/org/apache/axis2/context/ integration/test/org/apache/axis2/engine/
Date Thu, 15 Sep 2005 05:54:09 GMT
Author: deepal
Date: Wed Sep 14 22:53:51 2005
New Revision: 289161

URL: http://svn.apache.org/viewcvs?rev=289161&view=rev
Log:
builder is almost done , we fill other soon

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/description/OperationDescription.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.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=289161&r1=289160&r2=289161&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
Wed Sep 14 22:53:51 2005
@@ -39,14 +39,15 @@
      */
     public void invoke(MessageContext msgContext) throws AxisFault {
 
-//        if(msgContext.getOperationContext() != null && msgContext.getServiceContext()
!= null){
-//            return;
-//        }
+        if (msgContext.getOperationContext() != null && msgContext.getServiceContext()
!= null) {
+            return;
+        }
 
         OperationDescription operationDesc = msgContext.getOperationDescription();
 
         //  1. look up opCtxt using mc.addressingHeaders.relatesTo[0]
         OperationContext operationContext = operationDesc.findForExistingOperationContext(msgContext);
+
         if (operationContext != null) {
             // register operation context and message context
             operationDesc.registerOperationContext(msgContext, operationContext);

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=289161&r1=289160&r2=289161&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
Wed Sep 14 22:53:51 2005
@@ -169,6 +169,7 @@
             msgctx.setTo(to);
             msgctx.setServiceContext(serviceContext);
             ConfigurationContext syscontext = serviceContext.getEngineContext();
+            msgctx.setConfigurationContext(syscontext);
 
             checkTransport(msgctx);
 
@@ -227,8 +228,6 @@
             //Use message id all the time!
             String messageID = String.valueOf(System.currentTimeMillis());
             msgctx.setMessageID(messageID);
-            msgctx.getOperationContext().getServiceContext().getEngineContext().
-                    registerOperationContext(messageID, msgctx.getOperationContext());
             ////
             if (useSeparateListener) {
                 //the invocation happen via a seperate Channel, so we should set up the
@@ -260,6 +259,7 @@
         } catch (OMException e) {
             throw new AxisFault(e.getMessage(), e);
         }catch (Exception e) {
+            e.printStackTrace();
             throw new AxisFault(e.getMessage(), e);
         }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java?rev=289161&r1=289160&r2=289161&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
Wed Sep 14 22:53:51 2005
@@ -232,8 +232,7 @@
             // So this message is part of an ongoing MEP
             //			operationContext =
             ConfigurationContext configContext = msgContext.getSystemContext();
-            operationContext = configContext.getOperationContext(
-                            msgContext.getRelatesTo().getValue());
+            operationContext = configContext.getOperationContext(msgContext.getRelatesTo().getValue());
 
             if (null == operationContext) {
                 throw new AxisFault(Messages.getMessage("cannotCorrealteMsg",

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java?rev=289161&r1=289160&r2=289161&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
(original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
Wed Sep 14 22:53:51 2005
@@ -18,6 +18,7 @@
 
 import org.apache.axis2.AbstractTestCase;
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.engine.AxisConfigurationImpl;
 import org.apache.axis2.addressing.miheaders.RelatesTo;
 import org.apache.axis2.description.OperationDescription;
 import org.apache.axis2.description.TransportInDescription;
@@ -31,7 +32,7 @@
  */
 public class OperationContextTest extends AbstractTestCase {
 
-    private ConfigurationContext engineCtx = new ConfigurationContext(null);
+    private ConfigurationContext engineCtx = new ConfigurationContext(new AxisConfigurationImpl());
 
     public OperationContextTest(String arg0) {
         super(arg0);
@@ -39,8 +40,12 @@
 
     public void testMEPfindingOnRelatesTO() throws Exception {
 
-        ServiceContext sessionContext = new ServiceContext(new ServiceDescription(),
-                new ServiceGroupContext(new ConfigurationContext(null),null));
+        ServiceDescription serviceConfig = new ServiceDescription(new QName("TempSC"));
+        engineCtx.getAxisConfiguration().addService(serviceConfig);
+       ServiceGroupContext sgc =  serviceConfig.getParent().getServiceGroupContext(engineCtx);
+
+        ServiceContext sessionContext = sgc.getServiceContext("TempSC");
+//        ServiceContext sessionContext = new ServiceContext(serviceConfig,new ServiceGroupContext(new
ConfigurationContext(null),serviceConfig));
         MessageContext messageContext1 = this.getBasicMessageContext();
 
         messageContext1.setMessageID(

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java?rev=289161&r1=289160&r2=289161&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
Wed Sep 14 22:53:51 2005
@@ -47,8 +47,7 @@
 public class SOAPversionTest extends TestCase {
     private EndpointReference targetEPR =
             new EndpointReference("http://127.0.0.1:"
-            + (5000)
-//            + (UtilServer.TESTING_PORT)
+            + (UtilServer.TESTING_PORT)
             + "/axis/services/EchoXMLService/echoOMElement");
     private Log log = LogFactory.getLog(getClass());
     private QName serviceName = new QName("EchoXMLService");



Mime
View raw message