You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2005/05/05 07:15:58 UTC
svn commit: r168271 -
/webservices/axis/trunk/java/modules/core/samples/deployment/module1/META-INF
/webservices/axis/trunk/java/modules/core/samples/deployment/module2/META-INF
/webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF
/webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF
/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver
Author: deepal
Date: Wed May 4 22:15:57 2005
New Revision: 168271
URL: http://svn.apache.org/viewcvs?rev=168271&view=rev
Log:
fixing buid fail due to phase resolve problem
Modified:
webservices/axis/trunk/java/modules/core/samples/deployment/module1/META-INF/module.xml
webservices/axis/trunk/java/modules/core/samples/deployment/module2/META-INF/module.xml
webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml
webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
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=168271&r1=168270&r2=168271&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 Wed May 4 22:15:57 2005
@@ -3,7 +3,9 @@
<handler name="h1" class="org.apache.axis.registry.Handler3">
<order phase="global" />
</handler>
- <handler name="h2" class="org.apache.axis.registry.Handler3"/>
+ <handler name="h2" class="org.apache.axis.registry.Handler3">
+ <order phase="service"/>
+ </handler>
</inflow>
<outflow>
@@ -14,11 +16,13 @@
<Outfaultflow>
<handler name="h4" class="org.apache.axis.registry.Handler3">
+ <order phase="service"/>
</handler>
</Outfaultflow>
<INfaultflow>
<handler name="h5" class="org.apache.axis.registry.Handler3">
+ <order phase="service"/>
</handler>
</INfaultflow>
</module>
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/module2/META-INF/module.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/module2/META-INF/module.xml?rev=168271&r1=168270&r2=168271&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/module2/META-INF/module.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/module2/META-INF/module.xml Wed May 4 22:15:57 2005
@@ -3,7 +3,9 @@
<handler name="h1" class="org.apache.axis.registry.Handler4">
<order phase="global" />
</handler>
- <handler name="h2" class="org.apache.axis.registry.Handler4"/>
+ <handler name="h2" class="org.apache.axis.registry.Handler4">
+ <order phase="service"/>
+ </handler>
</inflow>
<outflow>
@@ -14,11 +16,13 @@
<Outfaultflow>
<handler name="h4" class="org.apache.axis.registry.Handler4">
+ <order phase="service"/>
</handler>
</Outfaultflow>
<INfaultflow>
<handler name="h5" class="org.apache.axis.registry.Handler4">
+ <order phase="service"/>
</handler>
</INfaultflow>
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=168271&r1=168270&r2=168271&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 Wed May 4 22:15:57 2005
@@ -9,10 +9,14 @@
<outflow/>
<INfaultflow>
- <handler name="logging2" class="org.apache.axis.sample.handlers.LoggingHandler"/>
+ <handler name="logging2" class="org.apache.axis.sample.handlers.LoggingHandler">
+ <order phase="service"/>
+ </handler>
</INfaultflow>
<Outfaultflow>
- <handler name="logging2" class="org.apache.axis.sample.handlers.LoggingHandler"/>
+ <handler name="logging2" class="org.apache.axis.sample.handlers.LoggingHandler">
+ <order phase="service"/>
+ </handler>
</Outfaultflow>
<operation name="echoString">
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=168271&r1=168270&r2=168271&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 Wed May 4 22:15:57 2005
@@ -41,6 +41,7 @@
</INfaultflow>
<Outfaultflow>
<handler name="h4" class="Handler2">
+ <order phase="service"/>
</handler>
<handler name="h5" class="Handler2">
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java?rev=168271&r1=168270&r2=168271&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java Wed May 4 22:15:57 2005
@@ -121,17 +121,17 @@
PhaseMetadata pm = new PhaseMetadata(name);
inPhases.add(pm);
}
- inPhases.add(0,PhaseMetadata.PRE_DISPATCH);
+ inPhases.add(0,new PhaseMetadata(PhaseMetadata.PRE_DISPATCH));
tempPhases = registry.getOutPhases();
for (int i = 0; i < tempPhases.size(); i++) {
String name = (String) tempPhases.get(i);
PhaseMetadata pm = new PhaseMetadata(name);
outPhases.add(pm);
}
- outPhases.add(PhaseMetadata.PRE_DISPATCH);
+ outPhases.add(new PhaseMetadata(PhaseMetadata.PRE_DISPATCH));
tempPhases = registry.getInFaultPhases();
- faultInPhases.add(0,PhaseMetadata.PRE_DISPATCH);
+ faultInPhases.add(0,new PhaseMetadata(PhaseMetadata.PRE_DISPATCH));
for (int i = 0; i < tempPhases.size(); i++) {
String name = (String) tempPhases.get(i);
PhaseMetadata pm = new PhaseMetadata(name);
@@ -143,7 +143,7 @@
PhaseMetadata pm = new PhaseMetadata(name);
faultOutPhases.add(pm);
}
- faultOutPhases.add(PhaseMetadata.PRE_DISPATCH);
+ faultOutPhases.add(new PhaseMetadata(PhaseMetadata.PRE_DISPATCH));
}
/**
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java?rev=168271&r1=168270&r2=168271&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java Wed May 4 22:15:57 2005
@@ -363,29 +363,28 @@
for (int type = 1; type < 4; type++) {
phaseHolder = new PhaseHolder(engineConfig);
phaseHolder.setFlowType(type);
- List globalModule = (List)((EngineConfigurationImpl)engineConfig).getModules().values();
- int gcount = globalModule.size();
- for (int intA = 0; intA < gcount; intA++) {
- module = (AxisModule) globalModule.get(intA);
+ Collection col = ((EngineConfigurationImpl)engineConfig).getModules().values();
+ for (Iterator iterator = col.iterator(); iterator.hasNext();) {
+ AxisModule axismodule = (AxisModule) iterator.next();
switch (type) {
case PhaseMetadata.IN_FLOW:
{
- flow = module.getInFlow();
+ flow = axismodule.getInFlow();
break;
}
case PhaseMetadata.OUT_FLOW:
{
- flow = module.getOutFlow();
+ flow = axismodule.getOutFlow();
break;
}
case PhaseMetadata.FAULT_IN_FLOW:
{
- flow = module.getFaultInFlow();
+ flow = axismodule.getFaultInFlow();
break;
}
case PhaseMetadata.FAULT_OUT_FLOW:
{
- flow = module.getFaultOutFlow();
+ flow = axismodule.getFaultOutFlow();
break;
}
}