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/05/14 06:45:12 UTC
svn commit: r170120 - in /webservices/axis/trunk/java/modules/core:
samples/deployment/ samples/deployment/module1/META-INF/
samples/deployment/service1/META-INF/
samples/deployment/service1/org/apache/axis/sample/echo/
samples/deployment/service2/ samples/deployment/service2/META-INF/
src/org/apache/axis/deployment/ test-resources/deployment/
Author: deepal
Date: Fri May 13 21:45:11 2005
New Revision: 170120
URL: http://svn.apache.org/viewcvs?rev=170120&view=rev
Log:
depolyment changes after refactoring
Removed:
webservices/axis/trunk/java/modules/core/samples/deployment/service1/org/apache/axis/sample/echo/EchoImpl.java
webservices/axis/trunk/java/modules/core/samples/deployment/service1/org/apache/axis/sample/echo/EchoProvider.java
webservices/axis/trunk/java/modules/core/samples/deployment/service1/org/apache/axis/sample/echo/EchoStructEncoder.java
Modified:
webservices/axis/trunk/java/modules/core/samples/deployment/module1/META-INF/module.xml
webservices/axis/trunk/java/modules/core/samples/deployment/server.xml
webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml
webservices/axis/trunk/java/modules/core/samples/deployment/service2/Echo2.java
webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/module1/META-INF/module.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/module1/META-INF/module.xml?rev=170120&r1=170119&r2=170120&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/module1/META-INF/module.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/module1/META-INF/module.xml Fri May 13 21:45:11 2005
@@ -1,28 +1,28 @@
<module name="module1" class="org.apache.module.Module1Impl">
<inflow>
<handler name="h1" class="org.apache.axis.registry.Handler3">
- <order phase="global" />
+ <order phase="userphase1" />
</handler>
<handler name="h2" class="org.apache.axis.registry.Handler3">
- <order phase="service"/>
+ <order phase="userphase1"/>
</handler>
</inflow>
<outflow>
<handler name="h3" class="org.apache.axis.registry.Handler3">
- <order phase="global"/>
+ <order phase="userphase1"/>
</handler>
</outflow>
<Outfaultflow>
<handler name="h4" class="org.apache.axis.registry.Handler3">
- <order phase="service"/>
+ <order phase="userphase1"/>
</handler>
</Outfaultflow>
<INfaultflow>
<handler name="h5" class="org.apache.axis.registry.Handler3">
- <order phase="service"/>
+ <order phase="userphase1"/>
</handler>
</INfaultflow>
</module>
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/server.xml?rev=170120&r1=170119&r2=170120&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/server.xml Fri May 13 21:45:11 2005
@@ -1,30 +1,37 @@
<server name ="AxisJava2.0" >
- <messageReceiver mep="INOUT" class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
- <phaseOrder type="inflow">
+ <parameter name="hotdeployment" locked="xsd:false">true</parameter>
+ <parameter name="hotupdate" locked="xsd:false">true</parameter>
+
+ <messageReceiver mep="INOUT" class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
+
+ <transportReceiver name="http">
+ </transportReceiver>
+ <transportSender name="http" class="org.apache.axis.transport.http.HTTPTransportSender">
+ </transportSender>
+
+ <module ref="addressing"/>
+
+ <phaseOrder type="inflow">
+ <!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
<phase name="Dispatch"/>
<phase name="PostDispatch"/>
- <phase name="PolicyDetermination"/>
- <phase name="MessageProcessing"/>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="outflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="INfaultflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="Outfaultflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
</phaseOrder>
</server>
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml?rev=170120&r1=170119&r2=170120&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml Fri May 13 21:45:11 2005
@@ -3,19 +3,19 @@
<inflow>
<handler name="logging" class="org.apache.axis.sample.handlers.LoggingHandler">
- <order phase="Logging" phaseFirst="true"/>
+ <order phase="userphase1" phaseFirst="true"/>
</handler>
</inflow>
<outflow/>
<INfaultflow>
<handler name="logging2" class="org.apache.axis.sample.handlers.LoggingHandler">
- <order phase="service"/>
+ <order phase="userphase1"/>
</handler>
</INfaultflow>
<Outfaultflow>
<handler name="logging2" class="org.apache.axis.sample.handlers.LoggingHandler">
- <order phase="service"/>
+ <order phase="userphase1"/>
</handler>
</Outfaultflow>
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/service2/Echo2.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/service2/Echo2.java?rev=170120&r1=170119&r2=170120&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/service2/Echo2.java (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/service2/Echo2.java Fri May 13 21:45:11 2005
@@ -1,4 +1,4 @@
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.soap.SOAPEnvelope;
public class Echo2 {
public SOAPEnvelope echo(SOAPEnvelope in){
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml?rev=170120&r1=170119&r2=170120&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml Fri May 13 21:45:11 2005
@@ -13,36 +13,36 @@
<inflow>
<handler name="h1" class="Handler2">
- <order phase="service" phaseFirst="true"/>
+ <order phase="userphase1" phaseFirst="true"/>
</handler>
</inflow>
<outflow>
<handler name="h3" class="Handler2">
- <order phase="service"/>
+ <order phase="userphase1"/>
</handler>
</outflow>
<INfaultflow>
<handler name="h5" class="Handler2">
- <order phase="service"/>
+ <order phase="userphase1"/>
</handler>
<handler name="h6" class="Handler2">
- <order phase="service" phaseLast="false"/>
+ <order phase="userphase1" phaseLast="false"/>
</handler>
</INfaultflow>
<Outfaultflow>
<handler name="h4" class="Handler2">
- <order phase="service"/>
+ <order phase="userphase1"/>
</handler>
<handler name="h5" class="Handler2">
- <order phase="service"/>
+ <order phase="userphase1"/>
</handler>
<handler name="h6" class="Handler2">
- <order phase="service" phaseLast="false"/>
+ <order phase="userphase1" phaseLast="false"/>
</handler>
</Outfaultflow>
<operation name="opname"/>
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml?rev=170120&r1=170119&r2=170120&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml Fri May 13 21:45:11 2005
@@ -12,29 +12,26 @@
<module ref="addressing"/>
<phaseOrder type="inflow">
-
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch"/>
+ <phase name="PostDispatch"/>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="outflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="INfaultflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="Outfaultflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
</phaseOrder>
</server>
Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml?rev=170120&r1=170119&r2=170120&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml Fri May 13 21:45:11 2005
@@ -1,59 +1,37 @@
-<server name="AxisJava2.0">
- <messageReceiver mep="INOUT" class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
+<server name ="AxisJava2.0" >
<parameter name="hotdeployment" locked="xsd:false">true</parameter>
<parameter name="hotupdate" locked="xsd:false">true</parameter>
- <module ref="module1"/>
+ <messageReceiver mep="INOUT" class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
+
<transportReceiver name="http">
- <inflow>
- <handler name="h1" class="org.apache.axis.deployment.SpeakingHandler">
- <order phase="transport"/>
- </handler>
- <handler name="h2" class="org.apache.axis.deployment.SpeakingHandler">
- <order phase="transport"/>
- </handler>
- </inflow>
</transportReceiver>
<transportSender name="http" class="org.apache.axis.transport.http.HTTPTransportSender">
- <outflow>
- <handler name="h1" class="org.apache.axis.deployment.SpeakingHandler">
- <order phase="transport"/>
- </handler>
- <handler name="h2" class="org.apache.axis.deployment.SpeakingHandler">
- <order phase="transport"/>
- </handler>
- </outflow>
</transportSender>
- <!--
- <module ref="uri">
- <parameter name="para3" locked="xsd:true">10</parameter>
- <parameter name="para4" locked="xsd:false">LSF</parameter>
- </module>
- -->
+
+ <module ref="addressing"/>
<phaseOrder type="inflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch"/>
+ <phase name="PostDispatch"/>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="outflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="INfaultflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="Outfaultflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
</phaseOrder>
</server>