[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sandesha-dev
Subject:    svn commit: r560203 - in /webservices/sandesha/trunk/java/modules:
From:       deepal () apache ! org
Date:       2007-07-27 11:43:40
Message-ID: 20070727114340.E23871A981A () eris ! apache ! org
[Download RAW message or body]

Author: deepal
Date: Fri Jul 27 04:43:38 2007
New Revision: 560203

URL: http://svn.apache.org/viewvc?view=rev&rev=560203
Log:
fixing Sandesha build , still two test cases are failing Chamikra please have a look \
at them  

Modified:
    webservices/sandesha/trunk/java/modules/interop/src/resources/conf/sec-client-axis2.xml
  webservices/sandesha/trunk/java/modules/mar/module.xml
    webservices/sandesha/trunk/java/modules/tests/test-resources/client_axis2.xml
    webservices/sandesha/trunk/java/modules/tests/test-resources/client_mtom_axis2.xml
  webservices/sandesha/trunk/java/modules/tests/test-resources/server_axis2.xml
    webservices/sandesha/trunk/java/modules/tests/test-resources/server_mtom_axis2.xml


Modified: webservices/sandesha/trunk/java/modules/interop/src/resources/conf/sec-client-axis2.xml
                
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/resources/conf/sec-client-axis2.xml?view=diff&rev=560203&r1=560202&r2=560203
 ==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/resources/conf/sec-client-axis2.xml \
                (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/resources/conf/sec-client-axis2.xml \
Fri Jul 27 04:43:38 2007 @@ -113,39 +113,36 @@
         <!--  System pre defined phases       -->
          <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Transport"/>
             </handler>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.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.engine.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.engine.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     \
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>  <handler \
                name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <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      -->
-        <phase name="OperationInPhase"/>
-		<phase name="RMPhase" />
+        <phase name="RMPhase"/>
     </phaseOrder>
     <phaseOrder type="OutFlow">
         <!--      user can add his own phases to this area  -->
@@ -158,39 +155,38 @@
         <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="InFaultFlow">
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+        <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
-                <order phase="Dispatch"/>
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+                <order phase="Transport"/>
             </handler>
-
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
-                <order phase="Dispatch"/>
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+                <order phase="Transport"/>
             </handler>
-
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
+        </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="RequestURIBasedDispatcher"
+                     \
class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/> +            \
<handler name="SOAPActionBasedDispatcher" +                     \
class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>  <handler \
                name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     \
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>  <handler \
                name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <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"/>
-		<phase name="RMPhase" />
+        <phase name="RMPhase"/>
     </phaseOrder>
     <phaseOrder type="OutFaultFlow">
         <!--      user can add his own phases to this area  -->
@@ -436,4 +432,4 @@
 		</token-canceler-config>
     </parameter>
 
-</axisconfig>
\ No newline at end of file
+</axisconfig>

Modified: webservices/sandesha/trunk/java/modules/mar/module.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/mar/module.xml?view=diff&rev=560203&r1=560202&r2=560203
 ==============================================================================
--- webservices/sandesha/trunk/java/modules/mar/module.xml (original)
+++ webservices/sandesha/trunk/java/modules/mar/module.xml Fri Jul 27 04:43:38 2007
@@ -11,7 +11,7 @@
         </handler> 
         
        	<handler name="SequenceIDDispatcher" \
                class="org.apache.sandesha2.handlers.SequenceIDDispatcher">
-            <order phase="Dispatch" after="SandeshaGlobalInHandler" \
before="AddressingBasedDispatcher"  /> +            <order phase="Addressing" \
before="AddressingValidationHandler"  />  </handler> 
         
         <handler name="SandeshaInHandler" \
class="org.apache.sandesha2.handlers.SandeshaInHandler">

Modified: webservices/sandesha/trunk/java/modules/tests/test-resources/client_axis2.xml
                
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/test-resources/client_axis2.xml?view=diff&rev=560203&r1=560202&r2=560203
 ==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/test-resources/client_axis2.xml \
                (original)
+++ webservices/sandesha/trunk/java/modules/tests/test-resources/client_axis2.xml Fri \
Jul 27 04:43:38 2007 @@ -283,38 +283,28 @@
                 <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">
-                <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>
+                     \
class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>  
             <handler name="HTTPLocationBasedDispatcher"
-                     \
                class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     \
class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>  </phase>
-        <!--  System predefined phases       -->
-        <!--   After Postdispatch phase module author or service author can add any \
                phase he want      -->
-        <phase name="OperationInPhase"/>
-		<phase name="soapmonitorPhase"/>
-		<phase name="RMPhase"/>
+        <phase name="RMPhase"/>
     </phaseOrder>
     <phaseOrder type="OutFlow">
         <!--      user can add his own phases to this area  -->
@@ -328,46 +318,38 @@
         <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="InFaultFlow">
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+        <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
                      class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
-                <order phase="Dispatch"/>
+                <order phase="Transport"/>
             </handler>
-
             <handler name="SOAPActionBasedDispatcher"
                      class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
-                <order phase="Dispatch"/>
+                <order phase="Transport"/>
             </handler>
-
-            <handler name="AddressingBasedDispatcher"
+        </phase>
+        <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">
-                <order phase="Dispatch"/>
-            </handler>
-
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <order phase="PostDispatch"/>
-            </handler>
+                     \
class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>  </phase>
-        <!--      user can add his own phases to this area  -->
-        <phase name="OperationInFaultPhase"/>
-		<phase name="soapmonitorPhase"/>
-		<phase name="RMPhase"/>
+        <phase name="RMPhase"/>
     </phaseOrder>
     <phaseOrder type="OutFaultFlow">
         <!--      user can add his own phases to this area  -->
@@ -377,4 +359,4 @@
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
     </phaseOrder>
-</axisconfig>
\ No newline at end of file
+</axisconfig>

Modified: webservices/sandesha/trunk/java/modules/tests/test-resources/client_mtom_axis2.xml
                
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/test-resources/client_mtom_axis2.xml?view=diff&rev=560203&r1=560202&r2=560203
 ==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/test-resources/client_mtom_axis2.xml \
                (original)
+++ webservices/sandesha/trunk/java/modules/tests/test-resources/client_mtom_axis2.xml \
Fri Jul 27 04:43:38 2007 @@ -110,42 +110,38 @@
     <!-- Phases  -->
     <!-- ================================================= -->
     <phaseOrder type="InFlow">
-        <!--  System pre defined phases       -->
-         <phase name="Transport">
+       <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Transport"/>
             </handler>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.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.engine.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.engine.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     \
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>  <handler \
                name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <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      -->
-        <phase name="OperationInPhase"/>
-		<phase name="RMPhase" />
+        <phase name="RMPhase"/>
     </phaseOrder>
     <phaseOrder type="OutFlow">
         <!--      user can add his own phases to this area  -->
@@ -158,39 +154,38 @@
         <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="InFaultFlow">
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+        <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
-                <order phase="Dispatch"/>
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+                <order phase="Transport"/>
             </handler>
-
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
-                <order phase="Dispatch"/>
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+                <order phase="Transport"/>
             </handler>
-
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
+        </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="RequestURIBasedDispatcher"
+                     \
class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/> +            \
<handler name="SOAPActionBasedDispatcher" +                     \
class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>  <handler \
                name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     \
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>  <handler \
                name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <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"/>
-		<phase name="RMPhase" />
+        <phase name="RMPhase"/>
     </phaseOrder>
     <phaseOrder type="OutFaultFlow">
         <!--      user can add his own phases to this area  -->
@@ -199,4 +194,4 @@
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
     </phaseOrder>
-</axisconfig>
\ No newline at end of file
+</axisconfig>

Modified: webservices/sandesha/trunk/java/modules/tests/test-resources/server_axis2.xml
                
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/test-resources/server_axis2.xml?view=diff&rev=560203&r1=560202&r2=560203
 ==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/test-resources/server_axis2.xml \
                (original)
+++ webservices/sandesha/trunk/java/modules/tests/test-resources/server_axis2.xml Fri \
Jul 27 04:43:38 2007 @@ -282,38 +282,28 @@
                 <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">
-                <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>
+                     \
class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>  
             <handler name="HTTPLocationBasedDispatcher"
-                     \
                class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     \
class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>  </phase>
-        <!--  System predefined phases       -->
-        <!--   After Postdispatch phase module author or service author can add any \
                phase he want      -->
-        <phase name="OperationInPhase"/>
-		<phase name="soapmonitorPhase"/>
-		<phase name="RMPhase"/>
+        <phase name="RMPhase"/>
     </phaseOrder>
     <phaseOrder type="OutFlow">
         <!--      user can add his own phases to this area  -->
@@ -327,47 +317,40 @@
         <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="InFaultFlow">
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+        
+<phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
                      class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
-                <order phase="Dispatch"/>
+                <order phase="Transport"/>
             </handler>
-
             <handler name="SOAPActionBasedDispatcher"
                      class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
-                <order phase="Dispatch"/>
+                <order phase="Transport"/>
             </handler>
-
-            <handler name="AddressingBasedDispatcher"
+        </phase>
+        <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">
-                <order phase="Dispatch"/>
-            </handler>
-
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <order phase="PostDispatch"/>
-            </handler>
+                     \
class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>  </phase>
-        <!--      user can add his own phases to this area  -->
-        <phase name="OperationInFaultPhase"/>
-		<phase name="soapmonitorPhase"/>
-		<phase name="RMPhase"/>
-    </phaseOrder>
+        <phase name="RMPhase"/>
+  </phaseOrder>
     <phaseOrder type="OutFaultFlow">
         <!--      user can add his own phases to this area  -->
 	<phase name="soapmonitorPhase"/>
@@ -376,4 +359,4 @@
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
     </phaseOrder>
-</axisconfig>
\ No newline at end of file
+</axisconfig>

Modified: webservices/sandesha/trunk/java/modules/tests/test-resources/server_mtom_axis2.xml
                
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/test-resources/server_mtom_axis2.xml?view=diff&rev=560203&r1=560202&r2=560203
 ==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/test-resources/server_mtom_axis2.xml \
                (original)
+++ webservices/sandesha/trunk/java/modules/tests/test-resources/server_mtom_axis2.xml \
Fri Jul 27 04:43:38 2007 @@ -113,39 +113,36 @@
         <!--  System pre defined phases       -->
          <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Transport"/>
             </handler>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.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.engine.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.engine.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     \
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>  <handler \
                name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <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      -->
-        <phase name="OperationInPhase"/>
-		<phase name="RMPhase" />
+        <phase name="RMPhase"/>
     </phaseOrder>
     <phaseOrder type="OutFlow">
         <!--      user can add his own phases to this area  -->
@@ -158,39 +155,38 @@
         <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="InFaultFlow">
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+        <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
-                <order phase="Dispatch"/>
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+                <order phase="Transport"/>
             </handler>
-
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
-                <order phase="Dispatch"/>
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+                <order phase="Transport"/>
             </handler>
-
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
+        </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="RequestURIBasedDispatcher"
+                     \
class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/> +            \
<handler name="SOAPActionBasedDispatcher" +                     \
class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>  <handler \
                name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     \
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>  <handler \
                name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <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"/>
-		<phase name="RMPhase" />
+        <phase name="RMPhase"/>
     </phaseOrder>
     <phaseOrder type="OutFaultFlow">
         <!--      user can add his own phases to this area  -->
@@ -199,4 +195,4 @@
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
     </phaseOrder>
-</axisconfig>
\ No newline at end of file
+</axisconfig>



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


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic