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/17 14:01:53 UTC
svn commit: r170582 - in /webservices/axis/trunk/java/modules:
addressing/src/META-INF/module.xml addressing/src/build.xml
core/src/org/apache/axis/deployment/DeploymentEngine.java
samples/conf/service4withhandler.xml
Author: deepal
Date: Tue May 17 05:01:53 2005
New Revision: 170582
URL: http://svn.apache.org/viewcvs?rev=170582&view=rev
Log:
bug fixing
Modified:
webservices/axis/trunk/java/modules/addressing/src/META-INF/module.xml
webservices/axis/trunk/java/modules/addressing/src/build.xml
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/samples/conf/service4withhandler.xml
Modified: webservices/axis/trunk/java/modules/addressing/src/META-INF/module.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/src/META-INF/module.xml?rev=170582&r1=170581&r2=170582&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/src/META-INF/module.xml (original)
+++ webservices/axis/trunk/java/modules/addressing/src/META-INF/module.xml Tue May 17 05:01:53 2005
@@ -1,12 +1,12 @@
<module name="addressing" class="org.apache.axis.AddressingModule">
<inflow>
- <handler name="AddressingInHandler" class="org.apache.axis.handlers.AddressingInHandler">
+ <handler name="AddressingInHandler" class="org.apache.axis.handlers.addressing.AddressingInHandler">
<order phase="PreDispatch"/>
</handler>
</inflow>
<outflow>
- <handler name="AddressingOutHandler" class="org.apache.axis.handlers.AddressingOutHandler">
+ <handler name="AddressingOutHandler" class="org.apache.axis.handlers.addressing.AddressingOutHandler">
<order phase="addressing"/>
</handler>
</outflow>
Modified: webservices/axis/trunk/java/modules/addressing/src/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/src/build.xml?rev=170582&r1=170581&r2=170582&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/src/build.xml (original)
+++ webservices/axis/trunk/java/modules/addressing/src/build.xml Tue May 17 05:01:53 2005
@@ -6,7 +6,7 @@
<property name="build.lib" location="${build}/lib"/>
<property name="lib" location="lib"/>
<property name="root" location="../../../"/>
- <property name="jar.dir" location="${root}/target/addressing"/>
+ <property name="jar.dir" location="${root}/target/addressing/"/>
<path id="axis.test.classpath">
<path refid="maven.dependency.classpath"></path>
@@ -31,14 +31,14 @@
</copy>
<mkdir dir="${jar.dir}"/>
- <jar jarfile="${jar.dir}/addressing.jar" basedir="${build.classes}" >
+ <jar jarfile="${jar.dir}/addressing.mar" basedir="${build.classes}" >
<include name="**" />
</jar>
<delete dir="${build}"/>
</target>
<target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/addressing.jar">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/addressing.mar">
<srcfiles dir="${src}">
<include name="**/*.java"/>
<include name="**/*.xml"/>
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?rev=170582&r1=170581&r2=170582&view=diff
==============================================================================
--- 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 Tue May 17 05:01:53 2005
@@ -190,7 +190,7 @@
InputStream in = new FileInputStream(tempfile);
axisConfig = createEngineConfig();
DeploymentParser parser = new DeploymentParser(in, this);
- parser.processGlobalConfig(axisGlobal , SERVERST);
+ parser.processGlobalConfig(axisGlobal, SERVERST);
} catch (FileNotFoundException e) {
throw new DeploymentException("Exception at deployment", e);
} catch (XMLStreamException e) {
@@ -230,7 +230,7 @@
try {
axisConfig = createEngineConfig();
DeploymentParser parser = new DeploymentParser(in, this);
- parser.processGlobalConfig(axisGlobal ,CLIENTST);
+ parser.processGlobalConfig(axisGlobal, CLIENTST);
} catch (XMLStreamException e) {
throw new DeploymentException(e.getMessage());
}
@@ -447,18 +447,25 @@
private void addNewModule(ModuleDescription moduelmetada) throws AxisFault {
currentArchiveFile.setClassLoader();
Flow inflow = moduelmetada.getInFlow();
- addFlowHandlers(inflow);
-
+ if (inflow != null) {
+ addFlowHandlers(inflow);
+ }
Flow outFlow = moduelmetada.getOutFlow();
- addFlowHandlers(outFlow);
-
+ if (outFlow != null) {
+ addFlowHandlers(outFlow);
+ }
Flow faultInFlow = moduelmetada.getFaultInFlow();
- addFlowHandlers(faultInFlow);
+ if (faultInFlow != null) {
+ addFlowHandlers(faultInFlow);
+ }
Flow faultOutFlow = moduelmetada.getFaultOutFlow();
- addFlowHandlers(faultOutFlow);
+ if (faultOutFlow != null) {
+ addFlowHandlers(faultOutFlow);
+ }
loadModuleClass(moduelmetada);
axisConfig.addMdoule(moduelmetada);
+ System.out.println("adding new module");
}
Modified: webservices/axis/trunk/java/modules/samples/conf/service4withhandler.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/conf/service4withhandler.xml?rev=170582&r1=170581&r2=170582&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/conf/service4withhandler.xml (original)
+++ webservices/axis/trunk/java/modules/samples/conf/service4withhandler.xml Tue May 17 05:01:53 2005
@@ -1,24 +1,5 @@
<service messageReceiver="org.apache.axis.receivers.RawXMLINOutMessageRecevier" style="rpc" contextPath="services">
<parameter name="ServiceClass" locked="xsd:false">userguide.sample1.EchoXML</parameter>
-
- <inflow>
- <handler name="LoggingHandler" class="userguide.sample1.LoggingHandler">
- <!--Phase Ordering (e.g. phaseFirst="true") will be introdeced from M2-->
- <order phase="Logging"/>
- </handler>
- </inflow>
-
- <outflow>
-
- </outflow>
-
- <INfaultflow>
- <handler name="LoggingHandler" class="userguide.sample1.LoggingHandler">
- <!--Phase Ordering (e.g. phaseFirst="true") will be introdeced from M2-->
- <order phase="Logging"/>
- </handler>
- </INfaultflow>
-
<operation name="echo" qname="echo"/>
</service>