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/12 07:11:48 UTC
svn commit: r169765 - in /webservices/axis/trunk/java/modules:
core/samples/deployment/ core/samples/deployment/module1/org/apache/module/
core/samples/deployment/module2/org/apache/axis/
core/src/org/apache/axis/context/ core/src/org/apache/axis/transport/http/
core/test-resources/deployment/ samples/test/org/apache/axis/integration/
Author: deepal
Date: Wed May 11 22:11:46 2005
New Revision: 169765
URL: http://svn.apache.org/viewcvs?rev=169765&view=rev
Log:
correcting naming error
Modified:
webservices/axis/trunk/java/modules/core/samples/deployment/module1/org/apache/module/Module1Impl.java
webservices/axis/trunk/java/modules/core/samples/deployment/module2/org/apache/axis/AddressingModule.java
webservices/axis/trunk/java/modules/core/samples/deployment/server.xml
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/module1/org/apache/module/Module1Impl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/module1/org/apache/module/Module1Impl.java?rev=169765&r1=169764&r2=169765&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/module1/org/apache/module/Module1Impl.java (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/module1/org/apache/module/Module1Impl.java Wed May 11 22:11:46 2005
@@ -4,6 +4,7 @@
import org.apache.axis.context.SystemContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.ExecutionChain;
+import org.apache.axis.engine.AxisSystem;
/**
* Created by IntelliJ IDEA.
@@ -12,15 +13,16 @@
* Time: 3:16:14 PM
*/
public class Module1Impl implements Module{
- public void init(SystemContext moduleContext) throws AxisFault {
- //do nothing
- }
- public void engage(ExecutionChain exeChain) throws AxisFault {
- //do nothing
+ // initialize the module
+ public void init(AxisSystem axisSystem) throws AxisFault {
+ /**
+ * in this case in the init the module does not need to do any thing
+ */
}
- public void shutDown() throws AxisFault {
- //do nothing
+ // shutdown the module
+ public void shutdown(AxisSystem axisSystem) throws AxisFault {
+ //To change body of implemented methods use File | Settings | File Templates.
}
}
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/module2/org/apache/axis/AddressingModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/module2/org/apache/axis/AddressingModule.java?rev=169765&r1=169764&r2=169765&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/module2/org/apache/axis/AddressingModule.java (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/module2/org/apache/axis/AddressingModule.java Wed May 11 22:11:46 2005
@@ -4,6 +4,7 @@
import org.apache.axis.context.SystemContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.ExecutionChain;
+import org.apache.axis.engine.AxisSystem;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -29,15 +30,14 @@
* Time: 2:18:53 PM
*/
public class AddressingModule implements Module{
- public void init(SystemContext moduleContext) throws AxisFault {
- //To change body of implemented methods use File | Settings | File Templates.
- }
- public void engage(ExecutionChain exeChain) throws AxisFault {
+ // initialize the module
+ public void init(AxisSystem axisSystem) throws AxisFault {
//To change body of implemented methods use File | Settings | File Templates.
}
- public void shutDown() throws AxisFault {
+ // shutdown the module
+ public void shutdown(AxisSystem axisSystem) throws AxisFault {
//To change body of implemented methods use File | Settings | File Templates.
}
}
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=169765&r1=169764&r2=169765&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/server.xml Wed May 11 22:11:46 2005
@@ -1,10 +1,12 @@
<server name ="AxisJava2.0" >
<messageReceiver mep="INOUT" class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
<phaseOrder type="inflow">
- <phase name="global"/>
- <phase name="transport"/>
- <phase name="Logging"/>
- <phase name="service"/>
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch"/>
+ <phase name="PostDispatch"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageProcessing"/>
</phaseOrder>
<phaseOrder type="outflow">
<phase name="global"/>
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java?rev=169765&r1=169764&r2=169765&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java Wed May 11 22:11:46 2005
@@ -77,7 +77,7 @@
AxisModule axismodule = (AxisModule) iterator.next();
Module module = axismodule.getModule();
if (module != null) {
- module.init(context);
+ module.init(context.getEngineConfig());
}
}
} catch (AxisFault e) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java?rev=169765&r1=169764&r2=169765&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java Wed May 11 22:11:46 2005
@@ -51,9 +51,9 @@
protected Log log = LogFactory.getLog(SimpleHTTPServer.class.getName());
/**
- * Field engineReg
+ * Field systemContext
*/
- protected SystemContext engineReg;
+ protected SystemContext systemContext;
/**
* Field serverSocket
@@ -74,10 +74,10 @@
/**
* Constructor SimpleHTTPServer
*
- * @param reg
+ * @param systemContext
*/
- public SimpleHTTPServer(SystemContext reg, ServerSocket serverSoc) {
- this.engineReg = reg;
+ public SimpleHTTPServer(SystemContext systemContext, ServerSocket serverSoc) {
+ this.systemContext = systemContext;
this.serverSocket = serverSoc;
}
@@ -92,7 +92,7 @@
this.serverSocket = serverSoc;
// Class erClass = Class.forName("org.apache.axis.deployment.EngineContextFactoryImpl");
EngineContextFactory erfac = new EngineContextFactory();
- this.engineReg = erfac.buildEngineContext(dir);
+ this.systemContext = erfac.buildEngineContext(dir);
Thread.sleep(2000);
} catch (Exception e1) {
throw new AxisFault("Thread interuptted", e1);
@@ -127,21 +127,21 @@
break;
}
if (socket != null) {
- if (engineReg == null) {
+ if (systemContext == null) {
throw new AxisFault("Engine Must be null");
}
Writer out = new OutputStreamWriter(socket.getOutputStream());
Reader in = new InputStreamReader(socket.getInputStream());
AxisTransportOut transportOut =
- engineReg.getEngineConfig().getTransportOut(
+ systemContext.getEngineConfig().getTransportOut(
new QName(Constants.TRANSPORT_HTTP));
MessageContext msgContext =
new MessageContext(
null,
- engineReg.getEngineConfig().getTransportIn(
+ systemContext.getEngineConfig().getTransportIn(
new QName(Constants.TRANSPORT_HTTP)),
transportOut,
- engineReg);
+ systemContext);
msgContext.setServerSide(true);
// We do not have any Addressing Headers to put
@@ -149,7 +149,7 @@
msgContext.setProperty(MessageContext.TRANSPORT_WRITER, out);
msgContext.setProperty(MessageContext.TRANSPORT_READER, in);
HTTPTransportReceiver reciver = new HTTPTransportReceiver();
- reciver.invoke(msgContext, engineReg);
+ reciver.invoke(msgContext, systemContext);
if (msgContext.getReplyTo() != null
&& !AddressingConstants.EPR_ANONYMOUS_URL.equals(
@@ -247,12 +247,12 @@
}
/**
- * Method getEngineReg
+ * Method getSystemContext
*
* @return
*/
- public SystemContext getEngineReg() {
- return engineReg;
+ public SystemContext getSystemContext() {
+ return systemContext;
}
/**
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=169765&r1=169764&r2=169765&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 Wed May 11 22:11:46 2005
@@ -1,13 +1,10 @@
-<server name ="AxisJava2.0" >
- <messageReceiver mep="INOUT" class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
- <parameter name="para1" locked="xsd:true">10</parameter>
- <parameter name="para2" locked="xsd:false">Colombo</parameter>
-
+<server name="AxisJava2.0">
+ <messageReceiver mep="INOUT" class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
<parameter name="hotdeployment" locked="xsd:false">true</parameter>
- <parameter name="hotupdate" locked="xsd:false">true</parameter>
-
+ <parameter name="hotupdate" locked="xsd:false">true</parameter>
+
<module ref="module1"/>
- <transportReceiver name="http">
+ <transportReceiver name="http">
<inflow>
<handler name="h1" class="org.apache.axis.deployment.SpeakingHandler">
<order phase="transport"/>
@@ -27,12 +24,12 @@
</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="uri">
+ <parameter name="para3" locked="xsd:true">10</parameter>
+ <parameter name="para4" locked="xsd:false">LSF</parameter>
+ </module>
+ -->
<phaseOrder type="inflow">
<phase name="global"/>
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java?rev=169765&r1=169764&r2=169765&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java Wed May 11 22:11:46 2005
@@ -37,13 +37,13 @@
public static synchronized void deployService(ServiceContext service)
throws AxisFault {
- reciver.getEngineReg().registerServiceContext(service.getServiceInstanceID(),service);
- reciver.getEngineReg().getEngineConfig().addService(service.getServiceConfig());
+ reciver.getSystemContext().registerServiceContext(service.getServiceInstanceID(),service);
+ reciver.getSystemContext().getEngineConfig().addService(service.getServiceConfig());
}
public static synchronized void unDeployService(QName service)
throws AxisFault {
- reciver.getEngineReg().getEngineConfig().removeService(service);
+ reciver.getSystemContext().getEngineConfig().removeService(service);
}
public static synchronized void start() throws Exception {