You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2007/04/25 22:08:42 UTC
svn commit: r532467 [1/2] - in /webservices/axis2/trunk/java/modules:
addressing/test-resources/ codegen/test-resources/xmls/
fastinfoset/test-resources/ integration/conf/ integration/test-resources/
integration/test-resources/deployment/ integration/t...
Author: gdaniels
Date: Wed Apr 25 13:08:36 2007
New Revision: 532467
URL: http://svn.apache.org/viewvc?view=rev&rev=532467
Log:
* Remove unneeded <order phase="Dispatch"/> tags for handlers that are contained within <Phase> tags already. Got most of these, not sure I got them all.
* Remove references to InstanceDispatcher, and deprecated the class. Didn't remove the class since there are axis2.xml's out there which refer to it - but now the Handler does nothing, and we should eventually remove it (post-1.3).
TODO : Add documentation about removing InstanceDispatcher.
Modified:
webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml
webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml
webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml
webservices/axis2/trunk/java/modules/integration/conf/axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-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/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/jibx/test-resources/repo/conf/axis2.xml
webservices/axis2/trunk/java/modules/json/test-resources/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/src/org/apache/axis2/engine/InstanceDispatcher.java
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/bad-axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/messageFormatterTest/bad-axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/moduleConfig/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/moduleVersion/Test1/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/server-transport.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/server1.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml
webservices/axis2/trunk/java/modules/samples/jms/client_repository/conf/axis2.xml
webservices/axis2/trunk/java/modules/samples/jms/server_repository/conf/axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample01/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample02/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample03/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample04/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample05/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample06/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample07/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample08/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample09/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample10/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample11/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/userguide/conf/axis2.xml
webservices/axis2/trunk/java/modules/samples/yahoojsonsearch/resources/axis2.xml
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml Wed Apr 25 13:08:36 2007
@@ -15,32 +15,15 @@
<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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</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/codegen/test-resources/xmls/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml Wed Apr 25 13:08:36 2007
@@ -30,28 +30,16 @@
<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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</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/fastinfoset/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml Wed Apr 25 13:08:36 2007
@@ -279,28 +279,15 @@
<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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
<handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -321,38 +308,21 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
<handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
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=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/conf/axis2.xml Wed Apr 25 13:08:36 2007
@@ -206,22 +206,11 @@
<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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
+ class="org.apache.axis2.engine.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.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -240,32 +229,18 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.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="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml Wed Apr 25 13:08:36 2007
@@ -100,10 +100,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -144,10 +140,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- System pre defined phases -->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml Wed Apr 25 13:08:36 2007
@@ -102,10 +102,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -146,10 +142,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- System pre defined phases -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -82,10 +82,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -124,10 +120,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- user can add his own phases to this area -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -97,10 +97,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -141,10 +137,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- System pre defined phases -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -99,10 +99,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -143,10 +139,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- System pre defined phases -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -99,10 +99,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -143,10 +139,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- System pre defined phases -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -101,10 +101,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -145,10 +141,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- System pre defined phases -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -126,10 +126,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -169,10 +165,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- System pre defined phases -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -94,10 +94,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -137,10 +133,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- System pre defined phases -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -76,10 +76,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -119,10 +115,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- System pre defined phases -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -150,10 +150,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -193,10 +189,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- user can add his own phases to this area -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -146,10 +146,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="Dispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -189,10 +185,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- user can add his own phases to this area -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -89,10 +89,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -128,10 +128,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -170,10 +166,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- user can add his own phases to this area -->
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -128,10 +128,6 @@
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -170,10 +166,6 @@
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- user can add his own phases to this area -->
Modified: webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml Wed Apr 25 13:08:36 2007
@@ -107,34 +107,20 @@
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="RequestURIBasedOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIBasedOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.dispatchers.RequestURIBasedOperationDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
</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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -152,28 +138,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml Wed Apr 25 13:08:36 2007
@@ -265,22 +265,12 @@
<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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.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.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -301,32 +291,18 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.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="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
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=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Wed Apr 25 13:08:36 2007
@@ -284,38 +284,21 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
<handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
</phase>
<!-- System predefined phases -->
<!-- After Postdispatch phase module author or service author can add any phase he want -->
@@ -336,38 +319,21 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
<handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
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=532467&r1=532466&r2=532467
==============================================================================
--- 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 Wed Apr 25 13:08:36 2007
@@ -181,11 +181,6 @@
class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
<order phase="Dispatch"/>
</handler>
-
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -230,11 +225,6 @@
<handler name="HTTPLocationBasedDispatcher"
class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
<order phase="Dispatch"/>
- </handler>
-
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
</handler>
</phase>
<!-- user can add his own phases to this area -->
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java Wed Apr 25 13:08:36 2007
@@ -17,168 +17,30 @@
package org.apache.axis2.engine;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.SOAPHeader;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.ServiceGroupContext;
-import org.apache.axis2.context.SessionContext;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.http.HTTPConstants;
-
-import javax.xml.namespace.QName;
/**
* By the time the control comes to this handler, the dispatching must have happened
* so that the message context contains the AxisServiceGroup, AxisService and
* AxisOperation.
* This will then try to find the Contexts of ServiceGroup, Service and the Operation.
+ * @deprecate The functionality of this class has moved into the DispatchPhase postconditions
*/
public class InstanceDispatcher extends AbstractHandler {
- private static final QName SERVICE_GROUP_QNAME = new QName(Constants.AXIS2_NAMESPACE_URI,
- Constants.SERVICE_GROUP_ID,
- Constants.AXIS2_NAMESPACE_PREFIX);
/**
- * Post Condition : All the Contexts must be populated.
+ * This doesn't do anything, as the functionality is now in DispatchPhase.checkPostConditions()
+ * The class remains for backwards compatibility of axis2.xml files, but it should go away after
+ * 1.3.
*
- * @param msgContext MessageContext
- * @throws org.apache.axis2.AxisFault
+ * @param msgContext the <code>MessageContext</code> to process with this <code>Handler</code>.
+ * @return An InvocationResponse that indicates what the next step in the message processing
+ * should be.
+ * @throws org.apache.axis2.AxisFault if the handler encounters an error
*/
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
- AxisService service = msgContext.getAxisService();
- String scope = service == null ? null : service.getScope();
- ServiceContext serviceContext = msgContext.getServiceContext();
-
- if ((msgContext.getOperationContext() != null)
- && (serviceContext != null)) {
- msgContext.setServiceGroupContextId(
- ((ServiceGroupContext) serviceContext.getParent()).getId());
-
- return InvocationResponse.CONTINUE;
- }
- if (Constants.SCOPE_TRANSPORT_SESSION.equals(scope)) {
- fillContextsFromSessionContext(msgContext);
- } else if (Constants.SCOPE_SOAP_SESSION.equals(scope)) {
- extractServiceGroupContextId(msgContext);
- }
-
- AxisOperation axisOperation = msgContext.getAxisOperation();
- // 1. look up opCtxt using mc.addressingHeaders.relatesTo[0]
- if (axisOperation == null) {
- return InvocationResponse.CONTINUE;
- }
- OperationContext operationContext =
- axisOperation.findForExistingOperationContext(msgContext);
-
- if (operationContext != null) {
- // register operation context and message context
-// axisOperation.registerOperationContext(msgContext, operationContext);
- axisOperation.registerMessageContext(msgContext, operationContext);
-
- serviceContext = (ServiceContext) operationContext.getParent();
- ServiceGroupContext serviceGroupContext =
- (ServiceGroupContext) serviceContext.getParent();
-
- msgContext.setServiceContext(serviceContext);
- msgContext.setServiceGroupContext(serviceGroupContext);
- msgContext.setServiceGroupContextId(serviceGroupContext.getId());
- } else { // 2. if null, create new opCtxt
- operationContext = ContextFactory.createOperationContext(axisOperation, serviceContext);
-
- axisOperation.registerMessageContext(msgContext, operationContext);
- if (serviceContext != null) {
- // no need to added to configuration conetxt , since we are happy in
- // storing in session context
- operationContext.setParent(serviceContext);
- } else {
- // fill the service group context and service context info
- msgContext.getConfigurationContext().fillServiceContextAndServiceGroupContext(
- msgContext);
- }
- }
- serviceContext = msgContext.getServiceContext();
- if (serviceContext != null) {
- serviceContext.setMyEPR(msgContext.getTo());
- }
return InvocationResponse.CONTINUE;
- }
-
- private void fillContextsFromSessionContext(MessageContext msgContext) throws AxisFault {
- AxisService service = msgContext.getAxisService();
- if (service == null) {
- throw new AxisFault(Messages.getMessage("unabletofindservice"));
- }
- SessionContext sessionContext = msgContext.getSessionContext();
- if (sessionContext == null) {
- TransportListener listener = msgContext.getTransportIn().getReceiver();
- sessionContext = listener.getSessionContext(msgContext);
- if (sessionContext == null) {
- createAndFillContexts(service, msgContext, sessionContext);
- return;
- }
- }
- String serviceGroupName = msgContext.getAxisServiceGroup().getServiceGroupName();
- ServiceGroupContext serviceGroupContext = sessionContext.getServiceGroupContext(
- serviceGroupName);
- if (serviceGroupContext != null) {
- //setting service group context
- msgContext.setServiceGroupContext(serviceGroupContext);
- // setting Service conetxt
- msgContext.setServiceContext(
- ContextFactory.createServiceContext(serviceGroupContext, service));
- } else {
- createAndFillContexts(service, msgContext, sessionContext);
- }
- ServiceContext serviceContext = sessionContext.getServiceContext(service);
- //found the serviceContext from session context , so adding that into msgContext
- if (serviceContext != null) {
- msgContext.setServiceContext(serviceContext);
- serviceContext.setProperty(HTTPConstants.COOKIE_STRING, sessionContext.getCookieID());
- }
- }
-
- private void createAndFillContexts(AxisService service,
- MessageContext msgContext,
- SessionContext sessionContext) throws AxisFault {
- ServiceGroupContext serviceGroupContext;
- AxisServiceGroup axisServiceGroup = (AxisServiceGroup) service.getParent();
- serviceGroupContext = ContextFactory.createServiceGroupContext(
- msgContext.getConfigurationContext(), axisServiceGroup);
-
- msgContext.setServiceGroupContext(serviceGroupContext);
- ServiceContext serviceContext =
- ContextFactory.createServiceContext(serviceGroupContext, service);
- msgContext.setServiceContext(serviceContext);
- if (sessionContext != null) {
- sessionContext.addServiceContext(serviceContext);
- sessionContext.addServiceGroupContext(serviceGroupContext);
- }
- }
-
- private void extractServiceGroupContextId(MessageContext msgContext) throws AxisFault {
- SOAPHeader soapHeader = msgContext.getEnvelope().getHeader();
- if (soapHeader != null) {
- OMElement serviceGroupId = soapHeader.getFirstChildWithName(SERVICE_GROUP_QNAME);
- if (serviceGroupId != null) {
- String groupId = serviceGroupId.getText();
- ServiceGroupContext serviceGroupContext = msgContext.getConfigurationContext().
- getServiceGroupContextFromSoapSessionTable(groupId, msgContext);
- if (serviceGroupContext == null) {
- throw new AxisFault(Messages.getMessage(
- "invalidservicegrouoid", groupId));
- }
- msgContext.setServiceGroupContextId(serviceGroupId.getText());
- }
- }
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml Wed Apr 25 13:08:36 2007
@@ -47,30 +47,18 @@
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
</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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -88,28 +76,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml Wed Apr 25 13:08:36 2007
@@ -72,30 +72,18 @@
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
</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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -113,28 +101,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml Wed Apr 25 13:08:36 2007
@@ -12,30 +12,18 @@
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
</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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -53,28 +41,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml Wed Apr 25 13:08:36 2007
@@ -12,30 +12,18 @@
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
</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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -53,28 +41,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml Wed Apr 25 13:08:36 2007
@@ -102,18 +102,18 @@
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
- </messageReceivers>
-
- <!-- ================================================= -->
- <!-- Message Builders -->
- <!-- ================================================= -->
- <!--Following content type to builder mapping can be used to implement support for different message -->
- <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
- <messageBuilders>
- <messageBuilder contentType="text/xml"
- class="org.apache.axiom.om.impl.builder.StAXOMBuilder"/>
- <messageBuilder contentType="application/soap+xml"
- class="org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder"/>
+ </messageReceivers>
+
+ <!-- ================================================= -->
+ <!-- Message Builders -->
+ <!-- ================================================= -->
+ <!--Following content type to builder mapping can be used to implement support for different message -->
+ <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
+ <messageBuilders>
+ <messageBuilder contentType="text/xml"
+ class="org.apache.axiom.om.impl.builder.StAXOMBuilder"/>
+ <messageBuilder contentType="application/soap+xml"
+ class="org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder"/>
</messageBuilders>
<!-- ================================================= -->
<!-- Transport Ins -->
@@ -246,22 +246,12 @@
<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>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.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.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -282,32 +272,18 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.engine.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="PostDispatch"/>
- </handler>
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r532467 [1/2] - in /webservices/axis2/trunk/java/modules:
addressing/test-resources/ codegen/test-resources/xmls/ fastinfoset/test-resources/
integration/conf/ integration/test-resources/ integration/test-resources/deployment/
integration/t...
Posted by Deepal Jayasinghe <de...@opensource.lk>.
Hi Glen,
I am very sorry , but I am -1 on this change. There was no single reason
to remove InstanceDispatcher , did we discuss that somewhere ?. Axis2
is in stable stage so it is not good idea to do such a changes at all.
gdaniels@apache.org wrote:
>Author: gdaniels
>Date: Wed Apr 25 13:08:36 2007
>New Revision: 532467
>
>URL: http://svn.apache.org/viewvc?view=rev&rev=532467
>Log:
>* Remove unneeded <order phase="Dispatch"/> tags for handlers that are contained within <Phase> tags already. Got most of these, not sure I got them all.
>
>* Remove references to InstanceDispatcher, and deprecated the class. Didn't remove the class since there are axis2.xml's out there which refer to it - but now the Handler does nothing, and we should eventually remove it (post-1.3).
>
>TODO : Add documentation about removing InstanceDispatcher.
>
>Modified:
> webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml
> webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml
> webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml
> webservices/axis2/trunk/java/modules/integration/conf/axis2.xml
> webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml
> webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-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/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/jibx/test-resources/repo/conf/axis2.xml
> webservices/axis2/trunk/java/modules/json/test-resources/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/src/org/apache/axis2/engine/InstanceDispatcher.java
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/bad-axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/messageFormatterTest/bad-axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/moduleConfig/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/moduleVersion/Test1/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/server-transport.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/server1.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
> webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml
> webservices/axis2/trunk/java/modules/samples/jms/client_repository/conf/axis2.xml
> webservices/axis2/trunk/java/modules/samples/jms/server_repository/conf/axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample01/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample02/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample03/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample04/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample05/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample06/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample07/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample08/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample09/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample10/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample11/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/userguide/conf/axis2.xml
> webservices/axis2/trunk/java/modules/samples/yahoojsonsearch/resources/axis2.xml
>
>Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -15,32 +15,15 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </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/codegen/test-resources/xmls/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -30,28 +30,16 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </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/fastinfoset/test-resources/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -279,28 +279,15 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
>
> <handler name="HTTPLocationBasedDispatcher"
>- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -321,38 +308,21 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
>
> <handler name="HTTPLocationBasedDispatcher"
>- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/integration/conf/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/integration/conf/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -206,22 +206,11 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>+ class="org.apache.axis2.engine.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.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -240,32 +229,18 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.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="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml Wed Apr 25 13:08:36 2007
>@@ -100,10 +100,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -144,10 +140,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml Wed Apr 25 13:08:36 2007
>@@ -102,10 +102,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -146,10 +142,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -82,10 +82,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -124,10 +120,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -97,10 +97,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -141,10 +137,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -99,10 +99,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -143,10 +139,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -99,10 +99,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -143,10 +139,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -101,10 +101,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -145,10 +141,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -126,10 +126,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -169,10 +165,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -94,10 +94,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -137,10 +133,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -76,10 +76,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -119,10 +115,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -150,10 +150,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -193,10 +189,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -146,10 +146,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -189,10 +185,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -89,10 +89,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -128,10 +128,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -170,10 +166,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -128,10 +128,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -170,10 +166,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>Modified: webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -107,34 +107,20 @@
> <!-- System pre defined phases -->
> <phase name="Transport">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="RequestURIBasedOperationDispatcher"
>- class="org.apache.axis2.dispatchers.RequestURIBasedOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.dispatchers.RequestURIBasedOperationDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> </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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -152,28 +138,16 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -265,22 +265,12 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.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.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -301,32 +291,18 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.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="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -284,38 +284,21 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
>
> <handler name="HTTPLocationBasedDispatcher"
>- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
> </phase>
> <!-- System predefined phases -->
> <!-- After Postdispatch phase module author or service author can add any phase he want -->
>@@ -336,38 +319,21 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
>
> <handler name="HTTPLocationBasedDispatcher"
>- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -181,11 +181,6 @@
> class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -230,11 +225,6 @@
> <handler name="HTTPLocationBasedDispatcher"
> class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
>+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java Wed Apr 25 13:08:36 2007
>@@ -17,168 +17,30 @@
>
> package org.apache.axis2.engine;
>
>-import org.apache.axiom.om.OMElement;
>-import org.apache.axiom.soap.SOAPHeader;
> import org.apache.axis2.AxisFault;
>-import org.apache.axis2.Constants;
>-import org.apache.axis2.context.ContextFactory;
> import org.apache.axis2.context.MessageContext;
>-import org.apache.axis2.context.OperationContext;
>-import org.apache.axis2.context.ServiceContext;
>-import org.apache.axis2.context.ServiceGroupContext;
>-import org.apache.axis2.context.SessionContext;
>-import org.apache.axis2.description.AxisOperation;
>-import org.apache.axis2.description.AxisService;
>-import org.apache.axis2.description.AxisServiceGroup;
> import org.apache.axis2.handlers.AbstractHandler;
>-import org.apache.axis2.i18n.Messages;
>-import org.apache.axis2.transport.TransportListener;
>-import org.apache.axis2.transport.http.HTTPConstants;
>-
>-import javax.xml.namespace.QName;
>
> /**
> * By the time the control comes to this handler, the dispatching must have happened
> * so that the message context contains the AxisServiceGroup, AxisService and
> * AxisOperation.
> * This will then try to find the Contexts of ServiceGroup, Service and the Operation.
>+ * @deprecate The functionality of this class has moved into the DispatchPhase postconditions
> */
> public class InstanceDispatcher extends AbstractHandler {
>- private static final QName SERVICE_GROUP_QNAME = new QName(Constants.AXIS2_NAMESPACE_URI,
>- Constants.SERVICE_GROUP_ID,
>- Constants.AXIS2_NAMESPACE_PREFIX);
>
> /**
>- * Post Condition : All the Contexts must be populated.
>+ * This doesn't do anything, as the functionality is now in DispatchPhase.checkPostConditions()
>+ * The class remains for backwards compatibility of axis2.xml files, but it should go away after
>+ * 1.3.
> *
>- * @param msgContext MessageContext
>- * @throws org.apache.axis2.AxisFault
>+ * @param msgContext the <code>MessageContext</code> to process with this <code>Handler</code>.
>+ * @return An InvocationResponse that indicates what the next step in the message processing
>+ * should be.
>+ * @throws org.apache.axis2.AxisFault if the handler encounters an error
> */
> public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
>- AxisService service = msgContext.getAxisService();
>- String scope = service == null ? null : service.getScope();
>- ServiceContext serviceContext = msgContext.getServiceContext();
>-
>- if ((msgContext.getOperationContext() != null)
>- && (serviceContext != null)) {
>- msgContext.setServiceGroupContextId(
>- ((ServiceGroupContext) serviceContext.getParent()).getId());
>-
>- return InvocationResponse.CONTINUE;
>- }
>- if (Constants.SCOPE_TRANSPORT_SESSION.equals(scope)) {
>- fillContextsFromSessionContext(msgContext);
>- } else if (Constants.SCOPE_SOAP_SESSION.equals(scope)) {
>- extractServiceGroupContextId(msgContext);
>- }
>-
>- AxisOperation axisOperation = msgContext.getAxisOperation();
>- // 1. look up opCtxt using mc.addressingHeaders.relatesTo[0]
>- if (axisOperation == null) {
>- return InvocationResponse.CONTINUE;
>- }
>- OperationContext operationContext =
>- axisOperation.findForExistingOperationContext(msgContext);
>-
>- if (operationContext != null) {
>- // register operation context and message context
>-// axisOperation.registerOperationContext(msgContext, operationContext);
>- axisOperation.registerMessageContext(msgContext, operationContext);
>-
>- serviceContext = (ServiceContext) operationContext.getParent();
>- ServiceGroupContext serviceGroupContext =
>- (ServiceGroupContext) serviceContext.getParent();
>-
>- msgContext.setServiceContext(serviceContext);
>- msgContext.setServiceGroupContext(serviceGroupContext);
>- msgContext.setServiceGroupContextId(serviceGroupContext.getId());
>- } else { // 2. if null, create new opCtxt
>- operationContext = ContextFactory.createOperationContext(axisOperation, serviceContext);
>-
>- axisOperation.registerMessageContext(msgContext, operationContext);
>- if (serviceContext != null) {
>- // no need to added to configuration conetxt , since we are happy in
>- // storing in session context
>- operationContext.setParent(serviceContext);
>- } else {
>- // fill the service group context and service context info
>- msgContext.getConfigurationContext().fillServiceContextAndServiceGroupContext(
>- msgContext);
>- }
>- }
>- serviceContext = msgContext.getServiceContext();
>- if (serviceContext != null) {
>- serviceContext.setMyEPR(msgContext.getTo());
>- }
> return InvocationResponse.CONTINUE;
>- }
>-
>- private void fillContextsFromSessionContext(MessageContext msgContext) throws AxisFault {
>- AxisService service = msgContext.getAxisService();
>- if (service == null) {
>- throw new AxisFault(Messages.getMessage("unabletofindservice"));
>- }
>- SessionContext sessionContext = msgContext.getSessionContext();
>- if (sessionContext == null) {
>- TransportListener listener = msgContext.getTransportIn().getReceiver();
>- sessionContext = listener.getSessionContext(msgContext);
>- if (sessionContext == null) {
>- createAndFillContexts(service, msgContext, sessionContext);
>- return;
>- }
>- }
>- String serviceGroupName = msgContext.getAxisServiceGroup().getServiceGroupName();
>- ServiceGroupContext serviceGroupContext = sessionContext.getServiceGroupContext(
>- serviceGroupName);
>- if (serviceGroupContext != null) {
>- //setting service group context
>- msgContext.setServiceGroupContext(serviceGroupContext);
>- // setting Service conetxt
>- msgContext.setServiceContext(
>- ContextFactory.createServiceContext(serviceGroupContext, service));
>- } else {
>- createAndFillContexts(service, msgContext, sessionContext);
>- }
>- ServiceContext serviceContext = sessionContext.getServiceContext(service);
>- //found the serviceContext from session context , so adding that into msgContext
>- if (serviceContext != null) {
>- msgContext.setServiceContext(serviceContext);
>- serviceContext.setProperty(HTTPConstants.COOKIE_STRING, sessionContext.getCookieID());
>- }
>- }
>-
>- private void createAndFillContexts(AxisService service,
>- MessageContext msgContext,
>- SessionContext sessionContext) throws AxisFault {
>- ServiceGroupContext serviceGroupContext;
>- AxisServiceGroup axisServiceGroup = (AxisServiceGroup) service.getParent();
>- serviceGroupContext = ContextFactory.createServiceGroupContext(
>- msgContext.getConfigurationContext(), axisServiceGroup);
>-
>- msgContext.setServiceGroupContext(serviceGroupContext);
>- ServiceContext serviceContext =
>- ContextFactory.createServiceContext(serviceGroupContext, service);
>- msgContext.setServiceContext(serviceContext);
>- if (sessionContext != null) {
>- sessionContext.addServiceContext(serviceContext);
>- sessionContext.addServiceGroupContext(serviceGroupContext);
>- }
>- }
>-
>- private void extractServiceGroupContextId(MessageContext msgContext) throws AxisFault {
>- SOAPHeader soapHeader = msgContext.getEnvelope().getHeader();
>- if (soapHeader != null) {
>- OMElement serviceGroupId = soapHeader.getFirstChildWithName(SERVICE_GROUP_QNAME);
>- if (serviceGroupId != null) {
>- String groupId = serviceGroupId.getText();
>- ServiceGroupContext serviceGroupContext = msgContext.getConfigurationContext().
>- getServiceGroupContextFromSoapSessionTable(groupId, msgContext);
>- if (serviceGroupContext == null) {
>- throw new AxisFault(Messages.getMessage(
>- "invalidservicegrouoid", groupId));
>- }
>- msgContext.setServiceGroupContextId(serviceGroupId.getText());
>- }
>- }
> }
> }
>
>Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -47,30 +47,18 @@
> <!-- System pre defined phases -->
> <phase name="Transport">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> </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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -88,28 +76,16 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -72,30 +72,18 @@
> <!-- System pre defined phases -->
> <phase name="Transport">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> </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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -113,28 +101,16 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -12,30 +12,18 @@
> <!-- System pre defined phases -->
> <phase name="Transport">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> </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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -53,28 +41,16 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -12,30 +12,18 @@
> <!-- System pre defined phases -->
> <phase name="Transport">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> </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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -53,28 +41,16 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -102,18 +102,18 @@
> class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
> <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
> class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
>- </messageReceivers>
>-
>- <!-- ================================================= -->
>- <!-- Message Builders -->
>- <!-- ================================================= -->
>- <!--Following content type to builder mapping can be used to implement support for different message -->
>- <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
>- <messageBuilders>
>- <messageBuilder contentType="text/xml"
>- class="org.apache.axiom.om.impl.builder.StAXOMBuilder"/>
>- <messageBuilder contentType="application/soap+xml"
>- class="org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder"/>
>+ </messageReceivers>
>+
>+ <!-- ================================================= -->
>+ <!-- Message Builders -->
>+ <!-- ================================================= -->
>+ <!--Following content type to builder mapping can be used to implement support for different message -->
>+ <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
>+ <messageBuilders>
>+ <messageBuilder contentType="text/xml"
>+ class="org.apache.axiom.om.impl.builder.StAXOMBuilder"/>
>+ <messageBuilder contentType="application/soap+xml"
>+ class="org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder"/>
> </messageBuilders>
> <!-- ================================================= -->
> <!-- Transport Ins -->
>@@ -246,22 +246,12 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.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.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -282,32 +272,18 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.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="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>
>
>---------------------------------------------------------------------
>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-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r532467 [1/2] - in /webservices/axis2/trunk/java/modules:
addressing/test-resources/ codegen/test-resources/xmls/ fastinfoset/test-resources/
integration/conf/ integration/test-resources/ integration/test-resources/deployment/
integration/t...
Posted by Deepal Jayasinghe <de...@opensource.lk>.
Hi Glen,
I am very sorry , but I am -1 on this change. There was no single reason
to remove InstanceDispatcher , did we discuss that somewhere ?. Axis2
is in stable stage so it is not good idea to do such a changes at all.
gdaniels@apache.org wrote:
>Author: gdaniels
>Date: Wed Apr 25 13:08:36 2007
>New Revision: 532467
>
>URL: http://svn.apache.org/viewvc?view=rev&rev=532467
>Log:
>* Remove unneeded <order phase="Dispatch"/> tags for handlers that are contained within <Phase> tags already. Got most of these, not sure I got them all.
>
>* Remove references to InstanceDispatcher, and deprecated the class. Didn't remove the class since there are axis2.xml's out there which refer to it - but now the Handler does nothing, and we should eventually remove it (post-1.3).
>
>TODO : Add documentation about removing InstanceDispatcher.
>
>Modified:
> webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml
> webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml
> webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml
> webservices/axis2/trunk/java/modules/integration/conf/axis2.xml
> webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml
> webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-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/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/jibx/test-resources/repo/conf/axis2.xml
> webservices/axis2/trunk/java/modules/json/test-resources/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/src/org/apache/axis2/engine/InstanceDispatcher.java
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/bad-axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/messageFormatterTest/bad-axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/moduleConfig/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/moduleVersion/Test1/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/server-transport.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/server1.xml
> webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
> webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml
> webservices/axis2/trunk/java/modules/samples/jms/client_repository/conf/axis2.xml
> webservices/axis2/trunk/java/modules/samples/jms/server_repository/conf/axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample01/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample02/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample03/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample04/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample05/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample06/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample07/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample08/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample09/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample10/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/security/basic/sample11/client.axis2.xml
> webservices/axis2/trunk/java/modules/samples/userguide/conf/axis2.xml
> webservices/axis2/trunk/java/modules/samples/yahoojsonsearch/resources/axis2.xml
>
>Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -15,32 +15,15 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </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/codegen/test-resources/xmls/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -30,28 +30,16 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </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/fastinfoset/test-resources/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -279,28 +279,15 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
>
> <handler name="HTTPLocationBasedDispatcher"
>- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -321,38 +308,21 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
>
> <handler name="HTTPLocationBasedDispatcher"
>- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/integration/conf/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/integration/conf/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -206,22 +206,11 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>+ class="org.apache.axis2.engine.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.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -240,32 +229,18 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.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="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml Wed Apr 25 13:08:36 2007
>@@ -100,10 +100,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -144,10 +140,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml Wed Apr 25 13:08:36 2007
>@@ -102,10 +102,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -146,10 +142,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -82,10 +82,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -124,10 +120,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -97,10 +97,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -141,10 +137,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -99,10 +99,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -143,10 +139,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -99,10 +99,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -143,10 +139,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -101,10 +101,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -145,10 +141,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -126,10 +126,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -169,10 +165,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -94,10 +94,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -137,10 +133,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -76,10 +76,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -119,10 +115,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- System pre defined phases -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -150,10 +150,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -193,10 +189,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -146,10 +146,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -189,10 +185,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -89,10 +89,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -128,10 +128,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -170,10 +166,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -128,10 +128,6 @@
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -170,10 +166,6 @@
> <handler name="SOAPMessageBodyBasedDispatcher"
> class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>Modified: webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -107,34 +107,20 @@
> <!-- System pre defined phases -->
> <phase name="Transport">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="RequestURIBasedOperationDispatcher"
>- class="org.apache.axis2.dispatchers.RequestURIBasedOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.dispatchers.RequestURIBasedOperationDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> </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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -152,28 +138,16 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -265,22 +265,12 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.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.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -301,32 +291,18 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.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="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -284,38 +284,21 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
>
> <handler name="HTTPLocationBasedDispatcher"
>- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
> </phase>
> <!-- System predefined phases -->
> <!-- After Postdispatch phase module author or service author can add any phase he want -->
>@@ -336,38 +319,21 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
>
> <handler name="HTTPLocationBasedDispatcher"
>- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>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=532467&r1=532466&r2=532467
>==============================================================================
>--- 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 Wed Apr 25 13:08:36 2007
>@@ -181,11 +181,6 @@
> class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
> <order phase="Dispatch"/>
> </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -230,11 +225,6 @@
> <handler name="HTTPLocationBasedDispatcher"
> class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
> <order phase="Dispatch"/>
>- </handler>
>-
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
> </handler>
> </phase>
> <!-- user can add his own phases to this area -->
>
>Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
>+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java Wed Apr 25 13:08:36 2007
>@@ -17,168 +17,30 @@
>
> package org.apache.axis2.engine;
>
>-import org.apache.axiom.om.OMElement;
>-import org.apache.axiom.soap.SOAPHeader;
> import org.apache.axis2.AxisFault;
>-import org.apache.axis2.Constants;
>-import org.apache.axis2.context.ContextFactory;
> import org.apache.axis2.context.MessageContext;
>-import org.apache.axis2.context.OperationContext;
>-import org.apache.axis2.context.ServiceContext;
>-import org.apache.axis2.context.ServiceGroupContext;
>-import org.apache.axis2.context.SessionContext;
>-import org.apache.axis2.description.AxisOperation;
>-import org.apache.axis2.description.AxisService;
>-import org.apache.axis2.description.AxisServiceGroup;
> import org.apache.axis2.handlers.AbstractHandler;
>-import org.apache.axis2.i18n.Messages;
>-import org.apache.axis2.transport.TransportListener;
>-import org.apache.axis2.transport.http.HTTPConstants;
>-
>-import javax.xml.namespace.QName;
>
> /**
> * By the time the control comes to this handler, the dispatching must have happened
> * so that the message context contains the AxisServiceGroup, AxisService and
> * AxisOperation.
> * This will then try to find the Contexts of ServiceGroup, Service and the Operation.
>+ * @deprecate The functionality of this class has moved into the DispatchPhase postconditions
> */
> public class InstanceDispatcher extends AbstractHandler {
>- private static final QName SERVICE_GROUP_QNAME = new QName(Constants.AXIS2_NAMESPACE_URI,
>- Constants.SERVICE_GROUP_ID,
>- Constants.AXIS2_NAMESPACE_PREFIX);
>
> /**
>- * Post Condition : All the Contexts must be populated.
>+ * This doesn't do anything, as the functionality is now in DispatchPhase.checkPostConditions()
>+ * The class remains for backwards compatibility of axis2.xml files, but it should go away after
>+ * 1.3.
> *
>- * @param msgContext MessageContext
>- * @throws org.apache.axis2.AxisFault
>+ * @param msgContext the <code>MessageContext</code> to process with this <code>Handler</code>.
>+ * @return An InvocationResponse that indicates what the next step in the message processing
>+ * should be.
>+ * @throws org.apache.axis2.AxisFault if the handler encounters an error
> */
> public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
>- AxisService service = msgContext.getAxisService();
>- String scope = service == null ? null : service.getScope();
>- ServiceContext serviceContext = msgContext.getServiceContext();
>-
>- if ((msgContext.getOperationContext() != null)
>- && (serviceContext != null)) {
>- msgContext.setServiceGroupContextId(
>- ((ServiceGroupContext) serviceContext.getParent()).getId());
>-
>- return InvocationResponse.CONTINUE;
>- }
>- if (Constants.SCOPE_TRANSPORT_SESSION.equals(scope)) {
>- fillContextsFromSessionContext(msgContext);
>- } else if (Constants.SCOPE_SOAP_SESSION.equals(scope)) {
>- extractServiceGroupContextId(msgContext);
>- }
>-
>- AxisOperation axisOperation = msgContext.getAxisOperation();
>- // 1. look up opCtxt using mc.addressingHeaders.relatesTo[0]
>- if (axisOperation == null) {
>- return InvocationResponse.CONTINUE;
>- }
>- OperationContext operationContext =
>- axisOperation.findForExistingOperationContext(msgContext);
>-
>- if (operationContext != null) {
>- // register operation context and message context
>-// axisOperation.registerOperationContext(msgContext, operationContext);
>- axisOperation.registerMessageContext(msgContext, operationContext);
>-
>- serviceContext = (ServiceContext) operationContext.getParent();
>- ServiceGroupContext serviceGroupContext =
>- (ServiceGroupContext) serviceContext.getParent();
>-
>- msgContext.setServiceContext(serviceContext);
>- msgContext.setServiceGroupContext(serviceGroupContext);
>- msgContext.setServiceGroupContextId(serviceGroupContext.getId());
>- } else { // 2. if null, create new opCtxt
>- operationContext = ContextFactory.createOperationContext(axisOperation, serviceContext);
>-
>- axisOperation.registerMessageContext(msgContext, operationContext);
>- if (serviceContext != null) {
>- // no need to added to configuration conetxt , since we are happy in
>- // storing in session context
>- operationContext.setParent(serviceContext);
>- } else {
>- // fill the service group context and service context info
>- msgContext.getConfigurationContext().fillServiceContextAndServiceGroupContext(
>- msgContext);
>- }
>- }
>- serviceContext = msgContext.getServiceContext();
>- if (serviceContext != null) {
>- serviceContext.setMyEPR(msgContext.getTo());
>- }
> return InvocationResponse.CONTINUE;
>- }
>-
>- private void fillContextsFromSessionContext(MessageContext msgContext) throws AxisFault {
>- AxisService service = msgContext.getAxisService();
>- if (service == null) {
>- throw new AxisFault(Messages.getMessage("unabletofindservice"));
>- }
>- SessionContext sessionContext = msgContext.getSessionContext();
>- if (sessionContext == null) {
>- TransportListener listener = msgContext.getTransportIn().getReceiver();
>- sessionContext = listener.getSessionContext(msgContext);
>- if (sessionContext == null) {
>- createAndFillContexts(service, msgContext, sessionContext);
>- return;
>- }
>- }
>- String serviceGroupName = msgContext.getAxisServiceGroup().getServiceGroupName();
>- ServiceGroupContext serviceGroupContext = sessionContext.getServiceGroupContext(
>- serviceGroupName);
>- if (serviceGroupContext != null) {
>- //setting service group context
>- msgContext.setServiceGroupContext(serviceGroupContext);
>- // setting Service conetxt
>- msgContext.setServiceContext(
>- ContextFactory.createServiceContext(serviceGroupContext, service));
>- } else {
>- createAndFillContexts(service, msgContext, sessionContext);
>- }
>- ServiceContext serviceContext = sessionContext.getServiceContext(service);
>- //found the serviceContext from session context , so adding that into msgContext
>- if (serviceContext != null) {
>- msgContext.setServiceContext(serviceContext);
>- serviceContext.setProperty(HTTPConstants.COOKIE_STRING, sessionContext.getCookieID());
>- }
>- }
>-
>- private void createAndFillContexts(AxisService service,
>- MessageContext msgContext,
>- SessionContext sessionContext) throws AxisFault {
>- ServiceGroupContext serviceGroupContext;
>- AxisServiceGroup axisServiceGroup = (AxisServiceGroup) service.getParent();
>- serviceGroupContext = ContextFactory.createServiceGroupContext(
>- msgContext.getConfigurationContext(), axisServiceGroup);
>-
>- msgContext.setServiceGroupContext(serviceGroupContext);
>- ServiceContext serviceContext =
>- ContextFactory.createServiceContext(serviceGroupContext, service);
>- msgContext.setServiceContext(serviceContext);
>- if (sessionContext != null) {
>- sessionContext.addServiceContext(serviceContext);
>- sessionContext.addServiceGroupContext(serviceGroupContext);
>- }
>- }
>-
>- private void extractServiceGroupContextId(MessageContext msgContext) throws AxisFault {
>- SOAPHeader soapHeader = msgContext.getEnvelope().getHeader();
>- if (soapHeader != null) {
>- OMElement serviceGroupId = soapHeader.getFirstChildWithName(SERVICE_GROUP_QNAME);
>- if (serviceGroupId != null) {
>- String groupId = serviceGroupId.getText();
>- ServiceGroupContext serviceGroupContext = msgContext.getConfigurationContext().
>- getServiceGroupContextFromSoapSessionTable(groupId, msgContext);
>- if (serviceGroupContext == null) {
>- throw new AxisFault(Messages.getMessage(
>- "invalidservicegrouoid", groupId));
>- }
>- msgContext.setServiceGroupContextId(serviceGroupId.getText());
>- }
>- }
> }
> }
>
>Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -47,30 +47,18 @@
> <!-- System pre defined phases -->
> <phase name="Transport">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> </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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -88,28 +76,16 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -72,30 +72,18 @@
> <!-- System pre defined phases -->
> <phase name="Transport">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> </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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -113,28 +101,16 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -12,30 +12,18 @@
> <!-- System pre defined phases -->
> <phase name="Transport">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> </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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -53,28 +41,16 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -12,30 +12,18 @@
> <!-- System pre defined phases -->
> <phase name="Transport">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
> </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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -53,28 +41,16 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
>
> <handler name="SOAPMessageBodyBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>- <handler name="InstanceDispatcher"
>- class="org.apache.axis2.engine.InstanceDispatcher">
>- <order phase="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml
>URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml?view=diff&rev=532467&r1=532466&r2=532467
>==============================================================================
>--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml (original)
>+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml Wed Apr 25 13:08:36 2007
>@@ -102,18 +102,18 @@
> class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
> <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
> class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
>- </messageReceivers>
>-
>- <!-- ================================================= -->
>- <!-- Message Builders -->
>- <!-- ================================================= -->
>- <!--Following content type to builder mapping can be used to implement support for different message -->
>- <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
>- <messageBuilders>
>- <messageBuilder contentType="text/xml"
>- class="org.apache.axiom.om.impl.builder.StAXOMBuilder"/>
>- <messageBuilder contentType="application/soap+xml"
>- class="org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder"/>
>+ </messageReceivers>
>+
>+ <!-- ================================================= -->
>+ <!-- Message Builders -->
>+ <!-- ================================================= -->
>+ <!--Following content type to builder mapping can be used to implement support for different message -->
>+ <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
>+ <messageBuilders>
>+ <messageBuilder contentType="text/xml"
>+ class="org.apache.axiom.om.impl.builder.StAXOMBuilder"/>
>+ <messageBuilder contentType="application/soap+xml"
>+ class="org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder"/>
> </messageBuilders>
> <!-- ================================================= -->
> <!-- Transport Ins -->
>@@ -246,22 +246,12 @@
> <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>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.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.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- System pre defined phases -->
> <!-- After Postdispatch phase module author or or service author can add any phase he want -->
>@@ -282,32 +272,18 @@
> <phase name="PreDispatch"/>
> <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
> <handler name="RequestURIBasedDispatcher"
>- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
>
> <handler name="SOAPActionBasedDispatcher"
>- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
>
> <handler name="AddressingBasedDispatcher"
>- class="org.apache.axis2.engine.AddressingBasedDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
> <handler name="RequestURIOperationDispatcher"
>- class="org.apache.axis2.engine.RequestURIOperationDispatcher">
>- <order phase="Dispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.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="PostDispatch"/>
>- </handler>
>+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
> </phase>
> <!-- user can add his own phases to this area -->
> <phase name="OperationInFaultPhase"/>
>
>
>
>---------------------------------------------------------------------
>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-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org