axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hemap...@apache.org
Subject svn commit: r171042 - in /webservices/axis/trunk/java/modules: addressing/test/org/apache/axis/handlers/addressing/ 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/phaseresolver/ core/src/org/apache/axis/transport/http/ core/src/org/apache/axis/transport/mail/ core/src/org/apache/axis/transport/tcp/ core/test/org/apache/axis/deployment/ samples/test/org/apache/axis/engine/ samples/test/org/apache/axis/integration/
Date Fri, 20 May 2005 03:59:51 GMT
Author: hemapani
Date: Thu May 19 20:59:49 2005
New Revision: 171042

URL: http://svn.apache.org/viewcvs?rev=171042&view=rev
Log:
cleaning up the code

Removed:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesInclude.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java
Modified:
    webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportOutDescription.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.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/SimpleHTTPServer.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/transport/tcp/TCPServer.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/BuildWithAddressingTest.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/InvalidServiceTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/ModifiedConfigFileTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/SystemPhasesremovedTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java

Modified: webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java
(original)
+++ webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java
Thu May 19 20:59:49 2005
@@ -7,7 +7,7 @@
 import org.apache.axis.deployment.DeploymentEngine;
 import org.apache.axis.deployment.DeploymentException;
 import org.apache.axis.description.ModuleDescription;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.engine.AxisConfiguration;
 import org.apache.axis.engine.AxisFault;
 
@@ -39,7 +39,7 @@
     }
 
     public void testExtractAddressingInformationFromHeaders() throws AxisFault {
-//            EngineContextFactory builder = new EngineContextFactory();
+//            ConfigurationContextFactory builder = new ConfigurationContextFactory();
 //            AxisConfiguration er = builder.buildEngineContext("target").getEngineConfig();
 //
 //            //DeploymentEngine deploymentEngine = new DeploymentEngine();

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=171042&r1=171041&r2=171042&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 Thu May
19 20:59:49 2005
@@ -22,7 +22,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.description.OperationDescription;
@@ -106,7 +106,7 @@
      * @throws AxisFault
      */
     private static ServiceContext assumeServiceContext() throws AxisFault {
-        EngineContextFactory efac = new EngineContextFactory();
+        ConfigurationContextFactory efac = new ConfigurationContextFactory();
         ConfigurationContext sysContext = efac.buildClientEngineContext(null);
 
         //create new service

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
Thu May 19 20:59:49 2005
@@ -79,7 +79,7 @@
      * 
      * Follwoing code works for the time been
      * <code>
-     *  EngineContextFactory efac = new EngineContextFactory();
+     *  ConfigurationContextFactory efac = new ConfigurationContextFactory();
         ConfigurationContext sysContext = efac.buildClientEngineContext(null); 
         // above line "null" may be a file name if you know the client repssitory
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java Thu May
19 20:59:49 2005
@@ -18,7 +18,7 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.context.ConfigurationContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.context.MessageContext;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContext.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContext.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContext.java
Thu May 19 20:59:49 2005
@@ -18,19 +18,17 @@
  *  Runtime state of the engine
  */
 
-import org.apache.axis.description.PhasesInclude;
-import org.apache.axis.description.PhasesIncludeImpl;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis.description.ServiceDescription;
 import org.apache.axis.engine.AxisConfiguration;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.storage.AxisStorage;
 
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ConfigurationContext extends AbstractContext implements PhasesInclude {
+public class ConfigurationContext extends AbstractContext{
 
     private AxisConfiguration engineConfig;
     private AxisStorage storage;
@@ -46,16 +44,12 @@
 
     private final Map serviceContextMap;
 
-    private PhasesInclude phaseInclude;
-
     public ConfigurationContext(AxisConfiguration registry) {
         super(null);
         this.engineConfig = registry;
         serviceContextMap = new HashMap();
         moduleContextMap = new HashMap();
         sessionContextMap = new HashMap();
-        phaseInclude = new PhasesIncludeImpl();
-
     }
 
     /**
@@ -87,25 +81,7 @@
         engineConfig = configuration;
     }
 
-    /**
-     * @param flow
-     * @return
-     * @throws AxisFault
-     */
-    public ArrayList getPhases(int flow) throws AxisFault {
-        return phaseInclude.getPhases(flow);
-    }
-
-    /**
-     * @param phases
-     * @param flow
-     * @throws AxisFault
-     */
-    public void setPhases(ArrayList phases, int flow) throws AxisFault {
-        phaseInclude.setPhases(phases, flow);
-    }
-
-    public void registerOperationContext(String messageID, OperationContext mepContext) {
+     public void registerOperationContext(String messageID, OperationContext mepContext)
{
         this.operationContextMap.put(messageID, mepContext);
     }
 

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=171042&r1=171041&r2=171042&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
Thu May 19 20:59:49 2005
@@ -16,7 +16,7 @@
 
 package org.apache.axis.deployment;
 
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.deployment.listener.RepositoryListenerImpl;
 import org.apache.axis.deployment.repository.utill.ArchiveFileData;
 import org.apache.axis.deployment.repository.utill.ArchiveReader;
@@ -87,7 +87,7 @@
     private ArchiveFileData currentArchiveFile;
 
     //tobuild chains
-    private EngineContextFactory factory;
+    private ConfigurationContextFactory factory;
 
     /**
      * Default constructor is need to deploye module and service programatically
@@ -143,7 +143,7 @@
 
             }
         }
-        factory = new EngineContextFactory();
+        factory = new ConfigurationContextFactory();
         this.engineConfigName = RepositaryName + '/' + serverXMLFile;
     }
 
@@ -284,7 +284,7 @@
 
             }
         }
-        factory = new EngineContextFactory();
+        factory = new ConfigurationContextFactory();
         this.engineConfigName = clientHome + '/' + clientXML;
     }
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java
Thu May 19 20:59:49 2005
@@ -15,17 +15,15 @@
 */
 package org.apache.axis.description;
 
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.transport.TransportReceiver;
-
 import javax.xml.namespace.QName;
-import java.util.ArrayList;
+
+import org.apache.axis.transport.TransportReceiver;
 
 /**
  * Represents a transport deployed in AXis2
  */
 public class TransportInDescription
-        implements ParameterInclude, PhasesInclude {
+        implements ParameterInclude {
     /**
      * Field paramInclude
      */
@@ -34,7 +32,6 @@
     /**
      * Field phasesInclude
      */
-    protected final PhasesInclude phasesInclude;
 
     /**
      * Field flowInclude
@@ -61,7 +58,6 @@
      */
     public TransportInDescription(QName name) {
         paramInclude = new ParameterIncludeImpl();
-        phasesInclude = new PhasesIncludeImpl();
         this.name = name;
     }
 
@@ -82,24 +78,6 @@
      */
     public void addParameter(Parameter param) {
         paramInclude.addParameter(param);
-    }
-
-    /**
-     * @param flow
-     * @return
-     * @throws AxisFault
-     */
-    public ArrayList getPhases(int flow) throws AxisFault {
-        return phasesInclude.getPhases(flow);
-    }
-
-    /**
-     * @param phases
-     * @param flow
-     * @throws AxisFault
-     */
-    public void setPhases(ArrayList phases, int flow) throws AxisFault {
-        phasesInclude.setPhases(phases, flow);
     }
 
     /**

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportOutDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportOutDescription.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportOutDescription.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportOutDescription.java
Thu May 19 20:59:49 2005
@@ -15,26 +15,20 @@
  */
 package org.apache.axis.description;
 
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.transport.TransportSender;
-
 import javax.xml.namespace.QName;
-import java.util.ArrayList;
+
+import org.apache.axis.transport.TransportSender;
 
 /**
  * Represents a transport deployed in AXis2
  */
 public class TransportOutDescription
-        implements ParameterInclude, PhasesInclude {
+        implements ParameterInclude {
     /**
      * Field paramInclude
      */
     protected final ParameterInclude paramInclude;
 
-    /**
-     * Field phasesInclude
-     */
-    protected final PhasesInclude phasesInclude;
 
     /**
      * Field flowInclude
@@ -63,7 +57,6 @@
      */
     public TransportOutDescription(QName name) {
         paramInclude = new ParameterIncludeImpl();
-        phasesInclude = new PhasesIncludeImpl();
         this.name = name;
     }
 
@@ -86,23 +79,6 @@
         paramInclude.addParameter(param);
     }
 
-    /**
-     * @param flow
-     * @return
-     * @throws AxisFault
-     */
-    public ArrayList getPhases(int flow) throws AxisFault {
-        return phasesInclude.getPhases(flow);
-    }
-
-    /**
-     * @param phases
-     * @param flow
-     * @throws AxisFault
-     */
-    public void setPhases(ArrayList phases, int flow) throws AxisFault {
-        phasesInclude.setPhases(phases, flow);
-    }
 
     /**
      * @return

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=171042&r1=171041&r2=171042&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
Thu May 19 20:59:49 2005
@@ -15,15 +15,12 @@
 */
 package org.apache.axis.phaseresolver;
 
+import java.util.ArrayList;
+
 import org.apache.axis.description.HandlerDescription;
-import org.apache.axis.description.PhasesInclude;
-import org.apache.axis.engine.AxisConfiguration;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.Handler;
+import org.apache.axis.description.TransportInDescription;
 import org.apache.axis.engine.Phase;
 
-import java.util.ArrayList;
-
 
 /**
  * This class hold all the phases found in the service.xml and server.xml
@@ -87,7 +84,7 @@
     }
 
 
-    public void buildTransportChain(PhasesInclude trnsport, int chainType)
+    public void buildTransportChain(TransportInDescription trnsport, int chainType)
             throws PhaseException {
         /*try {
             HandlerDescription[] handlers;

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=171042&r1=171041&r2=171042&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
Thu May 19 20:59:49 2005
@@ -19,7 +19,7 @@
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.SessionContext;
 import org.apache.axis.engine.AxisEngine;
@@ -87,7 +87,7 @@
         try {
             ServletContext context = config.getServletContext();
             String repoDir = context.getRealPath("/WEB-INF");
-            EngineContextFactory erfac = new EngineContextFactory();
+            ConfigurationContextFactory erfac = new ConfigurationContextFactory();
             engineContext = erfac.buildEngineContext(repoDir);
         } catch (Exception e) {
             throw new ServletException(e);

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=171042&r1=171041&r2=171042&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
Thu May 19 20:59:49 2005
@@ -19,7 +19,7 @@
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.TransportOutDescription;
 import org.apache.axis.engine.AxisFault;
@@ -88,7 +88,7 @@
         try {
             this.serverSocket = serverSoc;
            // Class erClass = Class.forName("org.apache.axis.deployment.EngineContextFactoryImpl");
-            EngineContextFactory erfac = new EngineContextFactory();
+            ConfigurationContextFactory erfac = new ConfigurationContextFactory();
             this.systemContext = erfac.buildEngineContext(dir);
             Thread.sleep(2000);
         } catch (Exception e1) {

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=171042&r1=171041&r2=171042&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
Thu May 19 20:59:49 2005
@@ -17,7 +17,7 @@
 package org.apache.axis.transport.mail;
 
 import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.engine.AxisConfiguration;
 import org.apache.axis.engine.AxisEngine;
 import org.apache.commons.logging.Log;
@@ -73,7 +73,7 @@
         this.userid = userid;
         this.password = password;
         try {
-            EngineContextFactory builder = new EngineContextFactory();
+            ConfigurationContextFactory builder = new ConfigurationContextFactory();
             er = builder.buildEngineContext(dir);
         } catch (Exception e) {
             e.printStackTrace();

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java
Thu May 19 20:59:49 2005
@@ -31,7 +31,7 @@
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.deployment.DeploymentException;
 import org.apache.axis.description.TransportOutDescription;
@@ -58,7 +58,7 @@
 
     public TCPServer(int port, String dir) throws AxisFault {
         try {
-            EngineContextFactory erfac = new EngineContextFactory();
+            ConfigurationContextFactory erfac = new ConfigurationContextFactory();
             ConfigurationContext configContext = erfac.buildEngineContext(dir);
             this.configContext = configContext;
             serversocket = new ServerSocket(port);

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=171042&r1=171041&r2=171042&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
Thu May 19 20:59:49 2005
@@ -17,7 +17,7 @@
 package org.apache.axis.deployment;
 
 import org.apache.axis.AbstractTestCase;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.description.Flow;
 import org.apache.axis.description.OperationDescription;
 import org.apache.axis.description.ServiceDescription;
@@ -35,7 +35,7 @@
 
     public void testDeployment() throws Exception {
         String filename = "./target/test-resources/deployment";
-        EngineContextFactory builder = new EngineContextFactory();
+        ConfigurationContextFactory builder = new ConfigurationContextFactory();
         AxisConfiguration er = builder.buildEngineContext(filename).getEngineConfig();
 
         assertNotNull(er);

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildWithAddressingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildWithAddressingTest.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildWithAddressingTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildWithAddressingTest.java
Thu May 19 20:59:49 2005
@@ -2,7 +2,7 @@
 
 import org.apache.axis.AbstractTestCase;
 import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.description.ModuleDescription;
 import org.apache.axis.engine.AxisConfiguration;
 import org.apache.axis.engine.Phase;
@@ -42,7 +42,7 @@
     public void testDeployment()  {
         //todo this test has to be complete   Deepal once addressing module finalize
        /* String filename = "./target/test-resources/deployment";
-        EngineContextFactory builder = new EngineContextFactory();
+        ConfigurationContextFactory builder = new ConfigurationContextFactory();
         ConfigurationContext er = builder.buildEngineContext(filename);
         ArrayList phases = er.getPhases(AxisConfiguration.INFLOW);
         ModuleDescription modeule = er.getEngineConfig().getModule(new QName("addressing"));

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=171042&r1=171041&r2=171042&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
Thu May 19 20:59:49 2005
@@ -17,7 +17,7 @@
 package org.apache.axis.deployment;
 
 import junit.framework.TestCase;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.engine.AxisConfiguration;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.phaseresolver.PhaseException;
@@ -30,7 +30,7 @@
     public void testparseService1() throws PhaseException, DeploymentException, AxisFault,
XMLStreamException {
         String filename = "./target/test-resources/deployment";
 
-        EngineContextFactory builder = new EngineContextFactory();
+        ConfigurationContextFactory builder = new ConfigurationContextFactory();
         er = builder.buildEngineContext(filename).getEngineConfig();
     }
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/InvalidServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/InvalidServiceTest.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/InvalidServiceTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/InvalidServiceTest.java
Thu May 19 20:59:49 2005
@@ -1,7 +1,7 @@
 package org.apache.axis.deployment;
 
 import junit.framework.TestCase;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.engine.AxisConfiguration;
 
 /*
@@ -37,7 +37,7 @@
     public void testInvalidService() {
         try {
             String filename = "./target/test-resources/InvalidDeployment";
-            EngineContextFactory builder = new EngineContextFactory();
+            ConfigurationContextFactory builder = new ConfigurationContextFactory();
             er = builder.buildEngineContext(filename).getEngineConfig();
             String msg = (String) er.getFaulytServices().get("invalidService");
             if (msg == null || msg.equals("")) {

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/ModifiedConfigFileTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/ModifiedConfigFileTest.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/ModifiedConfigFileTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/ModifiedConfigFileTest.java
Thu May 19 20:59:49 2005
@@ -4,7 +4,7 @@
 import org.apache.axis.engine.AxisConfiguration;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.phaseresolver.PhaseException;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -38,7 +38,7 @@
     public void testPhaseOrderchage() {
         try {
             String filename = "./test-resources/deployment/BadConfigOrderChange";
-            EngineContextFactory builder = new EngineContextFactory();
+            ConfigurationContextFactory builder = new ConfigurationContextFactory();
             er = builder.buildEngineContext(filename).getEngineConfig();
             fail("this must failed gracefully with DeploymentException \"Invalid System predefined
" +
                     "inphases , phase order dose not\" +\n support\\n recheck server.xml\"");

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/SystemPhasesremovedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/SystemPhasesremovedTest.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/SystemPhasesremovedTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/SystemPhasesremovedTest.java
Thu May 19 20:59:49 2005
@@ -2,7 +2,7 @@
 
 import junit.framework.TestCase;
 import org.apache.axis.engine.AxisConfiguration;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 
 /*
  * Copyright 2004,2005 The Apache Software Foundation.
@@ -34,7 +34,7 @@
         public void testPhaseOrderchage() {
             try {
                 String filename = "./test-resources/deployment/SystemPhaseRemove";
-                EngineContextFactory builder = new EngineContextFactory();
+                ConfigurationContextFactory builder = new ConfigurationContextFactory();
                 er = builder.buildEngineContext(filename).getEngineConfig();
                 fail("this must failed gracefully with DeploymentException \"Invalid System
predefined " +
                         "inphases , phase order dose not\" +\n support\\n recheck server.xml\"");

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java?rev=171042&r1=171041&r2=171042&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java
(original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java
Thu May 19 20:59:49 2005
@@ -32,7 +32,7 @@
 import org.apache.axis.clientapi.AsyncResult;
 import org.apache.axis.clientapi.Callback;
 import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.deployment.DeploymentEngine;
@@ -120,7 +120,7 @@
         ModuleDescription moduleDesc =
             deploymentEngine.buildModule(file);
 
-        EngineContextFactory efac = new EngineContextFactory();
+        ConfigurationContextFactory efac = new ConfigurationContextFactory();
         ConfigurationContext sysContext = efac.buildClientEngineContext(null);
         new ConfigurationContext(new AxisConfigurationImpl());
         sysContext.getEngineConfig().addMdoule(moduleDesc);

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=171042&r1=171041&r2=171042&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
Thu May 19 20:59:49 2005
@@ -17,7 +17,7 @@
 package org.apache.axis.integration;
 
 import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.context.EngineContextFactory;
+import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.description.ServiceDescription;
 import org.apache.axis.engine.AxisConfiguration;
@@ -50,7 +50,7 @@
 
     public static synchronized void start() throws Exception {
         if (count == 0) {
-            EngineContextFactory erfac = new EngineContextFactory();
+            ConfigurationContextFactory erfac = new ConfigurationContextFactory();
             
             //File file = new File("modules/samples/target/test-resources/samples");
             File file = new File("target/test-resources/samples");



Mime
View raw message