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/04/19 04:40:40 UTC
svn commit: r161827 - in webservices/axis/trunk/java/modules/core:
samples/deployment/module1/META-INF/ samples/deployment/module2/META-INF/
samples/deployment/service1/META-INF/ samples/deployment/service2/META-INF/
src/org/apache/axis/deployment/ test-resources/deployment/
Author: deepal
Date: Mon Apr 18 19:40:39 2005
New Revision: 161827
URL: http://svn.apache.org/viewcvs?view=rev&rev=161827
Log:
fixed bugs (build faild errors)
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/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
webservices/axis/trunk/java/modules/core/test-resources/deployment/server-transport.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?view=diff&r1=161826&r2=161827
==============================================================================
--- 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 Mon Apr 18 19:40:39 2005
@@ -12,8 +12,13 @@
</handler>
</outflow>
- <faultflow>
+ <Outfaultflow>
<handler name="h4" class="org.apache.axis.registry.Handler3">
</handler>
- </faultflow>
+ </Outfaultflow>
+
+ <INfaultflow>
+ <handler name="h5" class="org.apache.axis.registry.Handler3">
+ </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?view=diff&r1=161826&r2=161827
==============================================================================
--- 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 Mon Apr 18 19:40:39 2005
@@ -12,12 +12,14 @@
</handler>
</outflow>
- <faultflow>
+ <Outfaultflow>
<handler name="h4" class="org.apache.axis.registry.Handler4">
</handler>
+ </Outfaultflow>
+ <INfaultflow>
<handler name="h5" class="org.apache.axis.registry.Handler4">
- <order phase="global"/>
</handler>
- </faultflow>
+ </INfaultflow>
+
</module>
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?view=diff&r1=161826&r2=161827
==============================================================================
--- 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 Mon Apr 18 19:40:39 2005
@@ -1,4 +1,4 @@
-<service messageReceiver="org.apache.axis.receivers.InOutSyncReceiver" style="rpc" contextPath="services">
+<service messageReceiver="org.apache.axis.receivers.RawXMLINOutMessageRecevier" style="rpc" contextPath="services">
<parameter name="ServiceClass" locked="xsd:false">org.apache.axis.sample.echo.EchoImpl</parameter>
@@ -9,10 +9,13 @@
</inflow>
<outflow/>
- <faultflow>
+ <INfaultflow>
<handler name="logging2" class="org.apache.axis.sample.handlers.LoggingHandler"/>
- </faultflow>
-
+ </INfaultflow>
+ <Outfaultflow>
+ <handler name="logging2" class="org.apache.axis.sample.handlers.LoggingHandler"/>
+ </Outfaultflow>
+
<operation name="echoString"/>
<operation name="echoStringArray"/>
<operation name="echoEchoStruct"/>
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?view=diff&r1=161826&r2=161827
==============================================================================
--- 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 Mon Apr 18 19:40:39 2005
@@ -1,5 +1,4 @@
-<service provider="org.apache.axis.providers.RawXMLProvider" style="rpc" contextPath="services">
- <java:implementation class="Echo2" xmlns:java="http://ws.apache.org/axis2/deployment/java"/>
+<service messageReceiver="org.apache.axis.receivers.RawXMLINOutMessageRecevier" style="rpc" contextPath="services">
<!-- these are Service Parameters -->
<parameter name="para1" locked="xsd:true">10</parameter>
@@ -29,7 +28,7 @@
</handler>
</outflow>
- <faultflow>
+ <INfaultflow>
<handler name="h4" class="Handler2">
</handler>
@@ -40,6 +39,18 @@
<handler name="h6" class="Handler2">
<order phase="service" phaseLast="false"/>
</handler>
- </faultflow>
+ </INfaultflow>
+ <Outfaultflow>
+ <handler name="h4" class="Handler2">
+ </handler>
+
+ <handler name="h5" class="Handler2">
+ <order phase="service"/>
+ </handler>
+
+ <handler name="h6" class="Handler2">
+ <order phase="service" phaseLast="false"/>
+ </handler>
+ </Outfaultflow>
<operation name="opname"/>
</service>
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?view=diff&r1=161826&r2=161827
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java Mon Apr 18 19:40:39 2005
@@ -110,7 +110,6 @@
public DeploymentEngine(String RepositaryName) throws DeploymentException {
this(RepositaryName, "server.xml");
-
}
/**
@@ -212,7 +211,7 @@
} catch (PhaseException e) {
log.info("Module validation failed" + e.getMessage());
}
- return new EngineContext(engineconfig);
+ return engineContext;
}
/**
@@ -283,6 +282,7 @@
ServiceContext serviceContext = getRunnableService(serviceMetaData);
engineContext.addService(serviceContext);
engineconfig.addService(serviceMetaData);
+ System.out.println("adding new service" + serviceMetaData.getName().getLocalPart());
/*Parameter para = serviceMetaData.getParameter("OUTSERVICE");
if (para != null) {
String value = (String) para.getValue();
@@ -396,8 +396,11 @@
Flow outFlow = moduelmetada.getOutFlow();
addFlowHandlers(outFlow);
- Flow faultFlow = moduelmetada.getFaultInFlow();
- addFlowHandlers(faultFlow);
+ Flow faultInFlow = moduelmetada.getFaultInFlow();
+ addFlowHandlers(faultInFlow);
+
+ Flow faultOutFlow = moduelmetada.getFaultOutFlow();
+ addFlowHandlers(faultOutFlow);
engineconfig.addMdoule(moduelmetada);
}
@@ -428,7 +431,6 @@
switch (type) {
case SERVICE:
try {
-
AxisService service = new AxisService();
unZipJAR.unzipService(currentFileItem.getAbsolutePath(), this, service);
addnewService(service);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java?view=diff&r1=161826&r2=161827
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java Mon Apr 18 19:40:39 2005
@@ -113,7 +113,9 @@
break;
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String ST = pullparser.getLocalName(); //Staring tag name
- if (PARAMETERST.equals(ST)) {
+ if(SERVERST.equals(ST)){
+ //todo complete this to fill the names
+ }else if (PARAMETERST.equals(ST)) {
Parameter parameter = processParameter();
serverMetaData.addParameter(parameter);
} else if (TRANSPORTSENDER.equals(ST)) {
@@ -162,6 +164,12 @@
} else {
throw new UnsupportedOperationException(ST + " element is not allowed in the server.xml");
}
+ } else if (eventType == XMLStreamConstants.END_ELEMENT) {
+ String endtagname = pullparser.getLocalName();
+ if (SERVERST.equals(endtagname)) {
+ END_DOCUMENT = true;
+ break;
+ }
}
}
} catch (XMLStreamException e) {
@@ -214,7 +222,7 @@
} else if (transportin != null && OUTFLOWST.equals(tagnae)) {
throw new DeploymentException("OUTFlow dose not support in AxisTransportIN " + tagnae);
} else if (transportin != null && IN_FAILTFLOW.equals(tagnae)) {
- Flow faultFlow = processFaultFlow();
+ Flow faultFlow = processInFaultFlow();
transportin.setFaultFlow(faultFlow);
} else {
throw new DeploymentException("Unknown element " + tagnae);
@@ -230,7 +238,7 @@
} catch (XMLStreamException e) {
throw new DeploymentException("parser Exception", e);
} catch (Exception e) {
- throw new DeploymentException("Unknown process Exception", e);
+ throw new DeploymentException(e.getMessage());
}
return transportin;
}
@@ -276,8 +284,8 @@
} else if (transportout != null && OUTFLOWST.equals(tagnae)) {
Flow outFlow = processOutFlow();
transportout.setOutFlow(outFlow);
- } else if (transportout != null && IN_FAILTFLOW.equals(tagnae)) {
- Flow faultFlow = processFaultFlow();
+ } else if (transportout != null && OUT_FAILTFLOW.equals(tagnae)) {
+ Flow faultFlow = processOutFaultFlow();
transportout.setFaultFlow(faultFlow);
} else {
throw new DeploymentException("Unknown element " + tagnae);
@@ -293,7 +301,7 @@
} catch (XMLStreamException e) {
throw new DeploymentException("parser Exception", e);
} catch (Exception e) {
- throw new DeploymentException("Unknown process Exception", e);
+ throw new DeploymentException( e.getMessage());
}
return transportout;
}
@@ -362,8 +370,11 @@
Flow outFlow = processOutFlow();
axisService.setOutFlow(outFlow);
} else if (IN_FAILTFLOW.equals(ST)) {
- Flow faultFlow = processFaultFlow();
+ Flow faultFlow = processInFaultFlow();
axisService.setFaultInFlow(faultFlow);
+ }else if (OUT_FAILTFLOW.equals(ST)) {
+ Flow faultFlow = processOutFaultFlow();
+ axisService.setFaultOutFlow(faultFlow);
} else if (MODULEST.equals(ST)) {
attribCount = pullparser.getAttributeCount();
if (attribCount > 0) {
@@ -438,7 +449,7 @@
} catch (XMLStreamException e) {
throw new DeploymentException("parser Exception", e);
} catch (Exception e) {
- throw new DeploymentException("Unknown process Exception", e);
+ throw new DeploymentException(e.getMessage());
}
// adding element to the parameter
parameter.setValue(element);
@@ -539,7 +550,7 @@
} catch (XMLStreamException e) {
throw new DeploymentException("parser Exception", e);
} catch (Exception e) {
- throw new DeploymentException("Unknown process Exception", e);
+ throw new DeploymentException(e.getMessage());
}
// adding element to the parameter
return handler;
@@ -575,7 +586,7 @@
} catch (XMLStreamException e) {
throw new DeploymentException("parser Exception", e);
} catch (Exception e) {
- throw new DeploymentException("Unknown process Exception", e);
+ throw new DeploymentException(e.getMessage());
}
}
@@ -714,8 +725,11 @@
Parameter parameter = processParameter();
module.addParameter(parameter);
} else if (IN_FAILTFLOW.equals(ST)) {
- Flow faultFlow = processFaultFlow();
+ Flow faultFlow = processInFaultFlow();
module.setFaultInFlow(faultFlow);
+ }else if (OUT_FAILTFLOW.equals(ST)) {
+ Flow faultFlow = processOutFaultFlow();
+ module.setFaultOutFlow(faultFlow);
} else if (INFLOWST.equals(ST)) {
Flow inFlow = processInFlow();
module.setInFlow(inFlow);
@@ -738,7 +752,7 @@
} catch (XMLStreamException e) {
throw new DeploymentException("parser Exception", e);
} catch (Exception e) {
- throw new DeploymentException("Unknown process Exception", e);
+ throw new DeploymentException(e.getMessage());
}
}
@@ -773,7 +787,7 @@
} catch (XMLStreamException e) {
throw new DeploymentException("parser Exception", e);
} catch (Exception e) {
- throw new DeploymentException("Unknown process Exception", e);
+ throw new DeploymentException(e.getMessage());
}
return inFlow;
}
@@ -808,14 +822,14 @@
} catch (XMLStreamException e) {
throw new DeploymentException("parser Exception", e);
} catch (Exception e) {
- throw new DeploymentException("Unknown process Exception", e);
+ throw new DeploymentException(e.getMessage());
}
return outFlow;
}
- public Flow processFaultFlow() throws DeploymentException {
+ public Flow processInFaultFlow() throws DeploymentException {
Flow faultFlow = new FlowImpl();
boolean END_FAULTFLOW = false;
try {
@@ -844,7 +858,41 @@
} catch (XMLStreamException e) {
throw new DeploymentException("parser Exception", e);
} catch (Exception e) {
- throw new DeploymentException("Unknown process Exception", e);
+ throw new DeploymentException(e.getMessage());
+ }
+ return faultFlow;
+ }
+
+ public Flow processOutFaultFlow() throws DeploymentException {
+ Flow faultFlow = new FlowImpl();
+ boolean END_FAULTFLOW = false;
+ try {
+ while (!END_FAULTFLOW) {
+ int eventType = pullparser.next();
+ if (eventType == XMLStreamConstants.END_DOCUMENT) {
+// document end tag met , break the loop
+// but the doc end tag wont meet here :)
+ END_FAULTFLOW = true;
+ } else if (eventType == XMLStreamConstants.START_ELEMENT) {
+ String tagnae = pullparser.getLocalName();
+ if (HANDERST.equals(tagnae)) {
+ HandlerMetadata handler = processHandler();
+ faultFlow.addHandler(handler);
+ } else {
+ throw new DeploymentException("parser Exception : un supported element" + tagnae);
+ }
+ } else if (eventType == XMLStreamConstants.END_ELEMENT) {
+ String endtagname = pullparser.getLocalName();
+ if (OUT_FAILTFLOW.equals(endtagname)) {
+ END_FAULTFLOW = true;
+ break;
+ }
+ }
+ }
+ } catch (XMLStreamException e) {
+ throw new DeploymentException("parser Exception", e);
+ } catch (Exception e) {
+ throw new DeploymentException(e.getMessage());
}
return faultFlow;
}
@@ -880,7 +928,7 @@
} catch (XMLStreamException e) {
throw new DeploymentException("parser Exception", e);
} catch (Exception e) {
- throw new DeploymentException("Unknown process Exception", e);
+ throw new DeploymentException(e.getMessage());
}
return pahseList;
}
Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/server-transport.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/server-transport.xml?view=diff&r1=161826&r2=161827
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/server-transport.xml (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/server-transport.xml Mon Apr 18 19:40:39 2005
@@ -13,10 +13,10 @@
<handler name="h1" class="org.apache.axis.deployment.SpeakingHandler"/>
<handler name="h2" class="org.apache.axis.deployment.SpeakingHandler"/>
</outflow>
- <faultflow>
+ <Outfaultflow>
<handler name="h1" class="org.apache.axis.deployment.SpeakingHandler"/>
<handler name="h2" class="org.apache.axis.deployment.SpeakingHandler"/>
- </faultflow>
+ </Outfaultflow>
</transportSender>
<phaseOrder type="inflow">
@@ -31,7 +31,13 @@
<phase name="Logging"/>
<phase name="service"/>
</phaseOrder>
- <phaseOrder type="faultflow">
+ <phaseOrder type="Outfaultflow">
+ <phase name="global"/>
+ <phase name="transport"/>
+ <phase name="Logging"/>
+ <phase name="service"/>
+ </phaseOrder>
+ <phaseOrder type="INfaultflow">
<phase name="global"/>
<phase name="transport"/>
<phase name="Logging"/>
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?view=diff&r1=161826&r2=161827
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml Mon Apr 18 19:40:39 2005
@@ -5,7 +5,7 @@
<parameter name="hotdeployment" locked="xsd:false">true</parameter>
<parameter name="hotupdate" locked="xsd:false">true</parameter>
- <module ref="module1"> </module>
+ <module ref="module1"/>
<transportReceiver name="http">
<inflow>
<handler name="h1" class="org.apache.axis.deployment.SpeakingHandler"/>
@@ -37,7 +37,13 @@
<phase name="Logging"/>
<phase name="service"/>
</phaseOrder>
- <phaseOrder type="faultflow">
+ <phaseOrder type="INfaultflow">
+ <phase name="global"/>
+ <phase name="transport"/>
+ <phase name="Logging"/>
+ <phase name="service"/>
+ </phaseOrder>
+ <phaseOrder type="Outfaultflow">
<phase name="global"/>
<phase name="transport"/>
<phase name="Logging"/>