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 he...@apache.org on 2005/05/09 11:04:10 UTC

svn commit: r169257 - in /webservices/axis/trunk/java/modules: core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/context/ core/src/org/apache/axis/deployment/ core/src/org/apache/axis/description/ core/src/org/apache/axis/engine/ core/src/org/apache/axis/modules/ core/src/org/apache/axis/phaseresolver/ core/src/org/apache/axis/transport/ core/src/org/apache/axis/transport/http/ core/src/org/apache/axis/transport/mail/ core/src/org/apache/axis/util/ core/test/org/apache/axis/context/ core/test/org/apache/axis/deployment/ core/test/org/apache/axis/description/ core/test/org/apache/axis/engine/ core/test/org/apache/axis/phaserule/ samples/test/org/apache/axis/engine/ samples/test/org/apache/axis/integration/

Author: hemapani
Date: Mon May  9 02:04:08 2005
New Revision: 169257

URL: http://svn.apache.org/viewcvs?rev=169257&view=rev
Log:
refactor the EngineConfiguration->AxisSystem and EngineContext->SystemContext

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.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/MessageSender.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.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/phaserule/PhaseRuleTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.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/MessageWithServerTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -9,7 +9,7 @@
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.addressing.MessageInformationHeadersCollection;
 import org.apache.axis.addressing.miheaders.RelatesTo;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContextFactory;
 import org.apache.axis.context.ServiceContext;
@@ -19,8 +19,8 @@
 import org.apache.axis.description.AxisTransportIn;
 import org.apache.axis.description.AxisTransportOut;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfiguration;
-import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisSystemImpl;
 import org.apache.axis.engine.MessageSender;
 import org.apache.axis.om.OMException;
 import org.apache.axis.om.SOAPEnvelope;
@@ -45,7 +45,7 @@
     private String senderTransport = Constants.TRANSPORT_HTTP;
     private String Listenertransport = Constants.TRANSPORT_HTTP;
 
-    private EngineContext engineContext;
+    private SystemContext engineContext;
 
     private boolean useSeparateListener = false;
 
@@ -55,13 +55,13 @@
     private ListenerManager listenerManager;
 
     public Call() throws AxisFault {
-        this(new EngineContext(new EngineConfigurationImpl(new AxisGlobal())));
+        this(new SystemContext(new AxisSystemImpl(new AxisGlobal())));
         try {
             //find the deployment mechanism , create
             //a EngineContext .. if the conf file not found
             //deafult one is used
             properties = new HashMap();
-            EngineConfiguration registry = engineContext.getEngineConfig();
+            AxisSystem registry = engineContext.getEngineConfig();
 
             //This is a hack, initialize the transports for the client side 
             AxisTransportOut httpTransportOut =
@@ -92,7 +92,7 @@
         }
     }
 
-    public Call(WSDLDescription wsdlDesc, EngineContext engineContext) {
+    public Call(WSDLDescription wsdlDesc, SystemContext engineContext) {
         messageInfoHeaders = new MessageInformationHeadersCollection();
         this.properties = new HashMap();
         this.engineContext = engineContext;
@@ -103,14 +103,14 @@
         }
     }
 
-    public Call(EngineContext engineContext) {
+    public Call(SystemContext engineContext) {
         this(null, engineContext);
     }
 
     public void sendReceiveAsync(SOAPEnvelope env, final Callback callback) throws AxisFault {
         initializeOperation();
 
-        EngineConfiguration registry = engineContext.getEngineConfig();
+        AxisSystem registry = engineContext.getEngineConfig();
         if (Constants.TRANSPORT_MAIL.equals(senderTransport)) {
             throw new AxisFault("This invocation support only for bi-directional transport");
         }
@@ -177,7 +177,7 @@
     public SOAPEnvelope sendReceiveSync(SOAPEnvelope env) throws AxisFault {
         initializeOperation();
 
-        EngineConfiguration registry = engineContext.getEngineConfig();
+        AxisSystem registry = engineContext.getEngineConfig();
         if (Constants.TRANSPORT_MAIL.equals(senderTransport)) {
             throw new AxisFault("This invocation support only for bi-directional transport");
         }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java Mon May  9 02:04:08 2005
@@ -21,18 +21,18 @@
 
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.transport.http.SimpleHTTPServer;
 
 public class ListenerManager {
-    private EngineContext engineContext;
+    private SystemContext engineContext;
     private boolean started = false;
     private int numberOfserver = 0;
     private SimpleHTTPServer simpleHttpServer;
     private ServerSocket scoket;
 
-    public ListenerManager(EngineContext engineContext) {
+    public ListenerManager(SystemContext engineContext) {
         this.engineContext = engineContext;
     }
 
@@ -57,7 +57,7 @@
     /**
      * @return
      */
-    public EngineContext getEngineContext() {
+    public SystemContext getEngineContext() {
         return engineContext;
     }
 
@@ -76,7 +76,7 @@
     /**
      * @param context
      */
-    public void setEngineContext(EngineContext context) {
+    public void setEngineContext(SystemContext context) {
         engineContext = context;
     }
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java Mon May  9 02:04:08 2005
@@ -13,8 +13,8 @@
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfiguration;
-import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisSystemImpl;
 import org.apache.axis.modules.Module;
 import org.apache.axis.phaseresolver.PhaseException;
 import org.apache.axis.phaseresolver.PhaseResolver;
@@ -27,11 +27,11 @@
  */
 public class EngineContextFactory {
 
-    public EngineContext buildEngineContext(String RepositaryName) throws DeploymentException {
-        EngineContext engineContext = null;
+    public SystemContext buildEngineContext(String RepositaryName) throws DeploymentException {
+        SystemContext engineContext = null;
         try {
             DeploymentEngine deploymentEngine = new DeploymentEngine(RepositaryName);
-            EngineConfiguration configuration = deploymentEngine.load();
+            AxisSystem configuration = deploymentEngine.load();
             PhaseResolver phaseResolver = new PhaseResolver(configuration);
             engineContext = phaseResolver.buildGlobalChains();
             phaseResolver.buildTranspotsChains();
@@ -44,11 +44,11 @@
         return engineContext;
     }
 
-    public EngineContext buildClientEngineContext(String axis2home) throws DeploymentException {
-            EngineContext engineContext = null;
+    public SystemContext buildClientEngineContext(String axis2home) throws DeploymentException {
+            SystemContext engineContext = null;
             try {
                 DeploymentEngine deploymentEngine = new DeploymentEngine(axis2home);
-                EngineConfiguration configuration = deploymentEngine.loadClient();
+                AxisSystem configuration = deploymentEngine.loadClient();
                 PhaseResolver phaseResolver = new PhaseResolver(configuration);
                 engineContext = phaseResolver.buildGlobalChains();
                 phaseResolver.buildTranspotsChains();
@@ -69,9 +69,9 @@
     */
 
 
-    private void initModules(EngineContext context) throws DeploymentException {
+    private void initModules(SystemContext context) throws DeploymentException {
         try{
-            HashMap modules = ((EngineConfigurationImpl)context.getEngineConfig()).getModules();
+            HashMap modules = ((AxisSystemImpl)context.getEngineConfig()).getModules();
             Collection col = modules.values();
             for (Iterator iterator = col.iterator(); iterator.hasNext();) {
                 AxisModule  axismodule = (AxisModule)iterator.next();
@@ -100,7 +100,7 @@
 //        }
 //    }
 
-    private void engageModules(AxisService service,EngineContext context) throws AxisFault {
+    private void engageModules(AxisService service,SystemContext context) throws AxisFault {
        ArrayList servicemodules = (ArrayList)service.getModules();
        ArrayList opModules ;
        Module module ;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java Mon May  9 02:04:08 2005
@@ -64,7 +64,7 @@
 
     private OperationContext operationContext;
     private ServiceContext serviceContext;
-    private EngineContext engineContext;
+    private SystemContext engineContext;
 
     private AxisTransportIn transportIn;
 
@@ -125,7 +125,7 @@
      * @throws AxisFault
      */
     public MessageContext(
-        EngineContext engineContext,
+        SystemContext engineContext,
         SessionContext sessionContext,
         AxisTransportIn transportIn,
         AxisTransportOut transportOut,
@@ -148,7 +148,7 @@
         SessionContext sessionContext,
         AxisTransportIn transportIn,
         AxisTransportOut transportOut,
-        EngineContext engineContext)
+        SystemContext engineContext)
         throws AxisFault {
         super(null);
 
@@ -451,7 +451,7 @@
         this.serviceInstanceID = serviceInstanceID;
     }
 
-    public EngineContext getEngineContext() {
+    public SystemContext getEngineContext() {
         return engineContext;
     }
 
@@ -465,7 +465,7 @@
     /**
      * @param context
      */
-    public void setEngineContext(EngineContext context) {
+    public void setEngineContext(SystemContext context) {
         engineContext = context;
     }
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java Mon May  9 02:04:08 2005
@@ -70,7 +70,7 @@
 		super(serviceContext);
 		this.axisOperation = axisOperation;
 		this.operationMEP = axisOperation.getMessageExchangePattern();
-		this.operationContextMap = ((EngineContext) parent.parent)
+		this.operationContextMap = ((SystemContext) parent.parent)
 				.getOperationContextMap();
 	}
 
@@ -95,8 +95,8 @@
 	 * 
 	 * @return parent ServiceContext's parent EngineContext
 	 */
-	public EngineContext getEngineContext() {
-		return (EngineContext) parent.parent;
+	public SystemContext getEngineContext() {
+		return (SystemContext) parent.parent;
 	}
 
 	/**

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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -25,7 +25,7 @@
     
     private String serviceInstanceID;
 
-    public ServiceContext(AxisService serviceConfig,EngineContext engineContext) {
+    public ServiceContext(AxisService serviceConfig,SystemContext engineContext) {
         super(engineContext);
         this.serviceConfig = serviceConfig;
         
@@ -53,7 +53,7 @@
         return serviceConfig;
     }
     
-    public EngineContext getEngineContext(){
-        return (EngineContext)parent;
+    public SystemContext getEngineContext(){
+        return (SystemContext)parent;
     }
 }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java Mon May  9 02:04:08 2005
@@ -43,8 +43,8 @@
 import org.apache.axis.description.HandlerMetadata;
 import org.apache.axis.description.Parameter;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfiguration;
-import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisSystemImpl;
 import org.apache.axis.engine.Handler;
 import org.apache.axis.modules.Module;
 import org.apache.commons.logging.Log;
@@ -75,7 +75,7 @@
      * this ref will pass to engine when it call start()
      * method
      */
-    private EngineConfiguration engineconfig;
+    private AxisSystem engineconfig;
 
     /**
      * this constaructor for the testing
@@ -111,7 +111,7 @@
      *
      * @param engineconfig
      */
-    public DeploymentEngine(EngineConfiguration engineconfig) {
+    public DeploymentEngine(AxisSystem engineconfig) {
         this.engineconfig = engineconfig;
     }
 
@@ -164,7 +164,7 @@
      *
      * @return
      */
-    public EngineConfiguration getEngineconfig() {
+    public AxisSystem getEngineconfig() {
         return engineconfig;
     }
 
@@ -188,7 +188,7 @@
         }
     }
 
-    public EngineConfiguration load() throws DeploymentException {
+    public AxisSystem load() throws DeploymentException {
         if (engineConfigName == null) {
             throw new DeploymentException("path to Server.xml can not be NUll");
         }
@@ -221,7 +221,7 @@
     }
 
 
-    public EngineConfiguration loadClient() throws DeploymentException {
+    public AxisSystem loadClient() throws DeploymentException {
         if (engineConfigName == null) {
             throw new DeploymentException("path to Client.xml can not be NUll");
         }
@@ -278,9 +278,9 @@
         scheduler.schedule(new SchedulerTask(engine, folderName), new DeploymentIterator());
     }
 
-    private EngineConfiguration createEngineConfig() throws AxisFault {
+    private AxisSystem createEngineConfig() throws AxisFault {
         axisGlobal = new AxisGlobal();
-        EngineConfiguration newEngineConfig = new EngineConfigurationImpl(axisGlobal);
+        AxisSystem newEngineConfig = new AxisSystemImpl(axisGlobal);
         return newEngineConfig;
     }
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java Mon May  9 02:04:08 2005
@@ -37,7 +37,7 @@
 import org.apache.axis.description.Parameter;
 import org.apache.axis.description.ParameterImpl;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.engine.AxisSystemImpl;
 import org.apache.axis.engine.MessageReceiver;
 import org.apache.axis.phaseresolver.PhaseMetadata;
 import org.apache.axis.transport.TransportReceiver;
@@ -176,13 +176,13 @@
                                 String attvalue = pullparser.getAttributeValue(i);
                                 if (TYPE.equals(attname)) {
                                     if (INFLOWST.equals(attvalue)) {
-                                        ((EngineConfigurationImpl) dpengine.getEngineconfig()).setInPhases(processPhaseOrder());
+                                        ((AxisSystemImpl) dpengine.getEngineconfig()).setInPhases(processPhaseOrder());
                                     } else if (OUTFLOWST.equals(attvalue)) {
-                                        ((EngineConfigurationImpl) dpengine.getEngineconfig()).setOutPhases(processPhaseOrder());
+                                        ((AxisSystemImpl) dpengine.getEngineconfig()).setOutPhases(processPhaseOrder());
                                     } else if (IN_FAILTFLOW.equals(attvalue)) {
-                                        ((EngineConfigurationImpl) dpengine.getEngineconfig()).setInFaultPhases(processPhaseOrder());
+                                        ((AxisSystemImpl) dpengine.getEngineconfig()).setInFaultPhases(processPhaseOrder());
                                     } else if (OUT_FAILTFLOW.equals(attvalue)) {
-                                        ((EngineConfigurationImpl) dpengine.getEngineconfig()).setOutFaultPhases(processPhaseOrder());
+                                        ((AxisSystemImpl) dpengine.getEngineconfig()).setOutFaultPhases(processPhaseOrder());
                                     } else {
                                         throw new DeploymentException("un defined flow type  " + ST);
                                     }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java Mon May  9 02:04:08 2005
@@ -18,7 +18,7 @@
 import java.util.ArrayList;
 
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfiguration;
+import org.apache.axis.engine.AxisSystem;
 
 /**
  * Util class to implements the Phases include with delegation
@@ -49,13 +49,13 @@
      * @throws AxisFault
      */
     public ArrayList getPhases(int flow) throws AxisFault {
-        if (flow == EngineConfiguration.INFLOW) {
+        if (flow == AxisSystem.INFLOW) {
             return inflow;
-        } else if (flow == EngineConfiguration.OUTFLOW) {
+        } else if (flow == AxisSystem.OUTFLOW) {
             return outflow;
-        } else if (flow == EngineConfiguration.FAULT_IN_FLOW) {
+        } else if (flow == AxisSystem.FAULT_IN_FLOW) {
             return faultInflow;
-        } else if (flow == EngineConfiguration.FAULT_OUT_FLOW) {
+        } else if (flow == AxisSystem.FAULT_OUT_FLOW) {
             return faultOutflow;
         } else {
             throw new AxisFault("Unknown type flow ");
@@ -70,13 +70,13 @@
          * @throws AxisFault
          */
     public void setPhases(ArrayList phases, int flow) throws AxisFault {
-        if (flow == EngineConfiguration.INFLOW) {
+        if (flow == AxisSystem.INFLOW) {
             inflow = phases;
-        } else if (flow == EngineConfiguration.OUTFLOW) {
+        } else if (flow == AxisSystem.OUTFLOW) {
             outflow = phases;
-        } else if (flow == EngineConfiguration.FAULT_IN_FLOW) {
+        } else if (flow == AxisSystem.FAULT_IN_FLOW) {
             faultInflow = phases;
-        }else if (flow == EngineConfiguration.FAULT_OUT_FLOW) {
+        }else if (flow == AxisSystem.FAULT_OUT_FLOW) {
             faultOutflow = phases;
         } else {
             throw new AxisFault("Unknown type flow ");

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java Mon May  9 02:04:08 2005
@@ -17,7 +17,7 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
@@ -37,7 +37,7 @@
     /**
      * Constructor Dispatcher
      */
-    private EngineContext engineContext;
+    private SystemContext engineContext;
     
     public AbstractDispatcher() {
         init(new HandlerMetadata(NAME));

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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -18,7 +18,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
@@ -37,7 +37,7 @@
     /**
      * Constructor Dispatcher
      */
-    private EngineContext engineContext;
+    private SystemContext engineContext;
 
     public AddressingBasedDispatcher() {
         init(new HandlerMetadata(NAME));

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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -15,7 +15,7 @@
  */
 package org.apache.axis.engine;
 
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.description.AxisTransportIn;
@@ -37,14 +37,14 @@
      * Field log
      */
     private Log log = LogFactory.getLog(getClass());
-    private EngineContext engineContext;
+    private SystemContext engineContext;
 
     /**
      * Constructor AxisEngine
      *
      *
      */
-    public AxisEngine(EngineContext engineContext) {
+    public AxisEngine(SystemContext engineContext) {
         log.info("Axis Engine Started");
         this.engineContext = engineContext;
     }
@@ -92,7 +92,7 @@
             }
 
             // Add the phases that are are at Global scope
-            chain.addPhases(engineContext.getPhases(EngineConfiguration.OUTFLOW));
+            chain.addPhases(engineContext.getPhases(AxisSystem.OUTFLOW));
             Phase addressingPhase = new SimplePhase("addressing");
             addressingPhase.addHandler(new AddressingOutHandler());
             chain.addPhase(addressingPhase);
@@ -100,7 +100,7 @@
             // Receiving is always a matter of running the transport handlers first
 
             AxisTransportIn transport = context.getTransportIn();
-            chain.addPhases(transport.getPhases(EngineConfiguration.OUTFLOW));
+            chain.addPhases(transport.getPhases(AxisSystem.OUTFLOW));
 
             // startet rolling
             chain.invoke(context);
@@ -139,14 +139,14 @@
             AxisTransportIn transport = context.getTransportIn();
             if (transport != null) {
                 log.info("Using the transport" + transport.getName());
-                chain.addPhases(transport.getPhases(EngineConfiguration.INFLOW));
+                chain.addPhases(transport.getPhases(AxisSystem.INFLOW));
             }
 
             Phase addressingPhase = new SimplePhase("addressing");
             addressingPhase.addHandler(new AddressingInHandler());
             chain.addPhase(addressingPhase);
             //add the Global flow
-            chain.addPhases(engineContext.getPhases(EngineConfiguration.INFLOW));
+            chain.addPhases(engineContext.getPhases(AxisSystem.INFLOW));
 
             // create a Dispatch Phase and add it to the Execution Chain
             Phase dispatchPhase = chain.getPhase(SimplePhase.DISPATCH_PHASE);
@@ -249,7 +249,7 @@
      * @param obj the object to be stored
      * @return the storage key
      */
-    public Object store(EngineContext context, Object obj) {
+    public Object store(SystemContext context, Object obj) {
         return context.getStorage().put(obj);
     }
 
@@ -260,7 +260,7 @@
      * @param key
      * @return
      */
-    public Object retrieve(EngineContext context, Object key) {
+    public Object retrieve(SystemContext context, Object key) {
         return context.getStorage().get(key);
     }
 
@@ -270,7 +270,7 @@
      * @param key
      * @return  the object removed
      */
-    public Object remove(EngineContext context, Object key) {
+    public Object remove(SystemContext context, Object key) {
         return context.getStorage().remove(key);
     }
 
@@ -279,7 +279,7 @@
      * @param context
      * @return
      */
-    public boolean clearStorage(EngineContext context) {
+    public boolean clearStorage(SystemContext context) {
         return context.getStorage().clean();
     }
 }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java Mon May  9 02:04:08 2005
@@ -19,7 +19,7 @@
 import java.io.InputStream;
 
 import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContext;
 
@@ -27,12 +27,12 @@
  * Class Sender
  */
 public class MessageSender {
-    private EngineContext engineContext;
+    private SystemContext engineContext;
     private MessageInformationHeadersCollection messageInfoHeaders;
     private OperationContext mepContext;
     
     
-    public MessageSender(EngineContext engineContext){
+    public MessageSender(SystemContext engineContext){
         this.engineContext = engineContext;
     }              
     

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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -18,7 +18,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
@@ -68,7 +68,7 @@
             if (index > 0) {
                 serviceStr = filePart.substring(index + URI_ID_STRING.length() + 1);
 
-                EngineContext engineContext = messageContext.getEngineContext();
+                SystemContext engineContext = messageContext.getEngineContext();
 
                 if ((index = serviceStr.indexOf('/')) > 0) {
                     serviceName = new QName(serviceStr.substring(0, index));
@@ -77,7 +77,7 @@
                     serviceName = new QName(serviceStr);
                 }
 
-                EngineConfiguration registry = messageContext.getEngineContext().getEngineConfig();
+                AxisSystem registry = messageContext.getEngineContext().getEngineConfig();
                 return registry.getService(serviceName);
             }
         }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java Mon May  9 02:04:08 2005
@@ -17,12 +17,12 @@
  */
 package org.apache.axis.modules;
 
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.ExecutionChain;
 
 public interface Module {
-    public void init(EngineContext moduleContext) throws AxisFault;
+    public void init(SystemContext moduleContext) throws AxisFault;
 
     public void engage(ExecutionChain exeChain) throws AxisFault;
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java Mon May  9 02:04:08 2005
@@ -17,11 +17,11 @@
 
 import java.util.ArrayList;
 
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.description.HandlerMetadata;
 import org.apache.axis.description.PhasesInclude;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfiguration;
+import org.apache.axis.engine.AxisSystem;
 import org.apache.axis.engine.Handler;
 import org.apache.axis.engine.SimplePhase;
 import org.apache.commons.logging.Log;
@@ -44,7 +44,7 @@
     /**
      * Referance to ServerMetaData inorder to get information about phases.
      */
-    private final EngineConfiguration registry;    // = new  ServerMetaData();
+    private final AxisSystem registry;    // = new  ServerMetaData();
 
     private PhasesInclude phaseInclude;
 
@@ -60,13 +60,13 @@
      *
      * @param registry
      */
-    public PhaseHolder(EngineConfiguration registry, PhasesInclude phaseInclude) {
+    public PhaseHolder(AxisSystem registry, PhasesInclude phaseInclude) {
         this.registry = registry;
         this.phaseInclude = phaseInclude;
         fillFlowPhases();
     }
 
-    public PhaseHolder(EngineConfiguration registry) {
+    public PhaseHolder(AxisSystem registry) {
         this.registry = registry;
         this.phaseInclude = null;
         fillFlowPhases();
@@ -255,7 +255,7 @@
                             }
                             inChain.add(axisPhase);
                         }
-                        phaseInclude.setPhases(inChain, EngineConfiguration.INFLOW);
+                        phaseInclude.setPhases(inChain, AxisSystem.INFLOW);
                         // service.setPhases(inChain, EngineConfiguration.INFLOW);
                         break;
                     }
@@ -273,7 +273,7 @@
                             outChain.add(axisPhase);
                         }
                         //service.setPhases(outChain, EngineConfiguration.OUTFLOW);
-                        phaseInclude.setPhases(outChain, EngineConfiguration.OUTFLOW);
+                        phaseInclude.setPhases(outChain, AxisSystem.OUTFLOW);
                         break;
                     }
                 case PhaseMetadata.FAULT_IN_FLOW:
@@ -289,7 +289,7 @@
                             }
                             faultInChain.add(axisPhase);
                         }
-                        phaseInclude.setPhases(faultInChain, EngineConfiguration.FAULT_IN_FLOW);
+                        phaseInclude.setPhases(faultInChain, AxisSystem.FAULT_IN_FLOW);
                         // service.setPhases(faultInChain, EngineConfiguration.FAULT_IN_FLOW);
                         break;
                     }
@@ -306,7 +306,7 @@
                             }
                             faultOutChain.add(axisPhase);
                         }
-                        phaseInclude.setPhases(faultOutChain, EngineConfiguration.FAULT_OUT_FLOW);
+                        phaseInclude.setPhases(faultOutChain, AxisSystem.FAULT_OUT_FLOW);
                         //   service.setPhases(faultOutChain, EngineConfiguration.FAULT_IN_FLOW);
                         break;
                     }
@@ -353,7 +353,7 @@
                             }
                             inChain.add(axisPhase);
                         }
-                        trnsport.setPhases(inChain, EngineConfiguration.INFLOW);
+                        trnsport.setPhases(inChain, AxisSystem.INFLOW);
                         break;
                     }
                 case PhaseMetadata.OUT_FLOW:
@@ -383,7 +383,7 @@
                             }
                             outChain.add(axisPhase);
                         }
-                        trnsport.setPhases(outChain, EngineConfiguration.OUTFLOW);
+                        trnsport.setPhases(outChain, AxisSystem.OUTFLOW);
                         break;
                     }
                 case PhaseMetadata.FAULT_IN_FLOW:
@@ -413,7 +413,7 @@
                             }
                             faultChain.add(axisPhase);
                         }
-                        trnsport.setPhases(faultChain, EngineConfiguration.FAULT_IN_FLOW);
+                        trnsport.setPhases(faultChain, AxisSystem.FAULT_IN_FLOW);
                         break;
                     }
                 case PhaseMetadata.FAULT_OUT_FLOW:
@@ -443,7 +443,7 @@
                             }
                             faultChain.add(axisPhase);
                         }
-                        trnsport.setPhases(faultChain, EngineConfiguration.FAULT_OUT_FLOW);
+                        trnsport.setPhases(faultChain, AxisSystem.FAULT_OUT_FLOW);
                         break;
                     }
             }
@@ -460,7 +460,7 @@
      * @param chainType
      * @throws PhaseException
      */
-    public void buildGlobalChain(EngineContext engineContext, int chainType)
+    public void buildGlobalChain(SystemContext engineContext, int chainType)
             throws PhaseException {
         try {
             //OrderThePhases();
@@ -479,7 +479,7 @@
                             }
                             inChain.add(axisPhase);
                         }
-                        engineContext.setPhases(inChain, EngineConfiguration.INFLOW);
+                        engineContext.setPhases(inChain, AxisSystem.INFLOW);
                         break;
                     }
                 case PhaseMetadata.OUT_FLOW:
@@ -495,7 +495,7 @@
                             }
                             outChain.add(axisPhase);
                         }
-                        engineContext.setPhases(outChain, EngineConfiguration.OUTFLOW);
+                        engineContext.setPhases(outChain, AxisSystem.OUTFLOW);
                         break;
                     }
                 case PhaseMetadata.FAULT_IN_FLOW:
@@ -511,7 +511,7 @@
                             }
                             faultChain.add(axisPhase);
                         }
-                        engineContext.setPhases(faultChain, EngineConfiguration.FAULT_IN_FLOW);
+                        engineContext.setPhases(faultChain, AxisSystem.FAULT_IN_FLOW);
                         break;
                     }
                 case PhaseMetadata.FAULT_OUT_FLOW:
@@ -527,7 +527,7 @@
                             }
                             faultChain.add(axisPhase);
                         }
-                        engineContext.setPhases(faultChain, EngineConfiguration.FAULT_OUT_FLOW);
+                        engineContext.setPhases(faultChain, AxisSystem.FAULT_OUT_FLOW);
                         break;
                     }
             }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java Mon May  9 02:04:08 2005
@@ -23,7 +23,7 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.description.AxisGlobal;
 import org.apache.axis.description.AxisModule;
@@ -34,8 +34,8 @@
 import org.apache.axis.description.Flow;
 import org.apache.axis.description.HandlerMetadata;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfiguration;
-import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisSystemImpl;
 
 /**
  * Class PhaseResolver
@@ -44,7 +44,7 @@
     /**
      * Field engineConfig
      */
-    private final EngineConfiguration engineConfig;
+    private final AxisSystem engineConfig;
 
     /**
      * Field axisService
@@ -63,7 +63,7 @@
      *
      * @param engineConfig
      */
-    public PhaseResolver(EngineConfiguration engineConfig) {
+    public PhaseResolver(AxisSystem engineConfig) {
         this.engineConfig = engineConfig;
     }
 
@@ -73,7 +73,7 @@
      * @param engineConfig
      * @param serviceContext
      */
-    public PhaseResolver(EngineConfiguration engineConfig,
+    public PhaseResolver(AxisSystem engineConfig,
                          ServiceContext serviceContext) {
         this.engineConfig = engineConfig;
         this.axisService = serviceContext.getServiceConfig();
@@ -345,9 +345,9 @@
      * @throws AxisFault
      * @throws PhaseException
      */
-    public EngineContext buildGlobalChains()
+    public SystemContext buildGlobalChains()
             throws AxisFault, PhaseException {
-        EngineContext engineContext = new EngineContext(engineConfig);
+        SystemContext engineContext = new SystemContext(engineConfig);
         AxisGlobal global = engineConfig.getGlobal();
         List modules = (List) global.getModules();
         int count = modules.size();
@@ -357,7 +357,7 @@
         for (int type = 1; type < 5; type++) {
             phaseHolder = new PhaseHolder(engineConfig);
             phaseHolder.setFlowType(type);
-            Collection col = ((EngineConfigurationImpl) engineConfig).getModules().values();
+            Collection col = ((AxisSystemImpl) engineConfig).getModules().values();
             for (Iterator iterator = col.iterator(); iterator.hasNext();) {
                 AxisModule axismodule = (AxisModule) iterator.next();
                 switch (type) {

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java Mon May  9 02:04:08 2005
@@ -16,7 +16,7 @@
 package org.apache.axis.transport;
 
 
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisFault;
 
@@ -24,5 +24,5 @@
  * Class TransportReceiver
  */
 public abstract class TransportReceiver{
-    public abstract void invoke(MessageContext msgContext,EngineContext engineContext) throws AxisFault;
+    public abstract void invoke(MessageContext msgContext,SystemContext engineContext) throws AxisFault;
 }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java Mon May  9 02:04:08 2005
@@ -37,7 +37,7 @@
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.EngineContextFactory;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.SessionContext;
 import org.apache.axis.engine.AxisEngine;
@@ -54,7 +54,7 @@
      * Field engineRegistry
      */
     
-    private EngineContext engineContext;
+    private SystemContext engineContext;
 
     /**
      * Field LIST_MULTIPLE_SERVICE_JSP_NAME

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java Mon May  9 02:04:08 2005
@@ -25,7 +25,7 @@
 
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisEngine;
 import org.apache.axis.engine.AxisFault;
@@ -89,7 +89,7 @@
      * @param msgContext
      * @throws AxisFault
      */
-    public void invoke(MessageContext msgContext,EngineContext engineContext) throws AxisFault{
+    public void invoke(MessageContext msgContext,SystemContext engineContext) throws AxisFault{
         Reader in = (Reader) msgContext.getProperty(MessageContext.TRANSPORT_READER);
         if (in != null) {
             boolean serverSide = msgContext.isServerSide();

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java Mon May  9 02:04:08 2005
@@ -28,7 +28,7 @@
 import org.apache.axis.Constants;
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.context.EngineContextFactory;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.AxisTransportOut;
 import org.apache.axis.engine.AxisFault;
@@ -53,7 +53,7 @@
     /**
      * Field engineReg
      */
-    protected EngineContext engineReg;
+    protected SystemContext engineReg;
 
     /**
      * Field serverSocket
@@ -76,7 +76,7 @@
      *
      * @param reg
      */
-    public SimpleHTTPServer(EngineContext reg, ServerSocket serverSoc) {
+    public SimpleHTTPServer(SystemContext reg, ServerSocket serverSoc) {
         this.engineReg = reg;
         this.serverSocket = serverSoc;
     }
@@ -251,7 +251,7 @@
      *
      * @return
      */
-    public EngineContext getEngineReg() {
+    public SystemContext getEngineReg() {
         return engineReg;
     }
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java Mon May  9 02:04:08 2005
@@ -31,7 +31,7 @@
 import org.apache.axis.Constants;
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisEngine;
 import org.apache.axis.engine.AxisFault;
@@ -53,7 +53,7 @@
 
     private SMTPClient client = null;
 
-    private EngineContext reg = null;
+    private SystemContext reg = null;
 
     // Current message
     private MimeMessage mimeMessage;
@@ -75,7 +75,7 @@
      * @param mimeMessage
      */
     public MailWorker(SimpleMailListner server, MimeMessage mimeMessage,
-                      EngineContext reg) {
+                      SystemContext reg) {
         this.server = server;
         this.mimeMessage = mimeMessage;
         this.reg = reg;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java Mon May  9 02:04:08 2005
@@ -25,9 +25,9 @@
 import javax.mail.internet.MimeMessage;
 
 import org.apache.axis.context.EngineContextFactory;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.engine.AxisEngine;
-import org.apache.axis.engine.EngineConfiguration;
+import org.apache.axis.engine.AxisSystem;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.net.pop3.POP3Client;
@@ -65,7 +65,7 @@
 
     private String password;
 
-    private static EngineContext er = null;
+    private static SystemContext er = null;
 
     public SimpleMailListner(String host, int port, String userid, String password,
             String dir) {
@@ -109,7 +109,7 @@
 
     //This is needed to create the AxisEngine. Have to find out how to get this
     // wrking in the class -- CT 07-Feb-2005.
-    private static EngineConfiguration reg = null;
+    private static AxisSystem reg = null;
 
     protected static synchronized AxisEngine getAxisEngine() {
         if (myAxisEngine == null) {

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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -20,7 +20,7 @@
 import org.apache.axis.Constants;
 import org.apache.axis.addressing.MessageInformationHeadersCollection;
 import org.apache.axis.addressing.miheaders.RelatesTo;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.description.AxisOperation;
@@ -29,7 +29,7 @@
 import org.apache.axis.description.HandlerMetadata;
 import org.apache.axis.description.ParameterImpl;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfiguration;
+import org.apache.axis.engine.AxisSystem;
 import org.apache.axis.engine.Handler;
 import org.apache.axis.engine.MessageReceiver;
 import org.apache.axis.engine.SimplePhase;
@@ -64,17 +64,17 @@
             serviceContext,
             Constants.PHASE_SERVICE,
             service.getInFlow(),
-            EngineConfiguration.INFLOW);
+            AxisSystem.INFLOW);
         addPhasesToServiceFromFlow(
             serviceContext,
             Constants.PHASE_SERVICE,
             service.getOutFlow(),
-            EngineConfiguration.OUTFLOW);
+            AxisSystem.OUTFLOW);
         addPhasesToServiceFromFlow(
             serviceContext,
             Constants.PHASE_SERVICE,
             service.getFaultInFlow(),
-            EngineConfiguration.FAULT_IN_FLOW);
+            AxisSystem.FAULT_IN_FLOW);
     }
 
     public static AxisService createSimpleService(
@@ -93,7 +93,7 @@
 
     public static ServiceContext createServiceContext(
         AxisService service,
-        EngineContext engineContext)
+        SystemContext engineContext)
         throws AxisFault {
         ServiceContext serviceContext = new ServiceContext(service, engineContext);
         createExecutionChains(serviceContext);

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java Mon May  9 02:04:08 2005
@@ -32,7 +32,7 @@
  */
 public class MEPContextTest extends AbstractTestCase {
 
-	private EngineContext engineCtx = new EngineContext(null);
+	private SystemContext engineCtx = new SystemContext(null);
 
     public MEPContextTest(String arg0) {
         super(arg0);
@@ -40,7 +40,7 @@
     //FIXME TODO Chathura
     public void testMEPfindingOnRelatesTO() throws Exception{
     	 
-    	ServiceContext sessionContext = new ServiceContext(new AxisService(),new EngineContext(null));
+    	ServiceContext sessionContext = new ServiceContext(new AxisService(),new SystemContext(null));
 		MessageContext messageContext1 = this.getBasicMessageContext();
     	
     	messageContext1.setMessageID(new Long(System.currentTimeMillis()).toString());

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java Mon May  9 02:04:08 2005
@@ -23,7 +23,7 @@
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.description.Flow;
-import org.apache.axis.engine.EngineConfiguration;
+import org.apache.axis.engine.AxisSystem;
 
 public class BuildERWithDeploymentTest extends AbstractTestCase {
     /**
@@ -36,7 +36,7 @@
     public void testDeployment() throws Exception {
         String filename = "./target/test-resources/deployment";
         EngineContextFactory builder = new EngineContextFactory();
-        EngineConfiguration er = builder.buildEngineContext(filename).getEngineConfig();
+        AxisSystem er = builder.buildEngineContext(filename).getEngineConfig();
 
         assertNotNull(er);
         assertNotNull(er.getGlobal());

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java Mon May  9 02:04:08 2005
@@ -22,11 +22,11 @@
 
 import org.apache.axis.context.EngineContextFactory;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfiguration;
+import org.apache.axis.engine.AxisSystem;
 import org.apache.axis.phaseresolver.PhaseException;
 
 public class DeploymentotalTest extends TestCase {
-    EngineConfiguration er;
+    AxisSystem er;
 
     public void testparseService1() throws PhaseException, DeploymentException, AxisFault, XMLStreamException {
         String filename = "./target/test-resources/deployment";

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java Mon May  9 02:04:08 2005
@@ -23,7 +23,7 @@
 import org.apache.axis.description.AxisTransportIn;
 import org.apache.axis.description.AxisTransportOut;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfiguration;
+import org.apache.axis.engine.AxisSystem;
 import org.apache.axis.phaseresolver.PhaseException;
 
 public class TransportDeploymentTest extends AbstractTestCase {
@@ -37,7 +37,7 @@
     public void testTransports() throws AxisFault, PhaseException, DeploymentException, XMLStreamException {
         DeploymentEngine engine = new DeploymentEngine(testResourceDir + "/deployment", "server-transport.xml");
         engine.load();
-        EngineConfiguration er = engine.getEngineconfig();
+        AxisSystem er = engine.getEngineconfig();
         AxisTransportIn transport = er.getTransportIn(new QName("http"));
         assertNotNull(transport);
         assertNotNull(transport.getInFlow());

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java Mon May  9 02:04:08 2005
@@ -21,13 +21,13 @@
 import org.apache.axis.AbstractTestCase;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfiguration;
-import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisSystemImpl;
 import org.apache.axis.engine.Handler;
 import org.apache.axis.handlers.AbstractHandler;
 
 public class RegistryTest extends AbstractTestCase {
-    private EngineConfiguration reg;
+    private AxisSystem reg;
 
     public RegistryTest(String testName) {
         super(testName);
@@ -37,7 +37,7 @@
     public void testRegistry() throws Exception {
         AxisGlobal ag = new AxisGlobal();
         testParameteInClude(ag);
-        reg = new EngineConfigurationImpl(ag);
+        reg = new AxisSystemImpl(ag);
 
         QName moduleName = new QName("module1");
         AxisModule modlue = new AxisModule(moduleName);

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.java Mon May  9 02:04:08 2005
@@ -32,7 +32,7 @@
 public class AbstractEngineTest extends TestCase {
     protected MessageContext mc;
     protected ArrayList executedHandlers = new ArrayList();
-    protected EngineConfiguration engineRegistry;
+    protected AxisSystem engineRegistry;
     protected QName serviceName = new QName("axis/services/NullService");
     protected QName opearationName = new QName("NullOperation");
     protected AxisService service;

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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -20,7 +20,7 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContextFactory;
 import org.apache.axis.context.ServiceContext;
@@ -38,7 +38,7 @@
   
     private QName serviceName = new QName("NullService");
     private QName operationName = new QName("DummyOp");
-    private EngineContext engineContext;
+    private SystemContext engineContext;
 
     public EnginePausingTest() {
     }
@@ -47,14 +47,14 @@
         super(arg0);
     }
     protected void setUp() throws Exception {
-        engineRegistry = new EngineConfigurationImpl(new AxisGlobal());
+        engineRegistry = new AxisSystemImpl(new AxisGlobal());
 
         AxisTransportOut transportOut = new AxisTransportOut(new QName("null"));
         transportOut.setSender(new NullTransportSender());
 
         AxisTransportIn transportIn = new AxisTransportIn(new QName("null"));
         
-        engineContext = new EngineContext(engineRegistry);
+        engineContext = new SystemContext(engineRegistry);
 
         AxisOperation axisOp = new AxisOperation(operationName);
 

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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -22,7 +22,7 @@
 
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContextFactory;
 import org.apache.axis.description.AxisGlobal;
@@ -38,11 +38,11 @@
 public class EngineWithoutPhaseResolvingTest extends AbstractEngineTest {
     private MessageContext mc;
     private ArrayList executedHandlers = new ArrayList();
-    private EngineConfiguration engineRegistry;
+    private AxisSystem engineRegistry;
     private QName serviceName = new QName("axis/services/NullService");
     private QName opearationName = new QName("NullOperation");
     private AxisService service;
-    private EngineContext engineContext;
+    private SystemContext engineContext;
 
     public EngineWithoutPhaseResolvingTest() {
     }
@@ -52,8 +52,8 @@
     }
     protected void setUp() throws Exception {
 
-        engineRegistry = new EngineConfigurationImpl(new AxisGlobal());
-        engineContext = new EngineContext(engineRegistry);
+        engineRegistry = new AxisSystemImpl(new AxisGlobal());
+        engineContext = new SystemContext(engineRegistry);
         AxisTransportOut transport = new AxisTransportOut(new QName("null"));
         transport.setSender(new NullTransportSender());
 

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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -17,7 +17,7 @@
 package org.apache.axis.engine;
 
 import org.apache.axis.AbstractTestCase;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContextFactory;
 import org.apache.axis.description.AxisGlobal;
@@ -31,8 +31,8 @@
     }
 
     public void testMesssageContext() throws AxisFault {
-        EngineConfiguration er = new EngineConfigurationImpl(new AxisGlobal());
-        EngineContext engineContext = new EngineContext(er);
+        AxisSystem er = new AxisSystemImpl(new AxisGlobal());
+        SystemContext engineContext = new SystemContext(er);
         MessageContext msgctx =
             new MessageContext(
                 engineContext,

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java Mon May  9 02:04:08 2005
@@ -8,8 +8,8 @@
 import org.apache.axis.description.AxisGlobal;
 import org.apache.axis.description.HandlerMetadata;
 import org.apache.axis.description.PhaseRule;
-import org.apache.axis.engine.EngineConfiguration;
-import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisSystemImpl;
 import org.apache.axis.engine.Handler;
 import org.apache.axis.phaseresolver.PhaseHolder;
 
@@ -22,7 +22,7 @@
 public class PhaseRuleTest extends AbstractTestCase {
 
     PhaseRuleTest phaserul;
-    EngineConfiguration registry;
+    AxisSystem registry;
 
     public PhaseRuleTest(String testName) {
         super(testName);
@@ -32,17 +32,17 @@
         super.setUp();
         phaserul = new PhaseRuleTest("");
         AxisGlobal global = new AxisGlobal();
-        registry = new EngineConfigurationImpl(global);
+        registry = new AxisSystemImpl(global);
         ArrayList inPhase = new ArrayList();
 
         inPhase.add("global");
         inPhase.add("transport");
         inPhase.add("Logging");
         inPhase.add("service");
-        ((EngineConfigurationImpl) registry).setInPhases(inPhase);
-        ((EngineConfigurationImpl) registry).setInFaultPhases(inPhase);
-        ((EngineConfigurationImpl) registry).setOutFaultPhases(inPhase);
-        ((EngineConfigurationImpl) registry).setOutPhases(inPhase);
+        ((AxisSystemImpl) registry).setInPhases(inPhase);
+        ((AxisSystemImpl) registry).setInFaultPhases(inPhase);
+        ((AxisSystemImpl) registry).setOutFaultPhases(inPhase);
+        ((AxisSystemImpl) registry).setOutPhases(inPhase);
 
         Handler han = null;//(Handler)Class.forName("org.apache.axis.handlers.AbstractHandler").newInstance();
         PhaseHolder ph = new PhaseHolder(registry);

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java Mon May  9 02:04:08 2005
@@ -43,7 +43,7 @@
     private QName serviceName = new QName("", "EchoXMLService");
     private QName operationName = new QName("http://localhost/my", "echoOMElement");
     
-    private EngineConfiguration engineRegistry;
+    private AxisSystem engineRegistry;
     private MessageContext mc;
     private Thread thisThread;
     private SimpleHTTPServer sas;

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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -53,7 +53,7 @@
     private QName operationName = new QName("echoOMElement");
     private QName transportName = new QName("http://localhost/my", "NullTransport");
 
-    private EngineConfiguration engineRegistry;
+    private AxisSystem engineRegistry;
     private MessageContext mc;
     private Thread thisThread;
     private SimpleHTTPServer sas;

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=169257&r1=169256&r2=169257&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 Mon May  9 02:04:08 2005
@@ -45,7 +45,7 @@
         new QName("http://ws.apache.org/axis2", "echoVoid");
     private QName transportName = new QName("", "NullTransport");
 
-    private EngineConfiguration engineRegistry;
+    private AxisSystem engineRegistry;
     private MessageContext mc;
     private Thread thisThread;
     private SimpleHTTPServer sas;

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java?rev=169257&r1=169256&r2=169257&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java Mon May  9 02:04:08 2005
@@ -22,7 +22,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.context.EngineContextFactory;
-import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.transport.http.SimpleHTTPServer;
@@ -53,7 +53,7 @@
             
             File file = new File("target/test-resources/samples");
             System.out.println(new File(file,"server.xml").exists());
-            EngineContext er = erfac.buildEngineContext(file.getAbsolutePath());
+            SystemContext er = erfac.buildEngineContext(file.getAbsolutePath());
             try {
                 Thread.sleep(2000);
             } catch (InterruptedException e1) {