axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r170129 - in /webservices/axis/trunk/java/modules/core: src/org/apache/axis/deployment/ src/org/apache/axis/phaseresolver/ test-resources/deployment/ test/org/apache/axis/deployment/ test/org/apache/axis/phaserule/
Date Sat, 14 May 2005 07:19:44 GMT
Author: deepal
Date: Sat May 14 00:19:42 2005
New Revision: 170129

URL: http://svn.apache.org/viewcvs?rev=170129&view=rev
Log:
Deployment bug fixing

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
    webservices/axis/trunk/java/modules/core/test-resources/deployment/server-transport.xml
    webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildWithAddressingTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java

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=170129&r1=170128&r2=170129&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
Sat May 14 00:19:42 2005
@@ -255,10 +255,10 @@
         DeploymentData tempdata = DeploymentData.getInstance();
         ArrayList inPhases = tempdata.getINPhases();
         //TODO condition checking should be otherway since null value can occur
-        if (!(((Phase) inPhases.get(0)).getPhaseName().equals(PhaseMetadata.PHASE_TRANSPORTIN)
&&
-                ((Phase) inPhases.get(1)).getPhaseName().equals(PhaseMetadata.PHASE_PRE_DISPATCH)
&&
-                ((Phase) inPhases.get(2)).getPhaseName().equals(PhaseMetadata.PHASE_DISPATCH)
&&
-                ((Phase) inPhases.get(3)).getPhaseName().equals(PhaseMetadata.PHASE_POST_DISPATCH)))
{
+        if (!(((String) inPhases.get(0)).equals(PhaseMetadata.PHASE_TRANSPORTIN) &&
+                ((String) inPhases.get(1)).equals(PhaseMetadata.PHASE_PRE_DISPATCH) &&
+                ((String) inPhases.get(2)).equals(PhaseMetadata.PHASE_DISPATCH) &&
+                ((String) inPhases.get(3)).equals(PhaseMetadata.PHASE_POST_DISPATCH))) {
             throw new DeploymentException("Invalid System predefined inphases , phase order
dose not" +
                     " support\n recheck server.xml");
         }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java?rev=170129&r1=170128&r2=170129&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
Sat May 14 00:19:42 2005
@@ -953,12 +953,7 @@
                         String attname = pullparser.getAttributeLocalName(0);
                         String attvalue = pullparser.getAttributeValue(0);
                         if (ATTNAME.equals(attname)) {
-                            //TODO fix me
-//                            if (attvalue.equals(PhaseMetadata.PRE_DISPATCH)) {
-//                                throw new DeploymentException(attvalue + " is a reserved
phase");
-//                            } else {
-//                                pahseList.add(attvalue);
-//                            }
+                            pahseList.add(attvalue);
                         }
                     } else {
                         throw new DeploymentException("parser Exception : un supported element"
+ tagnae);

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml?rev=170129&r1=170128&r2=170129&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml Sat
May 14 00:19:42 2005
@@ -9,8 +9,6 @@
     <transportSender name="http" class="org.apache.axis.transport.http.HTTPTransportSender">
     </transportSender>
 
-    <module ref="addressing"/>
-
     <phaseOrder type="inflow">
         <!--  System pre defined phases       -->
         <phase name="TransportIn"/>

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java?rev=170129&r1=170128&r2=170129&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
Sat May 14 00:19:42 2005
@@ -57,12 +57,12 @@
     /**
      * Constructor PhaseResolver
      *
-     * @param engineConfig
+     * @param axisConfig
      * @param serviceContext
      */
-    public PhaseResolver(AxisConfiguration engineConfig,
+    public PhaseResolver(AxisConfiguration axisConfig,
                          ServiceDescription serviceContext) {
-        this.axisConfig = engineConfig;
+        this.axisConfig = axisConfig;
         this.axisService = serviceContext;
     }
 
@@ -138,6 +138,58 @@
         ArrayList allHandlers = new ArrayList();
         ModuleDescription module;
         Flow flow = null;
+        ///////////////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////// Handlers from   server.xml from modules/////////////////////////
+        GlobalDescription global = axisConfig.getGlobal();
+        ArrayList modulqnames = (ArrayList) global.getModules();
+        for (int i = 0; i < modulqnames.size(); i++) {
+            QName modulename = (QName) modulqnames.get(i);
+            module = axisConfig.getModule(modulename);
+            if (module != null) {
+                switch (flowtype) {
+                    case PhaseMetadata.IN_FLOW:
+                        {
+                            flow = module.getInFlow();
+                            break;
+                        }
+                    case PhaseMetadata.OUT_FLOW:
+                        {
+                            flow = module.getOutFlow();
+                            break;
+                        }
+                    case PhaseMetadata.FAULT_IN_FLOW:
+                        {
+                            flow = module.getFaultInFlow();
+                            break;
+                        }
+                    case PhaseMetadata.FAULT_OUT_FLOW:
+                        {
+                            flow = module.getFaultOutFlow();
+                            break;
+                        }
+                }
+            } else {
+                throw new PhaseException("referance to invalid module " + modulename.getLocalPart()
+ " by server.xml"); 
+            }
+
+            if (flow != null) {
+                for (int j = 0; j < flow.getHandlerCount(); j++) {
+                    HandlerDescription metadata = flow.getHandler(j);
+
+                    if (!PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName()))
{
+                        allHandlers.add(metadata);
+                    } else {
+                        /**
+                         *This handler is trying to added to system pre defined phases ,
but those handlers
+                         * are already added to global chain which run irrespective of the
service
+                         *
+                         */
+                        continue;
+                    }
+                }
+            }
+
+        }
 
         ///////////////////////////////////////////////////////////////////////////////////////////
         ////////////////////////// SERVICE HANDLERS ///////////////////////////////////////////////
@@ -440,8 +492,13 @@
                         if (PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName()))
{
                             phaseHolder.addHandler(metadata);
                         } else {
-                            throw new PhaseException("Global module can not refer service
specific phases : "
-                                    + metadata.getRules().getPhaseName());
+                            /**
+                             * These handlers will go to operation's handler chains , since
the module
+                             * try to add handlres to both sytem predefined phases and user
defined phase
+                             * so global module can do that. here the global module are the
module which are
+                             * reffred by server.xml
+                             */
+                            continue;
                         }
                     }
                 }

Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/server-transport.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/server-transport.xml?rev=170129&r1=170128&r2=170129&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/server-transport.xml
(original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/server-transport.xml
Sat May 14 00:19:42 2005
@@ -1,47 +1,34 @@
-<server name ="AxisJava2.0" >
+<server name="AxisJava2.0">
+    <messageReceiver mep="INOUT" class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
     <transportReceiver name="http">
         <parameter name="para1" locked="xsd:true">10</parameter>
-        <inflow>
-            <handler name="h1" class="org.apache.axis.deployment.SpeakingHandler"/>
-            <handler name="h2" class="org.apache.axis.deployment.SpeakingHandler"/>
-        </inflow>
     </transportReceiver>
 
     <transportSender name="http" class="org.apache.axis.transport.http.HTTPTransportSender">
         <parameter name="para1" locked="xsd:true">10</parameter>
-        <outflow>
-            <handler name="h1" class="org.apache.axis.deployment.SpeakingHandler"/>
-            <handler name="h2" class="org.apache.axis.deployment.SpeakingHandler"/>
-        </outflow>
-         <Outfaultflow>
-            <handler name="h1" class="org.apache.axis.deployment.SpeakingHandler"/>
-            <handler name="h2" class="org.apache.axis.deployment.SpeakingHandler"/>
-        </Outfaultflow>
     </transportSender>
 
     <phaseOrder type="inflow">
-        <phase name="global"/>
-        <phase name="transport"/>
-        <phase name="Logging"/>
-        <phase name="service"/>
+        <!--  System pre defined phases       -->
+        <phase name="TransportIn"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch"/>
+        <phase name="PostDispatch"/>
+        <!--  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">
-        <phase name="global"/>
-        <phase name="transport"/>
-        <phase name="Logging"/>
-        <phase name="service"/>
-    </phaseOrder>
-    <phaseOrder type="Outfaultflow">
-        <phase name="global"/>
-        <phase name="transport"/>
-        <phase name="Logging"/>
-        <phase name="service"/>
+        <!--      user can add his own phases to this area  -->
+        <phase name="userphase1"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
-        <phase name="global"/>
-        <phase name="transport"/>
-        <phase name="Logging"/>
-        <phase name="service"/>
+        <!--      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"/>
     </phaseOrder>
 </server>
 

Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml?rev=170129&r1=170128&r2=170129&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml Sat May
14 00:19:42 2005
@@ -9,8 +9,6 @@
     <transportSender name="http" class="org.apache.axis.transport.http.HTTPTransportSender">
     </transportSender>
 
-    <module ref="addressing"/>
-
     <phaseOrder type="inflow">
         <!--  System pre defined phases       -->
         <phase name="TransportIn"/>

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=170129&r1=170128&r2=170129&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
Sat May 14 00:19:42 2005
@@ -39,8 +39,9 @@
         super(testName);
     }
 
-    public void testDeployment() throws Exception {
-        String filename = "./target/test-resources/deployment";
+    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();
         ConfigurationContext er = builder.buildEngineContext(filename);
         ArrayList phases = er.getPhases(AxisConfiguration.INFLOW);
@@ -58,7 +59,7 @@
                     System.out.println("Found pre-dispatch handlers");
                 }
             }
-        }
+        }*/
 
     }
 }

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java?rev=170129&r1=170128&r2=170129&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java
Sat May 14 00:19:42 2005
@@ -40,9 +40,9 @@
         AxisConfiguration er = engine.getAxisConfig();
         TransportInDescription transport = er.getTransportIn(new QName("http"));
         assertNotNull(transport);
-        assertNotNull(transport.getInFlow());
+      //  assertNotNull(transport.getInFlow());
         TransportOutDescription transport1 = er.getTransportOut(new QName("http"));
         assertNotNull(transport1);
-        assertNotNull(transport1.getOutFlow());
+      //  assertNotNull(transport1.getOutFlow());
     }
 }

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java?rev=170129&r1=170128&r2=170129&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
Sat May 14 00:19:42 2005
@@ -1,7 +1,16 @@
 package org.apache.axis.phaserule;
 
 import org.apache.axis.AbstractTestCase;
+import org.apache.axis.description.GlobalDescription;
+import org.apache.axis.description.HandlerDescription;
+import org.apache.axis.description.PhaseRule;
 import org.apache.axis.engine.AxisConfiguration;
+import org.apache.axis.engine.AxisSystemImpl;
+import org.apache.axis.engine.Handler;
+import org.apache.axis.phaseresolver.PhaseHolder;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
 
 /*
  * Copyright 2004,2005 The Apache Software Foundation.
@@ -29,7 +38,7 @@
 public class InvalidPhaseRuleTest extends AbstractTestCase {
 
     InvalidPhaseRuleTest phaserul;
-    AxisConfiguration registry;
+    AxisConfiguration axisSytem;
 
     public InvalidPhaseRuleTest(String testName) {
         super(testName);
@@ -38,22 +47,13 @@
     public void testInvalidPhaseRule1() {
         try {
             super.setUp();
-            //TODO fix me
-            /*phaserul = new InvalidPhaseRuleTest("");
+            phaserul = new InvalidPhaseRuleTest("");
             GlobalDescription global = new GlobalDescription();
-            registry = new AxisSystemImpl(global);
-            ArrayList inPhase = new ArrayList();
-
-            inPhase.add("global");
-            inPhase.add("service");
-            ((AxisSystemImpl) registry).setInPhases(inPhase);
-            ((AxisSystemImpl) registry).setInFaultPhases(inPhase);
-            ((AxisSystemImpl) registry).setOutFaultPhases(inPhase);
-            ((AxisSystemImpl) registry).setOutPhases(inPhase);
+            axisSytem = new AxisSystemImpl(global);
+            ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
 
             Handler han = null;
-            PhaseHolder ph = new PhaseHolder(registry);
-            ph.setFlowType(1);
+            PhaseHolder ph = new PhaseHolder(inPhase);
 
 
             HandlerDescription hm = new HandlerDescription();
@@ -90,7 +90,7 @@
             for (int i = 0; i < oh.size(); i++) {
                 HandlerDescription metadata = (HandlerDescription) oh.get(i);
                 System.out.println("Name:" + metadata.getName().getLocalPart());
-            }*/
+            }
             fail("this must failed gracefully with PhaseException ");
         } catch (Exception e) {
             e.printStackTrace();
@@ -102,21 +102,19 @@
         try {
             super.setUp();
             //TODO Fix me
-            /*phaserul = new InvalidPhaseRuleTest("");
+            phaserul = new InvalidPhaseRuleTest("");
             GlobalDescription global = new GlobalDescription();
-            registry = new AxisSystemImpl(global);
-            ArrayList inPhase = new ArrayList();
+            axisSytem = new AxisSystemImpl(global);
+            ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
 
             inPhase.add("global");
-            inPhase.add("service");
-            ((AxisSystemImpl) registry).setInPhases(inPhase);
-            ((AxisSystemImpl) registry).setInFaultPhases(inPhase);
-            ((AxisSystemImpl) registry).setOutFaultPhases(inPhase);
-            ((AxisSystemImpl) registry).setOutPhases(inPhase);
+            ((AxisSystemImpl) axisSytem).setInPhases(inPhase);
+            ((AxisSystemImpl) axisSytem).setInFaultPhases(inPhase);
+            ((AxisSystemImpl) axisSytem).setOutFaultPhases(inPhase);
+            ((AxisSystemImpl) axisSytem).setOutPhases(inPhase);
 
             Handler han = null;
-            PhaseHolder ph = new PhaseHolder(registry);
-            ph.setFlowType(1);
+            PhaseHolder ph = new PhaseHolder(inPhase);
 
 
             HandlerDescription hm = new HandlerDescription();
@@ -140,21 +138,11 @@
             hm1.setRules(rule1);
             ph.addHandler(hm1);
 
-            HandlerDescription hm3 = new HandlerDescription();
-            hm3.setClassName("org.apache.axis.handlers.AbstractHandler");
-            hm3.setHandler(han);
-            hm3.setName(new QName("H4"));
-            PhaseRule rule3 = new PhaseRule();
-            rule3.setPhaseName("Logging");
-            hm3.setRules(rule3);
-            ph.addHandler(hm3);
-
-
             ArrayList oh = ph.getOrderHandler();
             for (int i = 0; i < oh.size(); i++) {
                 HandlerDescription metadata = (HandlerDescription) oh.get(i);
                 System.out.println("Name:" + metadata.getName().getLocalPart());
-            }*/
+            }
             fail("this must failed gracefully with PhaseException ");
         } catch (Exception e) {
             e.printStackTrace();

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java?rev=170129&r1=170128&r2=170129&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
Sat May 14 00:19:42 2005
@@ -1,7 +1,16 @@
 package org.apache.axis.phaserule;
 
 import org.apache.axis.AbstractTestCase;
+import org.apache.axis.phaseresolver.PhaseHolder;
+import org.apache.axis.description.GlobalDescription;
+import org.apache.axis.description.HandlerDescription;
+import org.apache.axis.description.PhaseRule;
 import org.apache.axis.engine.AxisConfiguration;
+import org.apache.axis.engine.AxisSystemImpl;
+import org.apache.axis.engine.Handler;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
 
 /**
  * Created by IntelliJ IDEA.
@@ -12,7 +21,7 @@
 public class PhaseRuleTest extends AbstractTestCase {
 
     PhaseRuleTest phaserul;
-    AxisConfiguration registry;
+    AxisConfiguration axisSytem;
 
     public PhaseRuleTest(String testName) {
         super(testName);
@@ -21,30 +30,20 @@
     public void testPhaseRules() throws Exception {
         super.setUp();
         //TODO fix me
-       /* phaserul = new PhaseRuleTest("");
+        phaserul = new PhaseRuleTest("");
         GlobalDescription global = new GlobalDescription();
-        registry = new AxisSystemImpl(global);
-        ArrayList inPhase = new ArrayList();
-
-        inPhase.add("global");
-        inPhase.add("transport");
-        inPhase.add("Logging");
-        inPhase.add("service");
-        ((AxisSystemImpl) registry).setInPhases(inPhase);
-        ((AxisSystemImpl) registry).setInFaultPhases(inPhase);
-        ((AxisSystemImpl) registry).setOutFaultPhases(inPhase);
-        ((AxisSystemImpl) registry).setOutPhases(inPhase);
-
+        axisSytem = new AxisSystemImpl(global);
+        ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
+       
         Handler han = null;//(Handler)Class.forName("org.apache.axis.handlers.AbstractHandler").newInstance();
-        PhaseHolder ph = new PhaseHolder(registry);
-        ph.setFlowType(1);
+        PhaseHolder ph = new PhaseHolder(inPhase);
 
         HandlerDescription hm = new HandlerDescription();
         hm.setClassName("org.apache.axis.handlers.AbstractHandler");
         hm.setHandler(han);
         hm.setName(new QName("H1"));
         PhaseRule rule = new PhaseRule();
-        rule.setPhaseName("global");
+        rule.setPhaseName("PreDispatch");
         rule.setPhaseFirst(true);
         hm.setRules(rule);
         ph.addHandler(hm);
@@ -54,7 +53,7 @@
         hm1.setHandler(han);
         hm1.setName(new QName("H2"));
         PhaseRule rule1 = new PhaseRule();
-        rule1.setPhaseName("global");
+        rule1.setPhaseName("Dispatch");
         rule1.setAfter("H1");
         hm1.setRules(rule1);
         ph.addHandler(hm1);
@@ -64,7 +63,7 @@
         hm2.setHandler(han);
         hm2.setName(new QName("H3"));
         PhaseRule rule2 = new PhaseRule();
-        rule2.setPhaseName("global");
+        rule2.setPhaseName("PreDispatch");
         rule2.setAfter("H1");
         rule2.setBefore("H2");
         hm2.setRules(rule2);
@@ -75,7 +74,7 @@
         hm3.setHandler(han);
         hm3.setName(new QName("H4"));
         PhaseRule rule3 = new PhaseRule();
-        rule3.setPhaseName("Logging");
+        rule3.setPhaseName("PreDispatch");
         hm3.setRules(rule3);
         ph.addHandler(hm3);
 
@@ -84,10 +83,6 @@
         for (int i = 0; i < oh.size(); i++) {
             HandlerDescription metadata = (HandlerDescription) oh.get(i);
             System.out.println("Name:" + metadata.getName().getLocalPart());
-        }*/
-
-        fail("this must failed gracefully with PhaseException ");
+        }
     }
-
-    //
 }

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java?rev=170129&r1=170128&r2=170129&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java
Sat May 14 00:19:42 2005
@@ -39,20 +39,20 @@
         //TODO Fix me
       /*  phaserul = new PreDispatchPhaseRuleTest("");
         GlobalDescription global = new GlobalDescription();
-        registry = new AxisSystemImpl(global);
+        axisSytem = new AxisSystemImpl(global);
         ArrayList inPhase = new ArrayList();
 
         inPhase.add("global");
         inPhase.add("transport");
         inPhase.add("Logging");
         inPhase.add("service");
-        ((AxisSystemImpl) registry).setInPhases(inPhase);
-        ((AxisSystemImpl) registry).setInFaultPhases(inPhase);
-        ((AxisSystemImpl) registry).setOutFaultPhases(inPhase);
-        ((AxisSystemImpl) registry).setOutPhases(inPhase);
+        ((AxisSystemImpl) axisSytem).setInPhases(inPhase);
+        ((AxisSystemImpl) axisSytem).setInFaultPhases(inPhase);
+        ((AxisSystemImpl) axisSytem).setOutFaultPhases(inPhase);
+        ((AxisSystemImpl) axisSytem).setOutPhases(inPhase);
 
         Handler han = null;
-        PhaseHolder ph = new PhaseHolder(registry);
+        PhaseHolder ph = new PhaseHolder(axisSytem);
         ph.setFlowType(1);
 
 



Mime
View raw message