You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2005/12/02 04:51:23 UTC

svn commit: r351567 [2/2] - in /webservices/axis2/trunk/java/modules: codegen/test/org/apache/axis2/rpc/ common/src/org/apache/axis2/i18n/ core/src/org/apache/axis2/client/ core/src/org/apache/axis2/context/ core/src/org/apache/axis2/deployment/ core/s...

Added: webservices/axis2/trunk/java/modules/core/test-resources/deployment/AxisMessageTestRepo/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/AxisMessageTestRepo/axis2.xml?rev=351567&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/AxisMessageTestRepo/axis2.xml (added)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/AxisMessageTestRepo/axis2.xml Thu Dec  1 19:50:05 2005
@@ -0,0 +1,108 @@
+<axisconfig name="AxisJava2.0">
+    <!-- ================================================= -->
+    <!-- Parameters -->
+    <!-- ================================================= -->
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">false</parameter>
+    <parameter name="enableMTOM" locked="false">true</parameter>
+    <!-- Uncomment this to enable REST support -->
+    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
+
+
+    <parameter name="userName" locked="false">admin</parameter>
+    <parameter name="password" locked="false">axis2</parameter>
+
+    <parameter name="seralizeLocation" locked="false">.</parameter>
+    <hostConfiguration>
+        <ip>127.0.0.1</ip>
+        <port>5555</port>
+    </hostConfiguration>
+
+    <!-- This is the Deafult Message Receiver for the Request Response style Operations -->
+    <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+
+    <!-- ================================================= -->
+    <!-- Transport Ins -->
+    <!-- ================================================= -->
+    <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+        <parameter name="port" locked="false">6060</parameter>
+    </transportReceiver>
+
+    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+        <parameter name="port" locked="false">6060</parameter>
+    </transportReceiver>
+
+    <!-- ================================================= -->
+    <!-- Transport Outs -->
+    <!-- ================================================= -->
+
+    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+    <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+    <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+    </transportSender>
+    <transportSender name="https"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+    </transportSender>
+
+    <phaseOrder type="inflow">
+        <!--  System pre defined phases       -->
+        <phase name="TransportIn"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch">
+            <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+        </phase>
+        <phase name="PostDispatch">
+            <handler name="DispatchPostConditionsEvaluator"
+                     class="org.apache.axis2.engine.DispatchingChecker">
+                <order phase="PostDispatch"/>
+            </handler>
+            <handler name="InstanceDispatcher"
+                     class="org.apache.axis2.engine.InstanceDispatcher">
+                <order phase="PostDispatch"/>
+            </handler>
+            <handler name="SOAPProcessingModelChecker"
+                     class="org.apache.axis2.engine.SOAPProcessingModelChecker">
+                <order phase="PostDispatch"/>
+            </handler>
+        </phase>
+        <!--  System pre defined phases       -->
+        <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
+        <phase name="userphase1"/>
+    </phaseOrder>
+    <phaseOrder type="outflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="userphase1"/>
+        <!--system predefined phase-->
+        <!--these phase will run irrespective of the service-->
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+    </phaseOrder>
+    <phaseOrder type="INfaultflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="userphase1"/>
+    </phaseOrder>
+    <phaseOrder type="Outfaultflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="userphase1"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+    </phaseOrder>
+</axisconfig>
+

Added: webservices/axis2/trunk/java/modules/core/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml?rev=351567&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml (added)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml Thu Dec  1 19:50:05 2005
@@ -0,0 +1,20 @@
+<service name="">
+
+    <description>
+        This is a testing service , to test the system is working or not
+    </description>
+    <parameter name="ServiceClass" locked="false">org.apache.axis2.sample.echo.EchoImpl</parameter>
+    <operation name="echoString">
+        <message label="In">
+            <parameter name="messageIN" locked="false">messageIN</parameter>
+        </message>
+    </operation>
+    <operation name="echoStringArray">
+        <message label="In">
+            <parameter name="messageIN" locked="false">messageIN</parameter>
+        </message>
+        <message label="Out">
+            <parameter name="messageOut" locked="false">messageOut</parameter>
+        </message>
+    </operation>
+</service>
\ No newline at end of file

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java Thu Dec  1 19:50:05 2005
@@ -23,7 +23,6 @@
 import org.apache.axis2.description.InOutAxisOperation;
 import org.apache.axis2.description.ParameterImpl;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurationImpl;
 
 import javax.xml.namespace.QName;
 
@@ -39,7 +38,7 @@
     protected void setUp() throws Exception {
         axisOperation = new InOutAxisOperation(new QName("Temp"));
         axisService = new AxisService(new QName("Temp"));
-        axisConfiguration = new AxisConfigurationImpl();
+        axisConfiguration = new AxisConfiguration();
         axisService.addOperation(axisOperation);
         axisConfiguration.addService(axisService);
     }

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java Thu Dec  1 19:50:05 2005
@@ -24,14 +24,14 @@
 import org.apache.axis2.description.InOutAxisOperation;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.util.UUIDGenerator;
 
 import javax.xml.namespace.QName;
 
 public class OperationContextTest extends AbstractTestCase {
 
-    private ConfigurationContext engineCtx = new ConfigurationContext(new AxisConfigurationImpl());
+    private ConfigurationContext engineCtx = new ConfigurationContext(new AxisConfiguration());
 
     public OperationContextTest(String arg0) {
         super(arg0);

Added: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java?rev=351567&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java (added)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java Thu Dec  1 19:50:05 2005
@@ -0,0 +1,66 @@
+package org.apache.axis2.deployment;
+
+import junit.framework.TestCase;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.description.AxisMessage;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.engine.AxisConfiguration;
+
+import javax.xml.namespace.QName;
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+* @author : Deepal Jayasinghe (deepal@apache.org)
+*
+*/
+
+public class AxisMessageTest extends TestCase {
+
+    public void testAxisMessage() throws Exception {
+        String filename = "./test-resources/deployment/AxisMessageTestRepo";
+        ConfigurationContextFactory builder = new ConfigurationContextFactory();
+        AxisConfiguration er = builder.buildConfigurationContext(filename)
+                .getAxisConfiguration();
+
+        assertNotNull(er);
+        AxisService service = er.getService("MessagetestService");
+        assertNotNull(service);
+        AxisOperation op = service.getOperation(new QName("echoString"));
+        assertNotNull(op);
+        AxisMessage message = op.getMessage("In");
+        assertNotNull(message);
+        Parameter para = message.getParameter("messageIN");
+        assertNotNull(para);
+        assertEquals(para.getValue(), "messageIN");
+
+
+        op = service.getOperation(new QName("echoStringArray"));
+        assertNotNull(op);
+        message = op.getMessage("In");
+        assertNotNull(message);
+        para = message.getParameter("messageIN");
+        assertNotNull(para);
+        assertEquals(para.getValue(), "messageIN");
+
+        message = op.getMessage("Out");
+        assertNotNull(message);
+        para = message.getParameter("messageOut");
+        assertNotNull(para);
+        assertEquals(para.getValue(), "messageOut");
+
+    }
+}

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java Thu Dec  1 19:50:05 2005
@@ -18,7 +18,6 @@
 
 import org.apache.axis2.AbstractTestCase;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurationImpl;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -36,7 +35,7 @@
         try {
             InputStream in = new FileInputStream(
                     getTestResourceFile("deployment/Badmodule.xml"));
-            AxisConfiguration glabl = new AxisConfigurationImpl();
+            AxisConfiguration glabl = new AxisConfiguration();
             AxisConfigBuilder builder =new AxisConfigBuilder(in,null,glabl);
             builder.populateConfig();
             fail(

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServerXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServerXMLTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServerXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServerXMLTest.java Thu Dec  1 19:50:05 2005
@@ -17,7 +17,7 @@
 package org.apache.axis2.deployment;
 
 import org.apache.axis2.AbstractTestCase;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -35,7 +35,7 @@
         try {
             InputStream in = new FileInputStream(
                     getTestResourceFile("deployment/BadServer.xml"));
-            AxisConfigurationImpl glabl = new AxisConfigurationImpl();
+            AxisConfiguration glabl = new AxisConfiguration();
             AxisConfigBuilder builder =new AxisConfigBuilder(in,null,glabl);
             builder.populateConfig();
             fail(

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java Thu Dec  1 19:50:05 2005
@@ -20,14 +20,13 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurationImpl;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.handlers.AbstractHandler;
 
 import javax.xml.namespace.QName;
 
 public class RegistryTest extends AbstractTestCase {
-    private AxisConfiguration reg = new AxisConfigurationImpl();
+    private AxisConfiguration reg = new AxisConfiguration();
     AxisService service = new AxisService(
                 new QName("Service1"));
 

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java Thu Dec  1 19:50:05 2005
@@ -50,7 +50,7 @@
     public EnginePausingTest(String arg0) throws AxisFault {
         super(arg0);
         executedHandlers = new ArrayList();
-        AxisConfiguration engineRegistry = new AxisConfigurationImpl();
+        AxisConfiguration engineRegistry = new AxisConfiguration();
         engineContext = new ConfigurationContext(engineRegistry);
         transportOut = new TransportOutDescription(new QName("null"));
         transportOut.setSender(new CommonsHTTPTransportSender());

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Thu Dec  1 19:50:05 2005
@@ -53,7 +53,7 @@
 
     protected void setUp() throws Exception {
 
-        engineRegistry = new AxisConfigurationImpl();
+        engineRegistry = new AxisConfiguration();
         engineContext = new ConfigurationContext(engineRegistry);
 
         TransportOutDescription transport = new TransportOutDescription(

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java Thu Dec  1 19:50:05 2005
@@ -34,7 +34,7 @@
 
     public void testMesssageContext() throws AxisFault,
             SOAPProcessingException {
-        AxisConfiguration er = new AxisConfigurationImpl();
+        AxisConfiguration er = new AxisConfiguration();
         AxisService servicesDesc = new AxisService();
         servicesDesc.setName(new QName("testService"));
         er.addService(servicesDesc);

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java Thu Dec  1 19:50:05 2005
@@ -43,13 +43,13 @@
             ConfigurationContextFactory builder = new ConfigurationContextFactory();
             ar = builder.buildConfigurationContext(repo).getAxisConfiguration();
             ModuleConfiguration moduleConfiguration =
-                    ((AxisConfigurationImpl)ar).getModuleConfig(new QName("testModule"));
+                    ((AxisConfiguration)ar).getModuleConfig(new QName("testModule"));
             assertNotNull(moduleConfiguration);
             Parameter para = moduleConfiguration.getParameter("testModulePara");
             assertNotNull(para);
 
             moduleConfiguration =
-                    ((AxisConfigurationImpl)ar).getModuleConfig(new QName("testModule2"));
+                    ((AxisConfiguration)ar).getModuleConfig(new QName("testModule2"));
             assertNotNull(moduleConfiguration);
             para = moduleConfiguration.getParameter("testModulePara2");
             assertNotNull(para);

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java Thu Dec  1 19:50:05 2005
@@ -32,7 +32,7 @@
 
 public class ParamterAddTest extends TestCase {
 
-    private AxisConfiguration reg = new AxisConfigurationImpl();
+    private AxisConfiguration reg = new AxisConfiguration();
     public void testAddParamterServiceLockedAtAxisConfig(){
         try {
             Parameter para = new ParameterImpl();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java Thu Dec  1 19:50:05 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
@@ -41,7 +41,7 @@
             phases.add(p2);
 
             MessageContext msg = new MessageContext(
-                    new ConfigurationContext(new AxisConfigurationImpl()));
+                    new ConfigurationContext(new AxisConfiguration()));
 
             PhaseHolder ph = new PhaseHolder(phases);
             HandlerDescription hm = new HandlerDescription();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java Thu Dec  1 19:50:05 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
@@ -40,7 +40,7 @@
         phases.add(p2);
 
         MessageContext msg = new MessageContext(
-                new ConfigurationContext(new AxisConfigurationImpl()));
+                new ConfigurationContext(new AxisConfiguration()));
 
         PhaseHolder ph = new PhaseHolder(phases);
         HandlerDescription hm = new HandlerDescription();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java Thu Dec  1 19:50:05 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
@@ -39,7 +39,7 @@
         phases.add(p2);
 
         MessageContext msg = new MessageContext(
-                new ConfigurationContext(new AxisConfigurationImpl()));
+                new ConfigurationContext(new AxisConfiguration()));
 
         PhaseHolder ph = new PhaseHolder(phases);
 

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java Thu Dec  1 19:50:05 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
@@ -41,7 +41,7 @@
             phases.add(p2);
 
             MessageContext msg = new MessageContext(
-                    new ConfigurationContext(new AxisConfigurationImpl()));
+                    new ConfigurationContext(new AxisConfiguration()));
 
             PhaseHolder ph = new PhaseHolder(phases);
             HandlerDescription hm = new HandlerDescription();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java Thu Dec  1 19:50:05 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
@@ -41,7 +41,7 @@
             phases.add(p2);
 
             MessageContext msg = new MessageContext(
-                    new ConfigurationContext(new AxisConfigurationImpl()));
+                    new ConfigurationContext(new AxisConfiguration()));
 
             PhaseHolder ph = new PhaseHolder(phases);
             HandlerDescription hm = new HandlerDescription();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java Thu Dec  1 19:50:05 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
@@ -41,7 +41,7 @@
             phases.add(p2);
 
             MessageContext msg = new MessageContext(
-                    new ConfigurationContext(new AxisConfigurationImpl()));
+                    new ConfigurationContext(new AxisConfiguration()));
 
             PhaseHolder ph = new PhaseHolder(phases);
             HandlerDescription hm = new HandlerDescription();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java Thu Dec  1 19:50:05 2005
@@ -20,7 +20,6 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurationImpl;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.phaseresolver.PhaseHolder;
 import org.apache.commons.logging.Log;
@@ -43,7 +42,7 @@
         try {
             super.setUp();
             phaserul = new InvalidPhaseRuleTest("");
-            axisSytem = new AxisConfigurationImpl();
+            axisSytem = new AxisConfiguration();
             ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
 
             Handler han = null;
@@ -90,14 +89,14 @@
             super.setUp();
 
             phaserul = new InvalidPhaseRuleTest("");
-            axisSytem = new AxisConfigurationImpl();
+            axisSytem = new AxisConfiguration();
             ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
 
             inPhase.add("global");
 //            ((AxisConfigurationImpl) axisSytem).setInPhases(inPhase);
-            ((AxisConfigurationImpl) axisSytem).setInFaultPhases(inPhase);
-            ((AxisConfigurationImpl) axisSytem).setOutFaultPhases(inPhase);
-            ((AxisConfigurationImpl) axisSytem).setGlobalOutPhase(inPhase);
+            ((AxisConfiguration) axisSytem).setInFaultPhases(inPhase);
+            ((AxisConfiguration) axisSytem).setOutFaultPhases(inPhase);
+            ((AxisConfiguration) axisSytem).setGlobalOutPhase(inPhase);
 
             Handler han = null;
             PhaseHolder ph = new PhaseHolder(inPhase);

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java Thu Dec  1 19:50:05 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
@@ -41,7 +41,7 @@
             phases.add(p2);
 
             MessageContext msg = new MessageContext(
-                    new ConfigurationContext(new AxisConfigurationImpl()));
+                    new ConfigurationContext(new AxisConfiguration()));
 
             PhaseHolder ph = new PhaseHolder(phases);
             HandlerDescription hm = new HandlerDescription();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java Thu Dec  1 19:50:05 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
@@ -40,7 +40,7 @@
         phases.add(p2);
 
         MessageContext msg = new MessageContext(
-                new ConfigurationContext(new AxisConfigurationImpl()));
+                new ConfigurationContext(new AxisConfiguration()));
 
         PhaseHolder ph = new PhaseHolder(phases);
         HandlerDescription hm = new HandlerDescription();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java Thu Dec  1 19:50:05 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
@@ -40,7 +40,7 @@
         phases.add(p2);
 
         MessageContext msg = new MessageContext(
-                new ConfigurationContext(new AxisConfigurationImpl()));
+                new ConfigurationContext(new AxisConfiguration()));
 
         PhaseHolder ph = new PhaseHolder(phases);
         HandlerDescription hm = new HandlerDescription();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleTest.java Thu Dec  1 19:50:05 2005
@@ -4,7 +4,6 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurationImpl;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.phaseresolver.PhaseHolder;
 
@@ -24,7 +23,7 @@
         super.setUp();
         //TODO fix me
         phaserul = new PhaseRuleTest("");
-        axisSytem = new AxisConfigurationImpl();
+        axisSytem = new AxisConfiguration();
         ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
 
         Handler han = null;//(Handler)Class.forName("org.apache.axis2.handlers.AbstractHandler",true, Thread.currentThread().getContextClassLoader()).newInstance();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java Thu Dec  1 19:50:05 2005
@@ -20,7 +20,6 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurationImpl;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.phaseresolver.PhaseHolder;
 
@@ -39,7 +38,7 @@
     public void testPhaseRule() throws Exception {
         //TODO Fix me
         phaserul = new PreDispatchPhaseRuleTest("");
-        axisSytem = new AxisConfigurationImpl();
+        axisSytem = new AxisConfiguration();
         ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
 
         Handler han = null;

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java Thu Dec  1 19:50:05 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
@@ -41,7 +41,7 @@
             phases.add(p2);
 
             MessageContext msg = new MessageContext(
-                    new ConfigurationContext(new AxisConfigurationImpl()));
+                    new ConfigurationContext(new AxisConfiguration()));
 
             PhaseHolder ph = new PhaseHolder(phases);
             HandlerDescription hm = new HandlerDescription();

Modified: webservices/axis2/trunk/java/modules/core/webapp/ViewGlobalHandlers.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/ViewGlobalHandlers.jsp?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/ViewGlobalHandlers.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/ViewGlobalHandlers.jsp Thu Dec  1 19:50:05 2005
@@ -1,5 +1,5 @@
 <%@ page import="org.apache.axis2.Constants,
-                 org.apache.axis2.engine.AxisConfigurationImpl,
+                 org.apache.axis2.engine.AxisConfiguration,
                  org.apache.axis2.engine.Handler,
                  org.apache.axis2.engine.Phase,
                  java.util.ArrayList"%>
@@ -32,7 +32,7 @@
 <jsp:include page="include/adminheader.jsp"></jsp:include>
 <h1>View Global Execution Chains</h1>
    <%
-            AxisConfigurationImpl axisConfig = (AxisConfigurationImpl)request.getSession().
+            AxisConfiguration axisConfig = (AxisConfiguration)request.getSession().
                     getAttribute(Constants.GLOBAL_HANDLERS);
              if(axisConfig != null ){
                  ArrayList handlers ;

Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java Thu Dec  1 19:50:05 2005
@@ -26,7 +26,6 @@
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.OutInAxisOperation;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurationImpl;
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.round1.util.Round1ClientUtil;
 
@@ -59,7 +58,7 @@
         SOAPEnvelope reqEnv = util.getEchoSoapEnvelope();
 
 
-        AxisConfiguration axisConfig = new AxisConfigurationImpl();
+        AxisConfiguration axisConfig = new AxisConfiguration();
         ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
         MessageContext msgCtx = new MessageContext(configCtx);
         msgCtx.setEnvelope(reqEnv);

Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java Thu Dec  1 19:50:05 2005
@@ -26,7 +26,6 @@
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.OutInAxisOperation;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurationImpl;
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
 
@@ -50,7 +49,7 @@
             options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
             options.setSoapAction(soapAction);
 
-            AxisConfiguration axisConfig = new AxisConfigurationImpl();
+            AxisConfiguration axisConfig = new AxisConfiguration();
             ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
             MessageContext msgCtx = new MessageContext(configCtx);
             AxisOperation opDesc = new OutInAxisOperation(new QName(""));

Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java Thu Dec  1 19:50:05 2005
@@ -26,7 +26,6 @@
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.OutInAxisOperation;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurationImpl;
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.round3.util.SunRound3ClientUtil;
 
@@ -51,7 +50,7 @@
             options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
             options.setSoapAction(soapAction);
 
-            AxisConfiguration axisConfig = new AxisConfigurationImpl();
+            AxisConfiguration axisConfig = new AxisConfiguration();
             ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
             MessageContext msgCtx = new MessageContext(configCtx);
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java Thu Dec  1 19:50:05 2005
@@ -25,6 +25,7 @@
 import org.apache.axis2.client.Options;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.engine.util.TestConstants;
 import org.apache.axis2.handlers.AbstractHandler;
 import org.apache.axis2.integration.UtilServer;
@@ -84,7 +85,11 @@
 
         UtilServer.start();
         UtilServer.deployService(service);
-        ArrayList phase = service.getOperation(operationName).getRemainingPhasesInFlow();
+        AxisOperation operation = service.getOperation(operationName);
+        ArrayList phasec= new ArrayList();
+        phasec.add(new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
+        operation.setRemainingPhasesInFlow(phasec);
+        ArrayList phase = operation.getRemainingPhasesInFlow();
         for (int i = 0; i < phase.size(); i++) {
             Phase phase1 = (Phase) phase.get(i);
             if(PhaseMetadata.PHASE_POLICY_DETERMINATION.equals(phase1.getPhaseName())){

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java Thu Dec  1 19:50:05 2005
@@ -68,7 +68,7 @@
     }
 
     protected void setUp() throws Exception {
-        AxisConfiguration config = new AxisConfigurationImpl();
+        AxisConfiguration config = new AxisConfiguration();
 
         TransportInDescription tIn = new TransportInDescription(new QName(Constants.TRANSPORT_LOCAL));
         config.addTransportIn(tIn);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java Thu Dec  1 19:50:05 2005
@@ -65,7 +65,7 @@
                 new QName("", "A Mdoule 1"));
         m1.setInFlow(new MockFlow("service module inflow", 4));
         //m1.setFaultInFlow(new MockFlow("service module faultflow", 1));
-        engineRegistry = new AxisConfigurationImpl();
+        engineRegistry = new AxisConfiguration();
         service.engageModule(m1,engineRegistry);
 
         AxisOperation axisOperation = new OutInAxisOperation(

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler1.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler1.java?rev=351567&r1=351566&r2=351567&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler1.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler1.java Thu Dec  1 19:50:05 2005
@@ -37,7 +37,7 @@
         HandlerDescription handlerDesc = new HandlerDescription();
         handlerDesc.setName(new QName("SpeakingHandler1"));
         PhaseRule rule = new PhaseRule();
-        rule.setPhaseName(PhaseMetadata.PHASE_POLICY_DETERMINATION);
+        rule.setPhaseName(PhaseMetadata.PHASE_DISPATCH);
         handlerDesc.setRules(rule);
         handlerDesc.setHandler(this);
         handlerDesc.setName(name);