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

svn commit: r169612 - in /webservices/axis/trunk/java/modules/core: src/org/apache/axis/clientapi/ src/org/apache/axis/engine/ src/org/apache/axis/phaseresolver/ src/org/apache/axis/util/ test/org/apache/axis/deployment/ test/org/apache/axis/engine/

Author: hemapani
Date: Wed May 11 02:50:27 2005
New Revision: 169612

URL: http://svn.apache.org/viewcvs?rev=169612&view=rev
Log:
make the phase an class rather than a interface

Removed:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/SimplePhase.java
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/InOutMEPClient.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/ExecutionChain.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Phase.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildWithAddressingTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.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=169612&r1=169611&r2=169612&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 Wed May 11 02:50:27 2005
@@ -42,9 +42,6 @@
  * This class is the pretty convineance class for the user without see the comlplexites of Axis2.
  */
 public class Call extends InOutMEPClient {
-
-    private MessageInformationHeadersCollection messageInfoHeaders;
-
     private HashMap properties;
     private boolean isEnvelope = false;
 
@@ -133,7 +130,6 @@
         }
 
         msgctx.setEnvelope(envelope);
-        msgctx.setMessageInformationHeaders(messageInfoHeaders);
         return msgctx;
     }
 
@@ -150,13 +146,7 @@
         ServiceContext service = sysContext.createServiceContext(assumedServiceName);
         return service;
     }
-    /**
-     * @param to
-     */
-    public void setTo(EndpointReference to) {
-        messageInfoHeaders.setTo(to);
-    }
-
+ 
     /**
      * @param key
      * @return

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=169612&r1=169611&r2=169612&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 Wed May 11 02:50:27 2005
@@ -22,6 +22,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.Constants;
+import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContextFactory;
 import org.apache.axis.context.ServiceContext;
@@ -62,6 +63,7 @@
     //variables use for internal implementations
     protected ListenerManager listenerManager;
     protected CallbackReceiver callbackReceiver;
+    protected EndpointReference to;
 
     public InOutMEPClient(ServiceContext serviceContext) {
         super(serviceContext);
@@ -75,6 +77,8 @@
 
     public MessageContext invokeBlocking(AxisOperation axisop, final MessageContext msgctx)
         throws AxisFault {
+        msgctx.setTo(to);
+
         SystemContext sysContext = serviceContext.getEngineContext();
         AxisSystem registry = sysContext.getEngineConfig();
 
@@ -112,7 +116,7 @@
         final MessageContext msgctx,
         final Callback callback)
         throws AxisFault {
-
+        msgctx.setTo(to);
         try {
             final SystemContext syscontext = serviceContext.getEngineContext();
 
@@ -167,9 +171,14 @@
         }
 
     }
-    
-    
-   
+
+    /**
+      * @param to
+      */
+    public void setTo(EndpointReference to) {
+        this.to = to;
+    }
+
     public void setTransportInfo(
         String senderTransport,
         String listenerTransport,

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=169612&r1=169611&r2=169612&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 Wed May 11 02:50:27 2005
@@ -147,9 +147,9 @@
             chain.addPhases(engineContext.getPhases(AxisSystem.INFLOW));
 
             // create a Dispatch Phase and add it to the Execution Chain
-            Phase dispatchPhase = chain.getPhase(SimplePhase.DISPATCH_PHASE);
+            Phase dispatchPhase = chain.getPhase(Phase.DISPATCH_PHASE);
             if (dispatchPhase == null) {
-                dispatchPhase = new SimplePhase(SimplePhase.DISPATCH_PHASE);
+                dispatchPhase = new Phase(Phase.DISPATCH_PHASE);
             }
 
             if (context.isServerSide()) {

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ExecutionChain.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ExecutionChain.java?rev=169612&r1=169611&r2=169612&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ExecutionChain.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ExecutionChain.java Wed May 11 02:50:27 2005
@@ -74,7 +74,7 @@
     public void addPhases(ArrayList phases) {
         if ((phases != null) && !phases.isEmpty()) {
             for (int i = 0; i < phases.size(); i++) {
-                addPhase((SimplePhase) phases.get(i));
+                addPhase((Phase) phases.get(i));
             }
         }
     }
@@ -106,7 +106,7 @@
                     }
                     break;
                 }else{
-                    SimplePhase phase = (SimplePhase) executionList.get(indexOfPhaseToExecuted);
+                    Phase phase = (Phase) executionList.get(indexOfPhaseToExecuted);
                     if (phase != null) {
                         log.info("Invoke the Phase " + phase.getPhaseName());
                         phase.invoke(msgctx);

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Phase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Phase.java?rev=169612&r1=169611&r2=169612&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Phase.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Phase.java Wed May 11 02:50:27 2005
@@ -1,34 +1,105 @@
-
 /*
- * 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.
- *
- *  Runtime state of the engine
- */
+* 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.
+*/
 package org.apache.axis.engine;
 
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis.context.MessageContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * <p>This is Phase, a orderd collection of Handlers.
+ * seems this is Handler Chain with order.</p>
+ * Should this exttends Hanlders?
+ */
+public class Phase {
+    /**
+     * Field DISPATCH_PHASE
+     */
+    public static final String DISPATCH_PHASE = "DispatchPhase";
+
+    /**
+     * Field SERVICE_INVOCATION
+     */
+    public static final String SERVICE_INVOCATION = "ServiceInvocationPhase";
+
+    /**
+     * Field SENDING_PHASE
+     */
+    public static final String SENDING_PHASE = "SendPhase";
+
+    /**
+     * Field NAME
+     */
+    public static final QName NAME = new QName("http://axis.ws.apache.org",
+            "Phase");
+
+    /**
+     * Field phaseName
+     */
+    private String phaseName;
 
-public interface Phase {
-    public void addHandler(Handler handler, int index);
+    /**
+     * Field handlers
+     */
+    private ArrayList handlers;
+
+    /**
+     * Field log
+     */
+    private Log log = LogFactory.getLog(getClass());
+
+    private int indexOfHandlerToExecute = 0;
+
+    /**
+     * Constructor Phase
+     *
+     * @param phaseName
+     */
+    public Phase(String phaseName) {
+        handlers = new ArrayList();
+        this.phaseName = phaseName;
+
+    }
+
+    /**
+     * Method addHandler
+     *
+     * @param handler
+     * @param index
+     */
+    public void addHandler(Handler handler, int index) {
+        log.info("Handler " + handler.getName() + "Added to place " + 1
+                + " At the Phase " + phaseName);
+        handlers.add(index, handler);
+    }
 
     /**
      * add to next empty handler
      *
      * @param handler
      */
-    public void addHandler(Handler handler);
+    public void addHandler(Handler handler) {
+        log.info("Handler " + handler.getName() + " Added to the Phase "
+                + phaseName);
+        handlers.add(handler);
+    }
 
     /**
      * If need to see how this works look at the stack!
@@ -36,13 +107,83 @@
      * @param msgctx
      * @throws AxisFault
      */
+    public void invoke(MessageContext msgctx) throws AxisFault {
+        // Stack executionStack = new Stack();
+        try {
+            while (indexOfHandlerToExecute < handlers.size() ) {
+                if(msgctx.isPaused()){
+                    break;
+                }else{
+                    Handler handler = (Handler) handlers.get(indexOfHandlerToExecute);
+                    if (handler != null) {
+                        log.info("Invoke the Handler " + handler.getName()
+                                + "with in the Phase " + phaseName);
+                        handler.invoke(msgctx);
+                        //This line should be after the invoke as if the invocation failed this handlers is takn care of and 
+                        //no need to revoke agien
+                        //         executionStack.push(handler);
+                        indexOfHandlerToExecute++;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.info("Phase " + phaseName + " failed with the "
+                    + e.getMessage());
+//            while (!executionStack.isEmpty()) {
+//                Handler handler = (Handler) executionStack.pop();
+//                log.info("revoke the Handler " + handler.getName()
+//                                + " with in the Phase " + phaseName);
+//                handler.revoke(msgctx);
+//            }
+            throw AxisFault.makeFault(e);
+        }
+    }
+
+//    /**
+//     * Method revoke
+//     *
+//     * @param msgctx
+//     */
+//    public void revoke(MessageContext msgctx) {
+//        for (int i = handlers.size() - 1; i > -1; i--) {
+//            Handler handler = (Handler) handlers.get(i);
+//            log.info("revoke the Handler " + handler.getName()
+//                            + " with in the Phase " + phaseName);
+//            if (handler != null) {
+//                handler.revoke(msgctx);
+//            }
+//        }
+//    }
+
+    /**
+     * @return Returns the name.
+     */
+    public String getPhaseName() {
+        return phaseName;
+    }
 
-    public String getPhaseName();
     /**
      * @param phaseName The name to set.
      */
-    public void setName(String phaseName);
-    //   public void preCondition(MessageContext msgCtx)throws AxisFault;
-    public void invoke(MessageContext msgCtx) throws AxisFault;
-    //    public void postCondition(MessageContext msgCtx)throws AxisFault;
-}
\ No newline at end of file
+    public void setName(String phaseName) {
+        this.phaseName = phaseName;
+    }
+//    public void postCondition(MessageContext msgCtx) throws AxisFault {
+//        
+//
+//    }
+//
+//    /* (non-Javadoc)
+//     * @see org.apache.axis.engine.Phase#preCondition(org.apache.axis.context.MessageContext)
+//     */
+//    public void preCondition(MessageContext msgCtx) throws AxisFault {
+//        // TODO Auto-generated method stub
+//
+//    }
+    
+
+    public int getHandlerCount(){
+        return handlers.size();
+    }
+
+}

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=169612&r1=169611&r2=169612&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 Wed May 11 02:50:27 2005
@@ -23,7 +23,8 @@
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.AxisSystem;
 import org.apache.axis.engine.Handler;
-import org.apache.axis.engine.SimplePhase;
+import org.apache.axis.engine.Phase;
+
 
 /**
  * This class hold all the phases found in the service.xml and server.xml
@@ -231,7 +232,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 axisPhase.addHandler(handlers[j].getHandler());
@@ -248,7 +249,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 axisPhase.addHandler(handlers[j].getHandler());
@@ -265,7 +266,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 axisPhase.addHandler(handlers[j].getHandler());
@@ -282,7 +283,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 axisPhase.addHandler(handlers[j].getHandler());
@@ -315,7 +316,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 try {
@@ -345,7 +346,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 try {
@@ -375,7 +376,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 try {
@@ -405,7 +406,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 try {
@@ -455,7 +456,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 axisPhase.addHandler(handlers[j].getHandler());
@@ -471,7 +472,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 axisPhase.addHandler(handlers[j].getHandler());
@@ -487,7 +488,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 axisPhase.addHandler(handlers[j].getHandler());
@@ -503,7 +504,7 @@
                         for (int i = 0; i < phaseholder.size(); i++) {
                             PhaseMetadata phase =
                                     (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+                            Phase axisPhase = new Phase(phase.getName());
                             handlers = phase.getOrderedHandlers();
                             for (int j = 0; j < handlers.length; j++) {
                                 axisPhase.addHandler(handlers[j].getHandler());

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=169612&r1=169611&r2=169612&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 Wed May 11 02:50:27 2005
@@ -20,9 +20,9 @@
 import org.apache.axis.Constants;
 import org.apache.axis.addressing.MessageInformationHeadersCollection;
 import org.apache.axis.addressing.miheaders.RelatesTo;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.ServiceContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.description.Flow;
@@ -32,7 +32,7 @@
 import org.apache.axis.engine.AxisSystem;
 import org.apache.axis.engine.Handler;
 import org.apache.axis.engine.MessageReceiver;
-import org.apache.axis.engine.SimplePhase;
+import org.apache.axis.engine.Phase;
 import org.apache.axis.receivers.AbstractMessageReceiver;
 import org.apache.axis.receivers.RawXMLINOutMessageRecevier;
 
@@ -111,7 +111,7 @@
             opName);
     }
 
-    public static void addHandlers(Flow flow, SimplePhase phase) throws AxisFault {
+    public static void addHandlers(Flow flow, Phase phase) throws AxisFault {
         if (flow != null) {
             int handlerCount = flow.getHandlerCount();
             for (int i = 0; i < handlerCount; i++) {

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=169612&r1=169611&r2=169612&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 Wed May 11 02:50:27 2005
@@ -1,19 +1,15 @@
 package org.apache.axis.deployment;
 
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis.AbstractTestCase;
-import org.apache.axis.phaseresolver.PhaseMetadata;
-import org.apache.axis.description.AxisService;
-import org.apache.axis.description.Flow;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisModule;
-import org.apache.axis.engine.AxisSystem;
-import org.apache.axis.engine.SimplePhase;
 import org.apache.axis.context.EngineContextFactory;
 import org.apache.axis.context.SystemContext;
-import org.apache.axis.context.MessageContext;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.Phase;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
@@ -55,7 +51,7 @@
             fail("this must failed Since there are addressing handlers ");
         }
         for (int i = 0; i < phases.size(); i++) {
-            SimplePhase metadata = (SimplePhase) phases.get(i);
+            Phase metadata = (Phase) phases.get(i);
             if ("pre-dispatch".equals(metadata.getPhaseName())) {
                 if (metadata.getHandlerCount() <= 0) {
                     fail("this must failed Since there are addressing handlers ");

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=169612&r1=169611&r2=169612&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 Wed May 11 02:50:27 2005
@@ -20,10 +20,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContextFactory;
 import org.apache.axis.context.ServiceContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.description.AxisGlobal;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
@@ -70,7 +70,7 @@
         service.addOperation(axisOp);
         ArrayList phases = new ArrayList();
 
-        SimplePhase phase = new SimplePhase("1");
+        Phase phase = new Phase("1");
         phase.addHandler(new TempHandler(1));
         phase.addHandler(new TempHandler(2));
         phase.addHandler(new TempHandler(3));
@@ -82,7 +82,7 @@
         phase.addHandler(new TempHandler(9));
         phases.add(phase);
 
-        phase = new SimplePhase("2");
+        phase = new Phase("2");
         phase.addHandler(new TempHandler(10));
         phase.addHandler(new TempHandler(11));
         phase.addHandler(new TempHandler(12));
@@ -94,7 +94,7 @@
         phase.addHandler(new TempHandler(18));
         phases.add(phase);
 
-        SimplePhase phase1 = new SimplePhase("3");
+        Phase phase1 = new Phase("3");
         phase1.addHandler(new TempHandler(19));
         phase1.addHandler(new TempHandler(20));
         phase1.addHandler(new TempHandler(21));