ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hemap...@apache.org
Subject svn commit: r168079 - in /webservices/axis/trunk/java/modules: core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/context/ core/src/org/apache/axis/description/ core/src/org/apache/axis/engine/ core/src/org/apache/axis/handlers/addressing/ core/src/org/apache/axis/util/ core/test/org/apache/axis/engine/ core/test/org/apache/axis/handlers/addressing/ samples/test/org/apache/axis/clientapi/ samples/test/org/apache/axis/engine/
Date Wed, 04 May 2005 05:48:04 GMT
Author: hemapani
Date: Tue May  3 22:48:03 2005
New Revision: 168079

URL: http://svn.apache.org/viewcvs?rev=168079&view=rev
Log:
add the recurcive lookup of the parameter, the tests still failing .. can not help it till
all the refactorings done, there are refactroing regarding Message reciver, and MEPContext
that break lot of tests and need fix all.. I need time to get all test to done 

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/AbstractContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ContextBuilder.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ModuleContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java Tue May
 3 22:48:03 2005
@@ -150,7 +150,7 @@
                     null,
                     transportIn,
                     transportOut,
-                    new BasicMEPContext(new AxisOperation(opName)));
+                    new BasicMEPContext(new AxisOperation(opName),null));
                                 
             msgctx.setEnvelope(env);
 
@@ -219,7 +219,7 @@
                     null,
                     transportIn,
                     transportOut,
-                    new BasicMEPContext(new AxisOperation(opName)));
+                    new BasicMEPContext(new AxisOperation(opName),null));
             msgctx.setEnvelope(env);
             msgctx.setMessageInformationHeaders(messageInfoHeaders);
 
@@ -285,7 +285,7 @@
 
         ListenerManager.makeSureStarted();
 
-        ListenerManager.getEngineContext().addService(new ServiceContext(callbackService));
+        ListenerManager.getEngineContext().addService(new ServiceContext(callbackService,null));
 
     }
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/AbstractContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/AbstractContext.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/AbstractContext.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/AbstractContext.java
Tue May  3 22:48:03 2005
@@ -20,14 +20,16 @@
  *
  * 
  */
-public abstract class AbstractContext implements Serializable{
-    
-    protected transient HashMap nonPersistentMap;
-    protected HashMap persistentMap;
+public abstract class AbstractContext implements Serializable {
 
-    protected AbstractContext() {
+    protected transient final HashMap nonPersistentMap;
+    protected final HashMap persistentMap;
+    private final AbstractContext parent;
+
+    protected AbstractContext(AbstractContext parent) {
         this.persistentMap = new HashMap();
         this.nonPersistentMap = new HashMap();
+        this.parent = parent;
     }
 
     /**
@@ -38,11 +40,11 @@
      * @param value
      * @param persistent
      */
-    public void put(Object key,Object value,boolean persistent){
-        if (persistent){
-            persistentMap.put(key,value);
-        }else{
-            nonPersistentMap.put(key,value);
+    public void put(Object key, Object value, boolean persistent) {
+        if (persistent) {
+            persistentMap.put(key, value);
+        } else {
+            nonPersistentMap.put(key, value);
         }
     }
 
@@ -52,18 +54,17 @@
      * @param key
      * @param value
      */
-    public void put(Object key,Object value){
-        this.put(key,value,false);
+    public void put(Object key, Object value) {
+        this.put(key, value, false);
     }
-     /**
-      * Retrieve an object. Default search is done in the non persistent
-      * group
-      * @param key
-      * @return
-      */
-    public Object get(Object key){
-       return this.get(key,false); //todo Do we need to have the default search extended
to
-                                         //todo search the persistent map as well
+    /**
+     * Retrieve an object. Default search is done in the non persistent
+     * group
+     * @param key
+     * @return
+     */
+    public Object get(Object key) {
+        return this.get(key, false);
     }
 
     /**
@@ -72,12 +73,17 @@
      * @param persistent
      * @return
      */
-    public Object get(Object key,boolean persistent){
-        if (persistent){
-            return persistentMap.get(key);
-        }else{
+    public Object get(Object key, boolean persistent) {
+        Object obj;
+        if (persistent) {
+            obj = persistentMap.get(key);
+
+        } else {
             return nonPersistentMap.get(key);
         }
+        if (obj == null && parent != null) {
+            obj = parent.get(key, persistent);
+        }
+        return obj;
     }
-
 }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java
Tue May  3 22:48:03 2005
@@ -45,7 +45,8 @@
 
     private AxisOperation axisOperation;
 
-    public BasicMEPContext(AxisOperation axisOperation) {
+    public BasicMEPContext(AxisOperation axisOperation,ServiceContext serviceContext) {
+        super(serviceContext);
         this.axisOperation = axisOperation;
 
 // Most frequently used MEPs are IN ONLY and IN-OUT MEP. So the number of messagecontext
for those MEPs are at most 2. Setting the initial capacity of the arrayList to 2.

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ContextBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ContextBuilder.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ContextBuilder.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ContextBuilder.java
Tue May  3 22:48:03 2005
@@ -75,7 +75,7 @@
 
     public ServiceContext refresh(AxisService service,EngineContext context) throws PhaseException
{
         try {
-            ServiceContext serviceContext = new ServiceContext(service);
+            ServiceContext serviceContext = new ServiceContext(service,context);
             PhaseResolver reolve = new PhaseResolver(context.getEngineConfig(),serviceContext);
             context.addService(serviceContext);
             return  serviceContext = reolve.buildchains();

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContext.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContext.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContext.java
Tue May  3 22:48:03 2005
@@ -57,6 +57,7 @@
     private PhasesInclude phaseInclude;
     
     public EngineContext(EngineConfiguration registry){
+        super(null);
         this.engineConfig = registry;
         serviceContextMap = new HashMap();
         moduleContextMap = new HashMap();

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.java
Tue May  3 22:48:03 2005
@@ -23,9 +23,9 @@
 
 public class MEPContextFactory implements WSDLConstants{
     
-    public static MEPContext createMEP(String mepURI,boolean serverSide,AxisOperation axisOp)
throws AxisFault{
+    public static MEPContext createMEP(String mepURI,boolean serverSide,AxisOperation axisOp,ServiceContext
serviceContext) throws AxisFault{
         if(MEP_URI_IN_ONLY.equals(mepURI) || MEP_URI_IN_OUT.equals(mepURI)){
-            return new BasicMEPContext(axisOp);
+            return new BasicMEPContext(axisOp,serviceContext);
         
         }else{
         	throw new AxisFault("Cannot handle the MEP "

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ModuleContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ModuleContext.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ModuleContext.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ModuleContext.java
Tue May  3 22:48:03 2005
@@ -22,7 +22,8 @@
 public class ModuleContext extends AbstractContext{
     private AxisModule moduleConfig;
     
-    public ModuleContext(AxisModule module){
+    public ModuleContext(AxisModule module,EngineContext engineContext){
+        super(engineContext);
         this.moduleConfig = module;
     }
     /**

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
Tue May  3 22:48:03 2005
@@ -36,8 +36,8 @@
     private PhasesInclude phaseInclude;
    
 
-    public ServiceContext(AxisService serviceConfig) {
-        super();
+    public ServiceContext(AxisService serviceConfig,EngineContext engineContext) {
+        super(engineContext);
         this.serviceConfig = serviceConfig;
         this.operationContextMap = new HashMap();
         phaseInclude = new PhasesIncludeImpl();

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java
Tue May  3 22:48:03 2005
@@ -122,7 +122,7 @@
 			//Its a new incomming message so get the factory to create a new
 			// one
 			mepContext = MEPContextFactory.createMEP(this
-					.getMessageExchangePattern(), serverside,this);
+					.getMessageExchangePattern(), serverside,this,msgContext.getServiceContext());
 			
 
 		} else {

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
Tue May  3 22:48:03 2005
@@ -60,7 +60,7 @@
                 EngineContext engineContext = msgctx.getEngineContext();
                 ServiceContext serviceContext = engineContext.getService(service.getName());
                 if (serviceContext == null) {
-                    serviceContext = new ServiceContext(service);
+                    serviceContext = new ServiceContext(service,engineContext);
                 }
                 msgctx.setServiceContext(serviceContext);
                 msgctx.setMessageStyle(service.getStyle());

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java Tue
May  3 22:48:03 2005
@@ -21,10 +21,9 @@
 import org.apache.axis.description.AxisTransportIn;
 import org.apache.axis.handlers.addressing.AddressingInHandler;
 import org.apache.axis.handlers.addressing.AddressingOutHandler;
-import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMAbstractFactory;
 import org.apache.axis.om.SOAPBody;
 import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.om.OMAbstractFactory;
 import org.apache.axis.transport.TransportSender;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
Tue May  3 22:48:03 2005
@@ -79,7 +79,7 @@
                     EngineConfiguration registry = msgctx.getEngineContext().getEngineConfig();
                     service = registry.getService(serviceName);
                     if (service != null) {
-                        serviceContext = new ServiceContext(service);
+                        serviceContext = new ServiceContext(service,engineContext);
                     }
                 }
                 if (serviceContext != null) {

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java
Tue May  3 22:48:03 2005
@@ -3,10 +3,6 @@
 import java.util.Iterator;
 
 import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.AnyContentType;
@@ -17,7 +13,11 @@
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.handlers.AbstractHandler;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.SOAPHeader;
+import org.apache.axis.om.SOAPHeaderBlock;
 
 /**
  * Copyright 2001-2004 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java Tue May 
3 22:48:03 2005
@@ -20,6 +20,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.Constants;
+import org.apache.axis.context.EngineContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.description.Flow;
@@ -87,8 +88,8 @@
         return service;
     }
     
-    public static ServiceContext createServiceContext(AxisService service) throws AxisFault{
-        ServiceContext serviceContext = new ServiceContext(service);
+    public static ServiceContext createServiceContext(AxisService service,EngineContext engineContext)
throws AxisFault{
+        ServiceContext serviceContext = new ServiceContext(service,engineContext);
         createExecutionChains(serviceContext);
         return serviceContext;
     }

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
Tue May  3 22:48:03 2005
@@ -60,7 +60,7 @@
 
         AxisOperation axisOp = new AxisOperation(operationName);
 
-        mc = new MessageContext(engineContext, null, null, transportIn,transportOut,new BasicMEPContext(axisOp));
+        mc = new MessageContext(engineContext, null, null, transportIn,transportOut,new BasicMEPContext(axisOp,null));
         mc.setTransportOut(transportOut);
         mc.setServerSide(true);
         SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
@@ -108,7 +108,7 @@
         phase1.addHandler(new TempHandler(27));
         phases.add(phase1);
         
-        ServiceContext serviceContext = new ServiceContext(service);
+        ServiceContext serviceContext = new ServiceContext(service,engineContext);
         engineContext.addService(serviceContext);
         
         serviceContext.setPhases(phases, EngineConfiguration.INFLOW);

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
Tue May  3 22:48:03 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 package org.apache.axis.engine;
 
 import java.util.ArrayList;
@@ -31,77 +31,81 @@
 import org.apache.axis.description.AxisService;
 import org.apache.axis.description.AxisTransportIn;
 import org.apache.axis.description.AxisTransportOut;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.SOAPFactory;
 import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.SOAPFactory;
 import org.apache.wsdl.WSDLService;
 
 public class EngineWithoutPhaseResolvingTest extends AbstractEngineTest {
-   private MessageContext mc;
-   private ArrayList executedHandlers = new ArrayList();
-   private EngineConfiguration engineRegistry;
-   private QName serviceName = new QName("axis/services/NullService");
-   private QName opearationName =  new QName("NullOperation");
-   private AxisService service;
-
-   public EngineWithoutPhaseResolvingTest() {
-   }
-
-   public EngineWithoutPhaseResolvingTest(String arg0) {
-       super(arg0);
-   }
-   protected void setUp() throws Exception {
-      
-       engineRegistry = new EngineConfigurationImpl(new AxisGlobal());
-        EngineContext engineContext = new EngineContext(engineRegistry);
-       AxisTransportOut transport = new AxisTransportOut(new QName("null"));
-       transport.setSender(new NullTransportSender());
-       
-       AxisTransportIn transportIn = new AxisTransportIn(new QName("null"));
-       AxisOperation axisOp = new AxisOperation(opearationName);
-       
-       mc = new MessageContext(engineContext, null, null, transportIn,transport,new BasicMEPContext(axisOp));
-       mc.setTransportOut(transport);
-       mc.setServerSide(true);
-       SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
-       mc.setEnvelope(omFac.getDefaultEnvelope());
-       service = new AxisService(serviceName);
-       service.setMessageReceiver(new NullMessageReceiver());
-       engineRegistry.addService(service);
-       service.setStyle(WSDLService.STYLE_DOC);
-       service.addOperation(axisOp);
-       
-       mc.setTo(
-           new EndpointReference(
-               AddressingConstants.WSA_TO,
-               "axis/services/NullService"));
-       mc.setWSAAction(opearationName.getLocalPart());
-
-   }
-
-   public void testServerSend() throws Exception {
-       AxisEngine engine = new AxisEngine();
-       mc.setServerSide(true);
-       mc.setServiceContext(new ServiceContext(service));
-       engine.send(mc);
-   }
-
-   public void testClientSend() throws Exception {
-       AxisEngine engine = new AxisEngine();
-       mc.setServerSide(false);
-       mc.setServiceContext(new ServiceContext(service));
-       engine.send(mc);
-   }
-
-   public void testServerReceive() throws Exception {
-       AxisEngine engine = new AxisEngine();
-       mc.setServerSide(true);
-       engine.receive(mc);
-   }
-
-   public void testClientReceive() throws Exception {
-       AxisEngine engine = new AxisEngine();
-       mc.setServerSide(false);
-       engine.receive(mc);
-   }
+    private MessageContext mc;
+    private ArrayList executedHandlers = new ArrayList();
+    private EngineConfiguration engineRegistry;
+    private QName serviceName = new QName("axis/services/NullService");
+    private QName opearationName = new QName("NullOperation");
+    private AxisService service;
+    private EngineContext engineContext;
+
+    public EngineWithoutPhaseResolvingTest() {
+    }
+
+    public EngineWithoutPhaseResolvingTest(String arg0) {
+        super(arg0);
+    }
+    protected void setUp() throws Exception {
+
+        engineRegistry = new EngineConfigurationImpl(new AxisGlobal());
+        engineContext = new EngineContext(engineRegistry);
+        AxisTransportOut transport = new AxisTransportOut(new QName("null"));
+        transport.setSender(new NullTransportSender());
+
+        AxisTransportIn transportIn = new AxisTransportIn(new QName("null"));
+        AxisOperation axisOp = new AxisOperation(opearationName);
+
+        mc =
+            new MessageContext(
+                engineContext,
+                null,
+                null,
+                transportIn,
+                transport,
+                new BasicMEPContext(axisOp, null));
+        mc.setTransportOut(transport);
+        mc.setServerSide(true);
+        SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
+        mc.setEnvelope(omFac.getDefaultEnvelope());
+        service = new AxisService(serviceName);
+        service.setMessageReceiver(new NullMessageReceiver());
+        engineRegistry.addService(service);
+        service.setStyle(WSDLService.STYLE_DOC);
+        service.addOperation(axisOp);
+
+        mc.setTo(new EndpointReference(AddressingConstants.WSA_TO, "axis/services/NullService"));
+        mc.setWSAAction(opearationName.getLocalPart());
+
+    }
+
+    public void testServerSend() throws Exception {
+        AxisEngine engine = new AxisEngine();
+        mc.setServerSide(true);
+        mc.setServiceContext(new ServiceContext(service, engineContext));
+        engine.send(mc);
+    }
+
+    public void testClientSend() throws Exception {
+        AxisEngine engine = new AxisEngine();
+        mc.setServerSide(false);
+        mc.setServiceContext(new ServiceContext(service,engineContext));
+        engine.send(mc);
+    }
+
+    public void testServerReceive() throws Exception {
+        AxisEngine engine = new AxisEngine();
+        mc.setServerSide(true);
+        engine.receive(mc);
+    }
+
+    public void testClientReceive() throws Exception {
+        AxisEngine engine = new AxisEngine();
+        mc.setServerSide(false);
+        engine.receive(mc);
+    }
 }

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
Tue May  3 22:48:03 2005
@@ -35,7 +35,7 @@
     public void testMesssageContext() throws AxisFault {
         EngineConfiguration er = new EngineConfigurationImpl(new AxisGlobal());
         EngineContext engineContext = new EngineContext(er);
-        MessageContext msgctx = new MessageContext(engineContext, null,null,null,null,new
BasicMEPContext(null));
+        MessageContext msgctx = new MessageContext(engineContext, null,null,null,null,new
BasicMEPContext(null,null));
 
         SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
Tue May  3 22:48:03 2005
@@ -49,7 +49,7 @@
         super.setUp();
         outHandler = new AddressingOutHandler();
         testUtil = new TestUtil();
-        msgCtxt = new MessageContext(null, null, null, null,null,new BasicMEPContext(null));
+        msgCtxt = new MessageContext(null, null, null, null,null,new BasicMEPContext(null,null));
     }
 
     public void testAddToSOAPHeader() throws Exception {

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java
(original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java
Tue May  3 22:48:03 2005
@@ -73,7 +73,7 @@
         service.addOperation(operation);
 
         UtilServer.start();
-        UtilServer.deployService(Utils.createServiceContext(service));
+        UtilServer.deployService(Utils.createServiceContext(service,null));
     }
 
     protected void tearDown() throws Exception {

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
(original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
Tue May  3 22:48:03 2005
@@ -85,7 +85,7 @@
         service.addOperation(operation);
 
         UtilServer.start();
-        UtilServer.deployService(Utils.createServiceContext(service));
+        UtilServer.deployService(Utils.createServiceContext(service,null));
     }
 
     protected void tearDown() throws Exception {

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
(original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
Tue May  3 22:48:03 2005
@@ -66,7 +66,7 @@
         AxisService service = Utils.createSimpleService(serviceName,org.apache.axis.engine.Echo.class.getName());
         AxisOperation operation = new AxisOperation(operationName);
         service.addOperation(operation);
-        UtilServer.deployService(Utils.createServiceContext(service));
+        UtilServer.deployService(Utils.createServiceContext(service,null));
     }
 
 

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
(original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
Tue May  3 22:48:03 2005
@@ -86,7 +86,7 @@
         service.addOperation(operation);
 
         UtilServer.start();
-        UtilServer.deployService(Utils.createServiceContext(service));
+        UtilServer.deployService(Utils.createServiceContext(service,null));
         try {
             callTheService();
         } finally {
@@ -121,7 +121,7 @@
         service.addOperation(operation);
 
         UtilServer.start();
-        UtilServer.deployService(Utils.createServiceContext(service));
+        UtilServer.deployService(Utils.createServiceContext(service,null));
         try {
             callTheService();
         } finally {

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java?rev=168079&r1=168078&r2=168079&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java
(original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java
Tue May  3 22:48:03 2005
@@ -73,7 +73,7 @@
         AxisOperation operation = new AxisOperation(operationName);
         service.addOperation(operation);
 
-        UtilServer.deployService(Utils.createServiceContext(service));
+        UtilServer.deployService(Utils.createServiceContext(service,null));
     }
 
     protected void tearDown() throws Exception {



Mime
View raw message