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 de...@apache.org on 2005/02/17 07:20:42 UTC
svn commit: r154132 - in
webservices/axis/trunk/java/dev/scratch/prototype2/src:
java/org/apache/axis/deployment/ samples/deployment/module1/META-INF/
samples/deployment/module2/META-INF/ samples/deployment/service1/META-INF/
samples/deployment/service2/META-INF/ test-resources/deployment/
Author: deepal
Date: Wed Feb 16 22:20:40 2005
New Revision: 154132
URL: http://svn.apache.org/viewcvs?view=rev&rev=154132
Log:
Refactoring and removed unnecessary tags
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/server.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/META-INF/module.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/META-INF/module.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/META-INF/service.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/META-INF/service.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadServer.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/server-transport.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/server.xml
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/server.xml?view=diff&r1=154131&r2=154132
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/server.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/server.xml Wed Feb 16 22:20:40 2005
@@ -9,9 +9,7 @@
<phase name="global"/>
<phase name="transport"/>
<phase name="Logging"/>
- <phase name="p1"/>
- <phase name="p3"/>
- <phase name="anyhase"/>
+ <phase name="module"/>
<phase name="service"/>
</phaseOrder>
</server>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/META-INF/module.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/META-INF/module.xml?view=diff&r1=154131&r2=154132
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/META-INF/module.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/META-INF/module.xml Wed Feb 16 22:20:40 2005
@@ -1,44 +1,19 @@
<module name="module1" class="module1.java">
- <parameter name="para123" locked="xsd:true">10</parameter>
- <parameter name="para245" locked="xsd:false">Colombo</parameter>
- <!-- Module TypeMapping -->
-
<inflow>
<handler name="h1" class="org.apache.axis.registry.Handler3">
- <order phase="p1" phaseFirst="true"/>
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
- <parameter name="para10" locked="xsd:true">789</parameter>
+ <order phase="module" phaseFirst="true"/>
</handler>
<handler name="h2" class="org.apache.axis.registry.Handler3"/>
</inflow>
<outflow>
<handler name="h3" class="org.apache.axis.registry.Handler3">
- <order phase="p2"/>
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
+ <order phase="module"/>
</handler>
</outflow>
<faultflow>
<handler name="h4" class="org.apache.axis.registry.Handler3">
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
- <parameter name="para10" locked="xsd:true">789</parameter>
- </handler>
-
- <handler name="h5" class="org.apache.axis.registry.Handler3">
- <order phase="p1"/>
- </handler>
-
- <handler name="h6" class="org.apache.axis.registry.Handler3">
- <order phase="anyhase" phaseFirst="true" phaseLast="false"/>
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
- <parameter name="para10" locked="xsd:true">789</parameter>
</handler>
</faultflow>
-
-
</module>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/META-INF/module.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/META-INF/module.xml?view=diff&r1=154131&r2=154132
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/META-INF/module.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/META-INF/module.xml Wed Feb 16 22:20:40 2005
@@ -1,43 +1,23 @@
<module name="module2" class="module1.java">
- <parameter name="para123" locked="xsd:true">10</parameter>
- <parameter name="para245" locked="xsd:false">Colombo</parameter>
- <!-- Module TypeMapping -->
<inflow>
<handler name="h1" class="org.apache.axis.registry.Handler4">
- <order phase="p1" phaseFirst="true"/>
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
- <parameter name="para10" locked="xsd:true">789</parameter>
+ <order phase="module" phaseFirst="true"/>
</handler>
<handler name="h2" class="org.apache.axis.registry.Handler4"/>
</inflow>
<outflow>
<handler name="h3" class="org.apache.axis.registry.Handler4">
- <order phase="p2"/>
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
+ <order phase="module"/>
</handler>
</outflow>
<faultflow>
<handler name="h4" class="org.apache.axis.registry.Handler4">
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
- <parameter name="para10" locked="xsd:true">789</parameter>
</handler>
<handler name="h5" class="org.apache.axis.registry.Handler4">
- <order phase="p1"/>
- </handler>
-
- <handler name="h6" class="org.apache.axis.registry.Handler4">
- <order phase="anyhase" phaseFirst="true" phaseLast="false"/>
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
- <parameter name="para10" locked="xsd:true">789</parameter>
+ <order phase="module"/>
</handler>
</faultflow>
-
-
</module>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/META-INF/service.xml?view=diff&r1=154131&r2=154132
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/META-INF/service.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/META-INF/service.xml Wed Feb 16 22:20:40 2005
@@ -3,7 +3,7 @@
<inflow>
<handler name="logging" class="org.apache.axis.sample.handlers.LoggingHandler">
- <order phase="p1" phaseFirst="true"/>
+ <order phase="Logging" phaseFirst="true"/>
</handler>
</inflow>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/META-INF/service.xml?view=diff&r1=154131&r2=154132
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/META-INF/service.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/META-INF/service.xml Wed Feb 16 22:20:40 2005
@@ -18,42 +18,29 @@
<inflow>
<handler name="h1" class="Handler2">
- <order phase="p1" phaseFirst="true"/>
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
- <parameter name="para10" locked="xsd:true">789</parameter>
+ <order phase="service" phaseFirst="true"/>
</handler>
<handler name="h2" class="Handler2"/>
</inflow>
<outflow>
<handler name="h3" class="Handler2">
- <order phase="p2"/>
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
+ <order phase="service"/>
</handler>
</outflow>
<faultflow>
<handler name="h4" class="Handler2">
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
- <parameter name="para10" locked="xsd:true">789</parameter>
</handler>
<handler name="h5" class="Handler2">
- <order phase="p1"/>
+ <order phase="service"/>
</handler>
<handler name="h6" class="Handler2">
- <order phase="anyhase" phaseFirst="true" phaseLast="false"/>
- <parameter name="para8" locked="xsd:true">123</parameter>
- <parameter name="para9" locked="xsd:true">456</parameter>
- <parameter name="para10" locked="xsd:true">789</parameter>
+ <order phase="service" phaseFirst="true" phaseLast="false"/>
</handler>
</faultflow>
-
-
<operation name="opname" qname="opqname" style="anyStyle" use="anyUse">
</operation>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadServer.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadServer.xml?view=diff&r1=154131&r2=154132
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadServer.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadServer.xml Wed Feb 16 22:20:40 2005
@@ -18,10 +18,7 @@
<phaseOrder>
<phase name="global"/>
<phase name="transport"/>
- <phase name="p2"/>
- <phase name="p1"/>
- <phase name="p3"/>
- <phase name="anyhase"/>
+ <phase name="module"/>
<phase name="service"/>
</phaseOrder>
<gool>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/server-transport.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/server-transport.xml?view=diff&r1=154131&r2=154132
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/server-transport.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/server-transport.xml Wed Feb 16 22:20:40 2005
@@ -19,10 +19,7 @@
<phaseOrder>
<phase name="global"/>
<phase name="transport"/>
- <phase name="p2"/>
- <phase name="p1"/>
- <phase name="p3"/>
- <phase name="anyhase"/>
+ <phase name="module"/>
<phase name="service"/>
</phaseOrder>
</server>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/server.xml?view=diff&r1=154131&r2=154132
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/server.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/server.xml Wed Feb 16 22:20:40 2005
@@ -19,10 +19,8 @@
<phaseOrder>
<phase name="global"/>
<phase name="transport"/>
- <phase name="p2"/>
- <phase name="p1"/>
- <phase name="p3"/>
- <phase name="anyhase"/>
+ <phase name="Logging"/>
+ <phase name="module"/>
<phase name="service"/>
</phaseOrder>
</server>