axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Glen Daniels <g...@thoughtcraft.com>
Subject [axis2] Re: svn commit: r559011 - in /webservices/axis2/trunk/java/modules: addressing/src/META-INF/ integration/conf/ integration/test-resources/deployment/ integration/test-resources/mtom/ integration/test-resources/swa/ integration/test/org/apache/axis2/engine/...
Date Tue, 24 Jul 2007 19:59:03 GMT
[Forward with correct prefix]

Gosh.  If only Modules ...

http://marc.info/?l=axis-dev&m=118117804705440&w=2

... could define their own Phases

http://marc.info/?l=axis-dev&m=114404998012486&w=2

this commit could have consisted of a simple change to the Addressing
module's module.xml, and that would basically be it.  This demonstrates,
once again, exactly the problem with the current overly-static design.

I still stand by the position I wrote up last year:

http://marc.info/?l=axis-dev&m=114417377917696&w=2

This needs to be fixed after 1.3, folks.

--Glen


deepal@apache.org wrote:
> Author: deepal
> Date: Tue Jul 24 04:41:00 2007
> New Revision: 559011
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=559011
> Log:
> -Add a phase called Addressing as I mentioned in the mailing list 
> - Move all the addressing handlers into Addressing phase
> - Had to modify a set of axis2.xml and test cases to cope this chang
> 
> [This is a big commit but no need to worry :) ]
> 
> Modified:
>     webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml
>     webservices/axis2/trunk/java/modules/integration/conf/axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test-resources/deployment/deployment.both.axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-enabled-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java
>     webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
>     webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
>     webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
>     webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
>     webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
> 
> Modified: webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml (original)
> +++ webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml Tue Jul 24 04:41:00 2007
> @@ -20,13 +20,13 @@
>      <Description>This is the WS-Addressing implementation on Axis2, supporting the WS-Addressing 1.0 Recommendation, as well as the Submission version (2004/08).</Description>
>      <InFlow>
>          <handler name="AddressingFinalInHandler" class="org.apache.axis2.handlers.addressing.AddressingFinalInHandler">
> -            <order phase="PreDispatch"/>
> +            <order phase="Addressing" before="AddressingBasedDispatcher"/>
>          </handler>
>          <handler name="AddressingSubmissionInHandler" class="org.apache.axis2.handlers.addressing.AddressingSubmissionInHandler">
> -            <order phase="PreDispatch"/>
> +            <order phase="Addressing" before="AddressingBasedDispatcher"/>
>          </handler>
>          <handler name="AddressingValidationHandler" class="org.apache.axis2.handlers.addressing.AddressingValidationHandler">
> -            <order phase="Dispatch" after="AddressingBasedDispatcher"/>
> +            <order phase="Addressing" after="AddressingBasedDispatcher"/>
>          </handler>
>      </InFlow>
>  
> @@ -45,13 +45,13 @@
>  
>      <InFaultFlow>
>          <handler name="AddressingFinalInHandler" class="org.apache.axis2.handlers.addressing.AddressingFinalInHandler">
> -            <order phase="PreDispatch"/>
> +            <order phase="Addressing" before="AddressingBasedDispatcher"/>
>          </handler>
>          <handler name="AddressingSubmissionInHandler" class="org.apache.axis2.handlers.addressing.AddressingSubmissionInHandler">
> -            <order phase="PreDispatch"/>
> +            <order phase="Addressing" before="AddressingBasedDispatcher"/>
>          </handler>
>          <handler name="AddressingInFaultHandler" class="org.apache.axis2.handlers.addressing.AddressingInFaultHandler">
> -            <order phase="Dispatch"/>
> +            <order phase="Addressing" after="AddressingBasedDispatcher"/>
>          </handler>
>          <!-- AddressingValidationHandler not present on the INfaultflow so that we don't get faults bouncing around forever -->
>      </InFaultFlow>
> 
> Modified: webservices/axis2/trunk/java/modules/integration/conf/axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/conf/axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/conf/axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/conf/axis2.xml Tue Jul 24 04:41:00 2007
> @@ -215,16 +215,22 @@
>                       class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
>                  <order phase="Transport"/>
>              </handler>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
>                  <order phase="Transport"/>
>              </handler>
>          </phase>
> +        <phase name="Addressing">
> +            <handler name="AddressingBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> +                <order phase="Addressing"/>
> +            </handler>
> +        </phase>
>          <phase name="Security"/>
>          <phase name="PreDispatch"/>
>          <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> -            <handler name="AddressingBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
>                       class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> @@ -246,23 +252,27 @@
>          <phase name="Security"/>
>      </phaseOrder>
>      <phaseOrder type="InFaultFlow">
> +       <phase name="Addressing">
> +            <handler name="AddressingBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> +                <order phase="Addressing"/>
> +            </handler>
> +        </phase>
> +        <phase name="Security"/>
>          <phase name="PreDispatch"/>
>          <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
> -
>              <handler name="SOAPActionBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> -
> -            <handler name="AddressingBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
>                       class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
> -
>              <handler name="SOAPMessageBodyBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> -        </phase>
> -        <phase name="RMPhase"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
> +        </phase>        <phase name="RMPhase"/>
>          <!--      user can add his own phases to this area  -->
>          <phase name="OperationInFaultPhase"/>
>      </phaseOrder>
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test-resources/deployment/deployment.both.axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/deployment/deployment.both.axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test-resources/deployment/deployment.both.axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test-resources/deployment/deployment.both.axis2.xml Tue Jul 24 04:41:00 2007
> @@ -84,24 +84,27 @@
>                  <order phase="Dispatch"/>
>              </handler>
>          </phase>
> +        <phase name="Addressing">
> +             <handler name="AddressingBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> +                 <order phase="Addressing"/>
> +            </handler>
> +        </phase>
>          <phase name="Security"/>
>          <phase name="PreDispatch"/>
>          <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> -            <handler name="AddressingBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +            <handler name="RequestURIBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
> +            <handler name="SOAPActionBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -        </phase>
> -        <!--  System pre defined phases       -->
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
> +        </phase>        <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
>          <phase name="OperationInPhase"/>
>      </phaseOrder>
> @@ -114,33 +117,27 @@
>          <phase name="MessageOut"/>
>      </phaseOrder>
>      <phaseOrder type="InFaultFlow">
> +        <phase name="Addressing">
> +             <handler name="AddressingBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> +                 <order phase="Addressing"/>
> +            </handler>
> +        </phase>
> +        <phase name="Security"/>
>          <phase name="PreDispatch"/>
>          <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> -            <handler name="AddressingBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -        </phase>
> -        <!--      user can add his own phases to this area  -->
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
> +        </phase>        <!--      user can add his own phases to this area  -->
>          <phase name="OperationInFaultPhase"/>
>      </phaseOrder>
>      <phaseOrder type="OutFaultFlow">
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -90,31 +90,26 @@
>      <phaseOrder type="InFlow">
>          <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> @@ -131,31 +126,26 @@
>      <phaseOrder type="InFaultFlow">
>         <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +        <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -92,31 +92,26 @@
>     <phaseOrder type="InFlow">
>          <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> @@ -133,31 +128,26 @@
>      <phaseOrder type="InFaultFlow">
>         <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-enabled-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-enabled-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-enabled-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-enabled-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -92,31 +92,26 @@
>      <phaseOrder type="InFlow">
>          <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +        <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> @@ -133,31 +128,26 @@
>      <phaseOrder type="InFaultFlow">
>         <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -94,31 +94,26 @@
>     <phaseOrder type="InFlow">
>          <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> @@ -135,31 +130,26 @@
>      <phaseOrder type="InFaultFlow">
>         <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +        <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java Tue Jul 24 04:41:00 2007
> @@ -159,9 +159,9 @@
>  
>          TestingUtils.compareWithCreatedOMElement(result);
>  
> -        List expectedExecutionState = Arrays.asList(new String[] { "COut1", "COut2", "COut3", "In2",
> -                "In3", "In1", "In4", "In5", "In6", "Out1", "Out2", "Out3", "FCOut3", "FCOut2",
> -                "FCOut1", "FCIn6", "FCIn5", "FCIn4", "FCIn1", "FCIn3", "FCIn2", "FCCOut3",
> +        List expectedExecutionState = Arrays.asList(new String[] { "COut1", "COut2", "COut3", "In1",
> +                "In2", "In3", "In4", "In5", "In6", "Out1", "Out2", "Out3", "FCOut3", "FCOut2",
> +                "FCOut1", "FCIn6", "FCIn5", "FCIn4", "FCIn3", "FCIn2", "FCIn1", "FCCOut3",
>                  "FCCOut2", "FCCOut1", "CIn1", "CIn2", "CIn3", "FCCIn3", "FCCIn2", "FCCIn1" });
>          assertEquals(expectedExecutionState, testResults);
>      }
> @@ -231,8 +231,8 @@
>          }
>          catch (AxisFault e) {
>          }
> -        List expectedExecutionState = Arrays.asList(new String[] { "In2", "In3", "In1", "In4",
> -                "kaboom", "FCIn4", "FCIn1", "FCIn3", "FCIn2" });
> +        List expectedExecutionState = Arrays.asList(new String[] { "In1", "In2", "In3", "In4",
> +                "kaboom", "FCIn4", "FCIn3", "FCIn2", "FCIn1" });
>          assertEquals(expectedExecutionState, testResults);
>          middleOperationInHandler.shouldFail(false);
>      }
> @@ -248,7 +248,7 @@
>          catch (AxisFault e) {
>          }
>          List expectedExecutionState = Arrays.asList(
> -                new String[] { "In2", "In3", "In1", "kaboom", "FCIn1", "FCIn3", "FCIn2" });
> +                new String[] { "In1", "In2", "In3", "kaboom", "FCIn3", "FCIn2", "FCIn1" });
>          assertEquals(expectedExecutionState, testResults);
>          firstOperationInHandler.shouldFail(false);
>      }
> @@ -263,7 +263,7 @@
>          }
>          catch (AxisFault e) {
>          }
> -        List expectedExecutionState = Arrays.asList(new String[] { "kaboom"});
> +        List expectedExecutionState = Arrays.asList(new String[] {"In1", "kaboom","FCIn1"});
>          assertEquals(expectedExecutionState, testResults);
>          middleGlobalInHandler.shouldFail(false);
>      }
> @@ -278,9 +278,9 @@
>          }
>          catch (AxisFault e) {
>          }
> -        List expectedExecutionState = Arrays.asList(new String[] { "In2", "In3", "In1", "In4",
> -                "In5", "In6", "Out1", "kaboom", "FCOut1", "FCIn6", "FCIn5", "FCIn4", "FCIn1",
> -                "FCIn3", "FCIn2" });
> +        List expectedExecutionState = Arrays.asList(new String[] { "In1", "In2", "In3", "In4",
> +                "In5", "In6", "Out1", "kaboom", "FCOut1", "FCIn6", "FCIn5", "FCIn4", "FCIn3",
> +                "FCIn2", "FCIn1" });
>          assertEquals(expectedExecutionState, testResults);
>          middleOperationOutHandler.shouldFail(false);
>      }
> @@ -385,9 +385,9 @@
>          catch (AxisFault e) {
>          }
>  
> -        List expectedExecutionState = Arrays.asList(new String[] { "In2", "In3", "In1", "In4",
> +        List expectedExecutionState = Arrays.asList(new String[] { "In1", "In2", "In3", "In4",
>                  "In5", "In6", "Out1", "Out2", "Out3", "FCOut3", "FCOut2", "FCOut1", "FCIn6",
> -                "FCIn5", "FCIn4", "FCIn1", "FCIn3", "FCIn2", "CIn1", "kaboom", "FCCIn1" });
> +                "FCIn5", "FCIn4", "FCIn3", "FCIn2", "FCIn1", "CIn1", "kaboom", "FCCIn1" });
>          assertEquals(expectedExecutionState, testResults);
>      }
>  
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -119,31 +119,26 @@
>      <phaseOrder type="InFlow">
>          <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> @@ -159,31 +154,26 @@
>      </phaseOrder>
>      <phaseOrder type="InFaultFlow">
>         <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +        <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -87,31 +87,26 @@
>      <phaseOrder type="InFlow">
>          <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> @@ -127,31 +122,26 @@
>      </phaseOrder>
>      <phaseOrder type="InFaultFlow">
>         <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -69,31 +69,26 @@
>      <phaseOrder type="InFlow">
>          <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +        <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> @@ -109,31 +104,26 @@
>      </phaseOrder>
>      <phaseOrder type="InFaultFlow">
>         <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +        <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -152,22 +152,26 @@
>                  <order phase="Dispatch"/>
>              </handler>
>          </phase>
> -        <phase name="Security"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +            <handler name="RequestURIBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
> +            <handler name="SOAPActionBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> @@ -183,31 +187,26 @@
>          <phase name="Security"/>
>      </phaseOrder>
>      <phaseOrder type="InFaultFlow">
> +         <phase name="Addressing">
> +            <handler name="AddressingBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> +                <order phase="Addressing"/>
> +            </handler>
> +        </phase>
> +        <phase name="Security"/>
>          <phase name="PreDispatch"/>
>          <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> -            <handler name="AddressingBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--      user can add his own phases to this area  -->
>          <phase name="OperationInFaultPhase"/>
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -148,22 +148,26 @@
>                  <order phase="Transport"/>
>              </handler>
>          </phase>
> -        <phase name="Security"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +        <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +            <handler name="RequestURIBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
> +            <handler name="SOAPActionBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> @@ -179,31 +183,26 @@
>          <phase name="Security"/>
>      </phaseOrder>
>      <phaseOrder type="InFaultFlow">
> +         <phase name="Addressing">
> +            <handler name="AddressingBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> +                <order phase="Addressing"/>
> +            </handler>
> +        </phase>
> +        <phase name="Security"/>
>          <phase name="PreDispatch"/>
>          <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> -            <handler name="AddressingBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--      user can add his own phases to this area  -->
>          <phase name="OperationInFaultPhase"/>
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -82,31 +82,26 @@
>      <phaseOrder type="InFlow">
>          <!--  System pre defined phases       -->
>          <phase name="TransportIn"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -            <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> -
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> +            <handler name="RequestURIOperationDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -130,22 +130,26 @@
>                  <order phase="Dispatch"/>
>              </handler>
>          </phase>
> -        <phase name="Security"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +            <handler name="RequestURIBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
> +            <handler name="SOAPActionBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> 
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml Tue Jul 24 04:41:00 2007
> @@ -130,22 +130,26 @@
>                  <order phase="Dispatch"/>
>              </handler>
>          </phase>
> -        <phase name="Security"/>
> -        <phase name="PreDispatch"/>
> -        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +         <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> +                <order phase="Addressing"/>
>              </handler>
> +        </phase>
> +        <phase name="Security"/>
> +        <phase name="PreDispatch"/>
> +        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> +            <handler name="RequestURIBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
> +            <handler name="SOAPActionBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
> +
> +            <handler name="HTTPLocationBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <!--  System pre defined phases       -->
>          <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
> 
> Modified: webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
> +++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Tue Jul 24 04:41:00 2007
> @@ -354,13 +354,14 @@
>                  <order phase="Transport"/>
>              </handler>
>          </phase>
> -        <phase name="PreDispatch">
> -            <handler name="AddressingBasedDispatcher"
> +        <phase name="Addressing">
> +             <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                 <order phase="PreDispatch" phaseLast="true"/>
> +                 <order phase="Addressing"/>
>              </handler>
>          </phase>
>          <phase name="Security"/>
> +        <phase name="PreDispatch"/>
>          <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
> @@ -392,19 +393,21 @@
>          <phase name="Security"/>
>      </phaseOrder>
>      <phaseOrder type="InFaultFlow">
> +        <phase name="Addressing">
> +             <handler name="AddressingBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> +                 <order phase="Addressing"/>
> +            </handler>
> +        </phase>
> +        <phase name="Security"/>
>          <phase name="PreDispatch"/>
>          <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
> -
>              <handler name="SOAPActionBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
> -
> -            <handler name="AddressingBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
>                       class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
> -
>              <handler name="SOAPMessageBodyBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
>  
> 
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml Tue Jul 24 04:41:00 2007
> @@ -179,14 +179,15 @@
>                       class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
>                  <order phase="Transport"/>
>              </handler>
> -        </phase>
> -        <phase name="PreDispatch">
> +         </phase>
> +        <phase name="Addressing">
>              <handler name="AddressingBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                 <order phase="PreDispatch" phaseLast="true"/>
> +                <order phase="Addressing"/>
>              </handler>
>          </phase>
>          <phase name="Security"/>
> +        <phase name="PreDispatch"/>
>          <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
>                       class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
> @@ -216,36 +217,26 @@
>          <phase name="Security"/>
>      </phaseOrder>
>      <phaseOrder type="InFaultFlow">
> +        <phase name="Addressing">
> +             <handler name="AddressingBasedDispatcher"
> +                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> +                 <order phase="Addressing"/>
> +            </handler>
> +        </phase>
> +        <phase name="Security"/>
>          <phase name="PreDispatch"/>
>          <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
>              <handler name="RequestURIBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
>              <handler name="SOAPActionBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> -            <handler name="AddressingBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
>              <handler name="RequestURIOperationDispatcher"
> -                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> -
> +                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
>              <handler name="SOAPMessageBodyBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
>  
>              <handler name="HTTPLocationBasedDispatcher"
> -                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher">
> -                <order phase="Dispatch"/>
> -            </handler>
> +                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
>          </phase>
>          <phase name="RMPhase"/>
>          <!--      user can add his own phases to this area  -->
> 
> Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java?view=diff&rev=559011&r1=559010&r2=559011
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java Tue Jul 24 04:41:00 2007
> @@ -62,9 +62,9 @@
>          Phase userPhase;
>          ArrayList globalinflow = config.getInFlowPhases();
>          assertNotNull(globalinflow);
> -        phase = (Phase) globalinflow.get(1);
> +        phase = (Phase) globalinflow.get(3);
>          assertNotNull(phase);
> -        assertEquals(phase.getHandlerCount(), 1);
> +        assertEquals(phase.getHandlerCount(), 0);
>          AxisService service = config.getService(serviceName);
>          assertNotNull(service);
>          AxisOperation operation = service.getOperation(opName);
> @@ -74,11 +74,11 @@
>          assertEquals(0, userPhase.getHandlerCount());
>  
>          config.engageModule(module.getName());
> -        assertEquals(3, phase.getHandlerCount());
> +        assertEquals(2, phase.getHandlerCount());
>          assertEquals(1, userPhase.getHandlerCount());
>  
>          config.disengageModule(module);
> -        assertEquals(1, phase.getHandlerCount());
> +        assertEquals(0, phase.getHandlerCount());
>          assertEquals(0, userPhase.getHandlerCount());
>      }
>  
> @@ -89,9 +89,9 @@
>          Phase userPhase;
>          ArrayList globalinflow = config.getInFlowPhases();
>          assertNotNull(globalinflow);
> -        phase = (Phase) globalinflow.get(1);
> +        phase = (Phase) globalinflow.get(3);
>          assertNotNull(phase);
> -        assertEquals(1, phase.getHandlerCount());
> +        assertEquals(0, phase.getHandlerCount());
>          AxisService service = config.getService(serviceName);
>          assertNotNull(service);
>          AxisOperation operation = service.getOperation(opName);
> @@ -102,11 +102,11 @@
>          assertEquals(0, userPhase.getHandlerCount());
>  
>          config.engageModule(module.getName());
> -        assertEquals(3, phase.getHandlerCount());
> +        assertEquals(2, phase.getHandlerCount());
>          assertEquals(1, userPhase.getHandlerCount());
>  
>          service.disengageModule(module);
> -        assertEquals(3, phase.getHandlerCount());
> +        assertEquals(2, phase.getHandlerCount());
>          assertEquals(0, userPhase.getHandlerCount());
>      }
>  
> @@ -126,9 +126,9 @@
>          Phase userPhase;
>          ArrayList globalinflow = config.getInFlowPhases();
>          assertNotNull(globalinflow);
> -        phase = (Phase) globalinflow.get(1);
> +        phase = (Phase) globalinflow.get(3);
>          assertNotNull(phase);
> -        assertEquals(phase.getHandlerCount(), 1);
> +        assertEquals(phase.getHandlerCount(), 0);
>          AxisService service = config.getService(serviceName);
>          assertNotNull(service);
>          AxisOperation operation = service.getOperation(opName);
> @@ -138,11 +138,11 @@
>          assertEquals(0, userPhase.getHandlerCount());
>  
>          config.engageModule(module.getName());
> -        assertEquals(3, phase.getHandlerCount());
> +        assertEquals(2, phase.getHandlerCount());
>          assertEquals(1, userPhase.getHandlerCount());
>  
>          operation.disengageModule(module);
> -        assertEquals(3, phase.getHandlerCount());
> +        assertEquals(2, phase.getHandlerCount());
>          assertEquals(0, userPhase.getHandlerCount());
>      }
>  
> @@ -153,9 +153,9 @@
>          Phase userPhase;
>          ArrayList globalinflow = config.getInFlowPhases();
>          assertNotNull(globalinflow);
> -        predisptah = (Phase) globalinflow.get(1);
> +        predisptah = (Phase) globalinflow.get(3);
>          assertNotNull(predisptah);
> -        assertEquals(predisptah.getHandlerCount(), 1);
> +        assertEquals(predisptah.getHandlerCount(), 0);
>          AxisService service = config.getService(serviceName);
>          assertNotNull(service);
>          AxisOperation operation = service.getOperation(opName);
> @@ -165,11 +165,11 @@
>          assertEquals(0, userPhase.getHandlerCount());
>  
>          service.engageModule(module);
> -        assertEquals(3, predisptah.getHandlerCount());
> +        assertEquals(2, predisptah.getHandlerCount());
>          assertEquals(1, userPhase.getHandlerCount());
>  
>          service.disengageModule(module);
> -        assertEquals(1, predisptah.getHandlerCount());
> +        assertEquals(0, predisptah.getHandlerCount());
>          assertEquals(0, userPhase.getHandlerCount());
>      }
>  
> @@ -180,9 +180,9 @@
>          Phase userPhase;
>          ArrayList globalinflow = config.getInFlowPhases();
>          assertNotNull(globalinflow);
> -        phase = (Phase) globalinflow.get(1);
> +        phase = (Phase) globalinflow.get(3);
>          assertNotNull(phase);
> -        assertEquals(phase.getHandlerCount(), 1);
> +        assertEquals(phase.getHandlerCount(), 0);
>          AxisService service = config.getService(serviceName);
>          assertNotNull(service);
>          AxisOperation operation = service.getOperation(opName);
> @@ -192,11 +192,11 @@
>          assertEquals(0, userPhase.getHandlerCount());
>  
>          service.engageModule(module);
> -        assertEquals(3, phase.getHandlerCount());
> +        assertEquals(2, phase.getHandlerCount());
>          assertEquals(1, userPhase.getHandlerCount());
>  
>          operation.disengageModule(module);
> -        assertEquals(3, phase.getHandlerCount());
> +        assertEquals(2, phase.getHandlerCount());
>          assertEquals(0, userPhase.getHandlerCount());
>      }
>  
> @@ -207,9 +207,9 @@
>          Phase userPhase;
>          ArrayList globalinflow = config.getInFlowPhases();
>          assertNotNull(globalinflow);
> -        phase = (Phase) globalinflow.get(1);
> +        phase = (Phase) globalinflow.get(3);
>          assertNotNull(phase);
> -        assertEquals(phase.getHandlerCount(), 1);
> +        assertEquals(phase.getHandlerCount(), 0);
>          AxisService service = config.getService(serviceName);
>          assertNotNull(service);
>          AxisOperation operation = service.getOperation(opName);
> @@ -218,10 +218,10 @@
>          assertNotNull(userPhase);
>          assertEquals(0, userPhase.getHandlerCount());
>          operation.engageModule(module);
> -        assertEquals(3, phase.getHandlerCount());
> +        assertEquals(2, phase.getHandlerCount());
>          assertEquals(1, userPhase.getHandlerCount());
>          operation.disengageModule(module);
> -        assertEquals(1, phase.getHandlerCount());
> +        assertEquals(0, phase.getHandlerCount());
>          assertEquals(0, userPhase.getHandlerCount());
>      }
>  
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org

---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org


Mime
View raw message