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 he...@apache.org on 2005/05/12 14:32:58 UTC
svn commit: r169807 [1/3] - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/context/
core/src/org/apache/axis/deployment/
core/src/org/apache/axis/deployment/repository/utill/
core/src/org/apache/axis/description/ core/src/org/apache/axis/engine/
core/src/org/apache/axis/handlers/ core/src/org/apache/axis/modules/
core/src/org/apache/axis/phaseresolver/ core/src/org/apache/axis/receivers/
core/src/org/apache/axis/transport/ core/src/org/apache/axis/transport/http/
core/src/org/apache/axis/transport/mail/ core/src/org/apache/axis/util/
core/test/org/apache/axis/context/ core/test/org/apache/axis/deployment/
core/test/org/apache/axis/description/ core/test/org/apache/axis/engine/
core/test/org/apache/axis/phaserule/ samples/src/encoding/sample1/
samples/src/encoding/sample2/benchMark/ samples/src/interop/doclit/
samples/src/org/apache/axis/testUtils/
samples/test/org/apache/axis/clientapi/ samples/test/org/apache/axis/engine/
samples/test/org/apache/axis/integration/
wsdl/src/org/apache/axis/wsdl/codegen/emitter/
Author: hemapani
Date: Thu May 12 05:32:55 2005
New Revision: 169807
URL: http://svn.apache.org/viewcvs?rev=169807&view=rev
Log:
refactor the AxisXX -> XXDescription
Removed:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/SystemContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisGlobal.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisMessage.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisModule.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisService.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisTransportIn.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisTransportOut.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/HandlerMetadata.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystem.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContextFactory.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
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/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisDescWSDLComponentFactory.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/Flow.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/FlowImpl.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Handler.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/AbstractHandler.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/AbstractTransportSender.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServiceXMLTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildWithAddressingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java
webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClassWriterConstants.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java Thu May 12 05:32:55 2005
@@ -23,12 +23,12 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.ServiceContext;
-import org.apache.axis.context.SystemContext;
-import org.apache.axis.description.AxisGlobal;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
-import org.apache.axis.description.AxisTransportIn;
-import org.apache.axis.description.AxisTransportOut;
+import org.apache.axis.context.ConfigurationContext;
+import org.apache.axis.description.GlobalDescription;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.AxisSystemImpl;
import org.apache.axis.om.OMAbstractFactory;
@@ -62,7 +62,7 @@
public OMElement invokeBlocking(String axisop, OMElement toSend) throws AxisFault {
- AxisOperation axisConfig =
+ OperationDescription axisConfig =
serviceContext.getServiceConfig().getOperation(new QName(axisop));
MessageContext msgctx = prepareTheSystem(axisConfig,toSend);
@@ -86,7 +86,7 @@
public void invokeNonBlocking(String axisop, OMElement toSend, Callback callback)
throws AxisFault {
- AxisOperation axisConfig =
+ OperationDescription axisConfig =
serviceContext.getServiceConfig().getOperation(new QName(axisop));
MessageContext msgctx = prepareTheSystem(axisConfig,toSend);
@@ -102,15 +102,15 @@
* @throws AxisFault
*/
- private MessageContext prepareTheSystem(AxisOperation axisOp,OMElement toSend) throws AxisFault {
- SystemContext syscontext = serviceContext.getEngineContext();
- //Make sure the AxisService object has the AxisOperation
+ private MessageContext prepareTheSystem(OperationDescription axisOp,OMElement toSend) throws AxisFault {
+ ConfigurationContext syscontext = serviceContext.getEngineContext();
+ //Make sure the ServiceDescription object has the OperationDescription
serviceContext.getServiceConfig().addOperation(axisOp);
- AxisTransportIn transportIn =
+ TransportInDescription transportIn =
syscontext.getEngineConfig().getTransportIn(new QName(listenertransport));
- AxisTransportOut transportOut =
+ TransportOutDescription transportOut =
syscontext.getEngineConfig().getTransportOut(new QName(senderTransport));
MessageContext msgctx = new MessageContext(null, transportIn, transportOut, syscontext);
@@ -132,14 +132,14 @@
}
/**
- * Assume the values for the SystemContext and ServiceContext to make the NON WSDL cases simple.
- * @return ServiceContext that has a SystemContext set in and has assumed values.
+ * Assume the values for the ConfigurationContext and ServiceContext to make the NON WSDL cases simple.
+ * @return ServiceContext that has a ConfigurationContext set in and has assumed values.
* @throws AxisFault
*/
private static ServiceContext assumeServiceContext() throws AxisFault {
- SystemContext sysContext = new SystemContext(new AxisSystemImpl(new AxisGlobal()));
+ ConfigurationContext sysContext = new ConfigurationContext(new AxisSystemImpl(new GlobalDescription()));
QName assumedServiceName = new QName("AnonnoymousService");
- AxisService axisService = new AxisService(assumedServiceName);
+ ServiceDescription axisService = new ServiceDescription(assumedServiceName);
sysContext.getEngineConfig().addService(axisService);
ServiceContext service = sysContext.createServiceContext(assumedServiceName);
return service;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java Thu May 12 05:32:55 2005
@@ -26,13 +26,13 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.OperationContextFactory;
import org.apache.axis.context.ServiceContext;
-import org.apache.axis.context.SystemContext;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisTransportIn;
-import org.apache.axis.description.AxisTransportOut;
+import org.apache.axis.context.ConfigurationContext;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.om.OMException;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.transport.TransportReceiver;
@@ -74,12 +74,12 @@
serviceContext);
}
- public MessageContext invokeBlocking(AxisOperation axisop, final MessageContext msgctx)
+ public MessageContext invokeBlocking(OperationDescription axisop, final MessageContext msgctx)
throws AxisFault {
msgctx.setTo(to);
- SystemContext sysContext = serviceContext.getEngineContext();
- AxisSystem registry = sysContext.getEngineConfig();
+ ConfigurationContext sysContext = serviceContext.getEngineContext();
+ AxisConfiguration registry = sysContext.getEngineConfig();
try {
@@ -111,19 +111,19 @@
}
public void invokeNonBlocking(
- AxisOperation axisop,
+ OperationDescription axisop,
final MessageContext msgctx,
final Callback callback)
throws AxisFault {
msgctx.setTo(to);
try {
- final SystemContext syscontext = serviceContext.getEngineContext();
+ final ConfigurationContext syscontext = serviceContext.getEngineContext();
AxisEngine engine = new AxisEngine(syscontext);
- final AxisTransportIn transportIn =
+ final TransportInDescription transportIn =
syscontext.getEngineConfig().getTransportIn(new QName(senderTransport));
- final AxisTransportOut transportOut =
+ final TransportOutDescription transportOut =
syscontext.getEngineConfig().getTransportOut(new QName(senderTransport));
if (useSeparateListener) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java Thu May 12 05:32:55 2005
@@ -21,18 +21,18 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.SystemContext;
+import org.apache.axis.context.ConfigurationContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.transport.http.SimpleHTTPServer;
public class ListenerManager {
- private SystemContext systemContext;
+ private ConfigurationContext systemContext;
private boolean started = false;
private int numberOfserver = 0;
private SimpleHTTPServer simpleHttpServer;
private ServerSocket scoket;
- public ListenerManager(SystemContext engineContext) {
+ public ListenerManager(ConfigurationContext engineContext) {
this.systemContext = engineContext;
}
@@ -57,7 +57,7 @@
/**
* @return
*/
- public SystemContext getSystemContext() {
+ public ConfigurationContext getSystemContext() {
return systemContext;
}
@@ -76,7 +76,7 @@
/**
* @param context
*/
- public void setSystemContext(SystemContext context) {
+ public void setSystemContext(ConfigurationContext context) {
systemContext = context;
}
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=169807&r1=169806&r2=169807&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 Thu May 12 05:32:55 2005
@@ -9,11 +9,11 @@
import org.apache.axis.deployment.DeploymentEngine;
import org.apache.axis.deployment.DeploymentException;
-import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.description.ModuleDescription;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.ServiceDescription;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.engine.AxisSystemImpl;
import org.apache.axis.modules.Module;
import org.apache.axis.phaseresolver.PhaseException;
@@ -27,11 +27,11 @@
*/
public class EngineContextFactory {
- public SystemContext buildEngineContext(String RepositaryName) throws DeploymentException {
- SystemContext engineContext = null;
+ public ConfigurationContext buildEngineContext(String RepositaryName) throws DeploymentException {
+ ConfigurationContext engineContext = null;
try {
DeploymentEngine deploymentEngine = new DeploymentEngine(RepositaryName);
- AxisSystem configuration = deploymentEngine.load();
+ AxisConfiguration configuration = deploymentEngine.load();
PhaseResolver phaseResolver = new PhaseResolver(configuration);
engineContext = phaseResolver.buildGlobalChains();
phaseResolver.buildTranspotsChains();
@@ -44,11 +44,11 @@
return engineContext;
}
- public SystemContext buildClientEngineContext(String axis2home) throws DeploymentException {
- SystemContext engineContext = null;
+ public ConfigurationContext buildClientEngineContext(String axis2home) throws DeploymentException {
+ ConfigurationContext engineContext = null;
try {
DeploymentEngine deploymentEngine = new DeploymentEngine(axis2home);
- AxisSystem configuration = deploymentEngine.loadClient();
+ AxisConfiguration configuration = deploymentEngine.loadClient();
PhaseResolver phaseResolver = new PhaseResolver(configuration);
engineContext = phaseResolver.buildGlobalChains();
phaseResolver.buildTranspotsChains();
@@ -70,12 +70,12 @@
*/
- private void initModules(SystemContext context) throws DeploymentException {
+ private void initModules(ConfigurationContext context) throws DeploymentException {
try {
HashMap modules = ((AxisSystemImpl) context.getEngineConfig()).getModules();
Collection col = modules.values();
for (Iterator iterator = col.iterator(); iterator.hasNext();) {
- AxisModule axismodule = (AxisModule) iterator.next();
+ ModuleDescription axismodule = (ModuleDescription) iterator.next();
Module module = axismodule.getModule();
if (module != null) {
module.init(context.getEngineConfig());
@@ -86,7 +86,7 @@
}
}
- public void createChains(AxisService service, AxisSystem system) throws PhaseException {
+ public void createChains(ServiceDescription service, AxisConfiguration system) throws PhaseException {
try {
PhaseResolver reolve = new PhaseResolver(system, service);
reolve.buildchains();
@@ -98,18 +98,18 @@
}
}
- private void engageModules(AxisService service, AxisSystem context) throws AxisFault {
+ private void engageModules(ServiceDescription service, AxisConfiguration context) throws AxisFault {
ArrayList servicemodules = (ArrayList) service.getModules();
ArrayList opModules;
Module module;
Collection operations = service.getOperations().values();
for (Iterator iterator = operations.iterator(); iterator.hasNext();) {
- AxisOperation operation = (AxisOperation) iterator.next();
+ OperationDescription operation = (OperationDescription) iterator.next();
opModules = (ArrayList) operation.getModules();
for (int i = 0; i < servicemodules.size(); i++) {
QName moduleName = (QName) servicemodules.get(i);
module = context.getModule(moduleName).getModule();
- //todo AxisOperation shoud have a method to get chains
+ //todo OperationDescription shoud have a method to get chains
/*ExecutionChain inchain = new ExecutionChain();
inchain.addPhases(operation.getPhases(EngineConfiguration.INFLOW));
module.engage(inchain);*/
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java Thu May 12 05:32:55 2005
@@ -18,8 +18,8 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.MessageInformationHeadersCollection;
import org.apache.axis.addressing.miheaders.RelatesTo;
-import org.apache.axis.description.AxisTransportIn;
-import org.apache.axis.description.AxisTransportOut;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.ExecutionChain;
import org.apache.axis.om.SOAPEnvelope;
@@ -64,11 +64,11 @@
private OperationContext operationContext;
private ServiceContext serviceContext;
- private SystemContext engineContext;
+ private ConfigurationContext engineContext;
- private AxisTransportIn transportIn;
+ private TransportInDescription transportIn;
- private AxisTransportOut transportOut;
+ private TransportOutDescription transportOut;
/**
* Field sessionContext
@@ -123,10 +123,10 @@
* @param mepContext
* @throws AxisFault
*/
- public MessageContext(SystemContext engineContext,
+ public MessageContext(ConfigurationContext engineContext,
SessionContext sessionContext,
- AxisTransportIn transportIn,
- AxisTransportOut transportOut,
+ TransportInDescription transportIn,
+ TransportOutDescription transportOut,
OperationContext mepContext)
throws AxisFault {
this(sessionContext, transportIn, transportOut, engineContext);
@@ -143,9 +143,9 @@
*/
public MessageContext(SessionContext sessionContext,
- AxisTransportIn transportIn,
- AxisTransportOut transportOut,
- SystemContext engineContext)
+ TransportInDescription transportIn,
+ TransportOutDescription transportOut,
+ ConfigurationContext engineContext)
throws AxisFault {
super(null);
@@ -387,28 +387,28 @@
/**
* @return
*/
- public AxisTransportIn getTransportIn() {
+ public TransportInDescription getTransportIn() {
return transportIn;
}
/**
* @return
*/
- public AxisTransportOut getTransportOut() {
+ public TransportOutDescription getTransportOut() {
return transportOut;
}
/**
* @param in
*/
- public void setTransportIn(AxisTransportIn in) {
+ public void setTransportIn(TransportInDescription in) {
transportIn = in;
}
/**
* @param out
*/
- public void setTransportOut(AxisTransportOut out) {
+ public void setTransportOut(TransportOutDescription out) {
transportOut = out;
}
@@ -454,7 +454,7 @@
this.serviceInstanceID = serviceInstanceID;
}
- public SystemContext getSystemContext() {
+ public ConfigurationContext getSystemContext() {
return engineContext;
}
@@ -468,7 +468,7 @@
/**
* @param context
*/
- public void setEngineContext(SystemContext context) {
+ public void setEngineContext(ConfigurationContext context) {
engineContext = context;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java Thu May 12 05:32:55 2005
@@ -18,14 +18,14 @@
import java.util.Map;
-import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.OperationDescription;
import org.apache.axis.engine.AxisError;
import org.apache.axis.engine.AxisFault;
import org.apache.wsdl.WSDLConstants;
/**
* An OperationContext represents a running "instance" of an operation, which is
- * represented by an AxisOperation object. This concept is needed to allow
+ * represented by an OperationDescription object. This concept is needed to allow
* messages to be grouped into operations as in WSDL 2.0-speak operations are
* essentially arbitrary message exchange patterns. So as messages are being
* exchanged the OperationContext remembers the state of where in the message
@@ -43,9 +43,9 @@
private MessageContext outMessageContext;
- // the AxisOperation of which this is a running instance. The MEP of this
- // AxisOperation must be one of the 8 predefined ones in WSDL 2.0.
- private AxisOperation axisOperation;
+ // the OperationDescription of which this is a running instance. The MEP of this
+ // OperationDescription must be one of the 8 predefined ones in WSDL 2.0.
+ private OperationDescription axisOperation;
private int operationMEP;
@@ -58,24 +58,24 @@
/**
* Construct a new OperationContext.
*
- * @param axisOperation the AxisOperation whose running instances' state this
+ * @param axisOperation the OperationDescription whose running instances' state this
* OperationContext represents.
* @param serviceContext the parent ServiceContext representing any state related to
* the set of all operations of the service.
*/
- public OperationContext(AxisOperation axisOperation,
+ public OperationContext(OperationDescription axisOperation,
ServiceContext serviceContext) {
super(serviceContext);
this.axisOperation = axisOperation;
this.operationMEP = axisOperation.getAxisSpecifMEPConstant();
- this.operationContextMap = ((SystemContext) parent.parent)
+ this.operationContextMap = getServiceContext().getEngineContext()
.getOperationContextMap();
}
/**
* @return Returns the axisOperation.
*/
- public AxisOperation getAxisOperation() {
+ public OperationDescription getAxisOperation() {
return axisOperation;
}
@@ -93,21 +93,21 @@
*
* @return parent ServiceContext's parent EngineContext
*/
- public SystemContext getEngineContext() {
- return (SystemContext) parent.parent;
+ public ConfigurationContext getEngineContext() {
+ return (ConfigurationContext) parent.parent;
}
/**
* When a new message is added to the <code>MEPContext</code> the logic
* should be included remove the MEPContext from the table in the
* <code>EngineContext</code>. Example: IN_IN_OUT At the second IN
- * message the MEPContext should be removed from the AxisOperation
+ * message the MEPContext should be removed from the OperationDescription
*
* @param msgContext
*/
public void addMessageContext(MessageContext msgContext) throws AxisFault {
// this needs to store the msgContext in either inMessageContext or
- // outMessageContext depending on the MEP of the AxisOperation
+ // outMessageContext depending on the MEP of the OperationDescription
// and on the current state of the operation.
if (WSDLConstants.MEP_CONSTANT_IN_OUT == operationMEP
|| WSDLConstants.MEP_CONSTANT_IN_OPTIONAL_OUT == operationMEP
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContextFactory.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContextFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContextFactory.java Thu May 12 05:32:55 2005
@@ -17,14 +17,14 @@
*/
package org.apache.axis.context;
-import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.OperationDescription;
import org.apache.axis.engine.AxisFault;
import org.apache.wsdl.WSDLConstants;
public class OperationContextFactory implements WSDLConstants {
public static OperationContext createMEPContext(int mepURI, boolean serverSide,
- AxisOperation axisOp, ServiceContext serviceContext)
+ OperationDescription axisOp, ServiceContext serviceContext)
throws AxisFault {
if (MEP_CONSTANT_IN_OUT == mepURI || MEP_CONSTANT_IN_ONLY == mepURI
|| MEP_CONSTANT_IN_OPTIONAL_OUT == mepURI
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java Thu May 12 05:32:55 2005
@@ -20,16 +20,16 @@
import javax.xml.namespace.QName;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.ServiceDescription;
public class ServiceContext extends AbstractContext {
- private AxisService serviceConfig;
+ private ServiceDescription serviceConfig;
private String serviceInstanceID;
- public ServiceContext(AxisService serviceConfig, SystemContext engineContext) {
+ public ServiceContext(ServiceDescription serviceConfig, ConfigurationContext engineContext) {
super(engineContext);
this.serviceConfig = serviceConfig;
@@ -54,16 +54,16 @@
/**
* @return
*/
- public AxisService getServiceConfig() {
+ public ServiceDescription getServiceConfig() {
return serviceConfig;
}
- public SystemContext getEngineContext() {
- return (SystemContext) parent;
+ public ConfigurationContext getEngineContext() {
+ return (ConfigurationContext) parent;
}
public OperationContext createOperationContext(QName name) {
- AxisOperation axisOp = serviceConfig.getOperation(name);
+ OperationDescription axisOp = serviceConfig.getOperation(name);
return new OperationContext(axisOp, this);
}
}
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=169807&r1=169806&r2=169807&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 Thu May 12 05:32:55 2005
@@ -37,14 +37,14 @@
import org.apache.axis.deployment.scheduler.DeploymentIterator;
import org.apache.axis.deployment.scheduler.Scheduler;
import org.apache.axis.deployment.scheduler.SchedulerTask;
-import org.apache.axis.description.AxisGlobal;
-import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.description.GlobalDescription;
+import org.apache.axis.description.ModuleDescription;
+import org.apache.axis.description.ServiceDescription;
import org.apache.axis.description.Flow;
-import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.Parameter;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.engine.AxisSystemImpl;
import org.apache.axis.engine.Handler;
import org.apache.axis.modules.Module;
@@ -77,7 +77,7 @@
* this ref will pass to engine when it call start()
* method
*/
- private AxisSystem engineconfig;
+ private AxisConfiguration engineconfig;
/**
* this constaructor for the testing
@@ -91,7 +91,7 @@
* This to keep a referance to serverMetaData object
*/
// private static ServerMetaData axisGlobal = new ServerMetaData();
- private AxisGlobal axisGlobal;
+ private GlobalDescription axisGlobal;
private HDFileItem currentFileItem;
@@ -160,7 +160,7 @@
*
* @return
*/
- public AxisSystem getEngineconfig() {
+ public AxisConfiguration getEngineconfig() {
return engineconfig;
}
@@ -184,7 +184,7 @@
}
}
- public AxisSystem load() throws DeploymentException {
+ public AxisConfiguration load() throws DeploymentException {
if (engineConfigName == null) {
throw new DeploymentException("path to Server.xml can not be NUll");
}
@@ -215,7 +215,7 @@
}
- public AxisSystem loadClient() throws DeploymentException {
+ public AxisConfiguration loadClient() throws DeploymentException {
if (engineConfigName == null) {
throw new DeploymentException("path to Client.xml can not be NUll");
}
@@ -256,8 +256,8 @@
}
}
- public AxisModule getModule(QName moduleName) throws AxisFault {
- AxisModule axisModule = engineconfig.getModule(moduleName);
+ public ModuleDescription getModule(QName moduleName) throws AxisFault {
+ ModuleDescription axisModule = engineconfig.getModule(moduleName);
return axisModule;
}
@@ -270,14 +270,14 @@
scheduler.schedule(new SchedulerTask(engine, folderName), new DeploymentIterator());
}
- private AxisSystem createEngineConfig(){
- axisGlobal = new AxisGlobal();
- AxisSystem newEngineConfig = new AxisSystemImpl(axisGlobal);
+ private AxisConfiguration createEngineConfig(){
+ axisGlobal = new GlobalDescription();
+ AxisConfiguration newEngineConfig = new AxisSystemImpl(axisGlobal);
return newEngineConfig;
}
- private void addnewService(AxisService serviceMetaData) throws AxisFault {
+ private void addnewService(ServiceDescription serviceMetaData) throws AxisFault {
try {
currentFileItem.setClassLoader();
loadServiceProperties(serviceMetaData);
@@ -297,7 +297,7 @@
* @param axisService
* @throws AxisFault
*/
- private void loadServiceProperties(AxisService axisService) throws AxisFault {
+ private void loadServiceProperties(ServiceDescription axisService) throws AxisFault {
Flow inflow = axisService.getInFlow();
if (inflow != null) {
addFlowHandlers(inflow);
@@ -321,7 +321,7 @@
}
- private void loadModuleClass(AxisModule module) throws AxisFault {
+ private void loadModuleClass(ModuleDescription module) throws AxisFault {
Class moduleClass = null;
try {
String readInClass = currentFileItem.getModuleClass();
@@ -341,7 +341,7 @@
ClassLoader loader1 = currentFileItem.getClassLoader();
for (int j = 0; j < count; j++) {
//todo handle exception in properway
- HandlerMetadata handlermd = flow.getHandler(j);
+ HandlerDescription handlermd = flow.getHandler(j);
Class handlerClass = null;
Handler handler;
handlerClass = getHandlerClass(handlermd.getClassName(), loader1);
@@ -372,7 +372,7 @@
}
- private void addNewModule(AxisModule moduelmetada) throws AxisFault {
+ private void addNewModule(ModuleDescription moduelmetada) throws AxisFault {
currentFileItem.setClassLoader();
Flow inflow = moduelmetada.getInFlow();
addFlowHandlers(inflow);
@@ -415,7 +415,7 @@
switch (type) {
case SERVICE:
try {
- AxisService service = archiveReader.createService(currentFileItem.getAbsolutePath());
+ ServiceDescription service = archiveReader.createService(currentFileItem.getAbsolutePath());
archiveReader.readServiceArchive(currentFileItem.getAbsolutePath(), this, service);
addnewService(service);
log.info("Deployement WS Name " + currentFileItem.getName());
@@ -443,7 +443,7 @@
break;
case MODULE:
try {
- AxisModule metaData = new AxisModule();
+ ModuleDescription metaData = new ModuleDescription();
archiveReader.readModuleArchive(currentFileItem.getAbsolutePath(), this, metaData);
addNewModule(metaData);
log.info("Moduel WS Name " + currentFileItem.getName() + " modulename :" + metaData.getName());
@@ -508,12 +508,12 @@
return fileName;
}
- /* public AxisService deployService(ClassLoader classLoder, InputStream serviceStream, String servieName) throws DeploymentException {
- AxisService service = null;
+ /* public ServiceDescription deployService(ClassLoader classLoder, InputStream serviceStream, String servieName) throws DeploymentException {
+ ServiceDescription service = null;
try {
currentFileItem = new HDFileItem(SERVICE, servieName);
currentFileItem.setClassLoader(classLoder);
- service = new AxisService();
+ service = new ServiceDescription();
DeploymentParser schme = new DeploymentParser(serviceStream, this);
schme.parseServiceXML(service);
service = loadServiceProperties(service);
@@ -540,7 +540,7 @@
* @return
* @throws DeploymentException
*/
- public AxisService buildService(AxisService axisService, InputStream serviceInputStream, ClassLoader classLoader) throws DeploymentException {
+ public ServiceDescription buildService(ServiceDescription axisService, InputStream serviceInputStream, ClassLoader classLoader) throws DeploymentException {
try {
DeploymentParser schme = new DeploymentParser(serviceInputStream, this);
schme.parseServiceXML(axisService);
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?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- 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 Thu May 12 05:32:55 2005
@@ -25,15 +25,15 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axis.description.AxisGlobal;
-import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
-import org.apache.axis.description.AxisTransportIn;
-import org.apache.axis.description.AxisTransportOut;
+import org.apache.axis.description.GlobalDescription;
+import org.apache.axis.description.ModuleDescription;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
import org.apache.axis.description.Flow;
import org.apache.axis.description.FlowImpl;
-import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.Parameter;
import org.apache.axis.description.ParameterImpl;
import org.apache.axis.engine.AxisFault;
@@ -77,7 +77,7 @@
pullparser = XMLInputFactory.newInstance().createXMLStreamReader(inputStream);
}
- public void parseServiceXML(AxisService axisService) throws DeploymentException {
+ public void parseServiceXML(ServiceDescription axisService) throws DeploymentException {
//To check whether document end tag has encountered
boolean END_DOCUMENT = false;
// ServiceMetaData service = null;
@@ -102,7 +102,7 @@
/**
* To process server.xml
*/
- public void processGlobalConfig(AxisGlobal axisGlobal) throws DeploymentException {
+ public void processGlobalConfig(GlobalDescription axisGlobal) throws DeploymentException {
try {
boolean END_DOCUMENT = false;
while (!END_DOCUMENT) {
@@ -119,10 +119,10 @@
Parameter parameter = processParameter();
axisGlobal.addParameter(parameter);
} else if (TRANSPORTSENDER.equals(ST)) {
- AxisTransportOut transportout = proccessTrasnsportOUT();
+ TransportOutDescription transportout = proccessTrasnsportOUT();
dpengine.getEngineconfig().addTransportOut(transportout);
} else if (TRANSPORTRECEIVER.equals(ST)) {
- AxisTransportIn transportin = proccessTrasnsportIN();
+ TransportInDescription transportin = proccessTrasnsportIN();
dpengine.getEngineconfig().addTransportIn(transportin);
} else if (TYPEMAPPINGST.equals(ST)) {
throw new UnsupportedOperationException("Type Mappings are not allowed in server.xml");
@@ -209,8 +209,8 @@
}
}
- public AxisTransportIn proccessTrasnsportIN() throws DeploymentException {
- AxisTransportIn transportin = null;
+ public TransportInDescription proccessTrasnsportIN() throws DeploymentException {
+ TransportInDescription transportin = null;
String attname = pullparser.getAttributeLocalName(0);
String attvalue = pullparser.getAttributeValue(0);
@@ -219,7 +219,7 @@
attname = pullparser.getAttributeLocalName(i);
attvalue = pullparser.getAttributeValue(i);
if (ATTNAME.equals(attname)) {
- transportin = new AxisTransportIn(new QName(attvalue));
+ transportin = new TransportInDescription(new QName(attvalue));
} else if (transportin != null && CLASSNAME.equals(attname)) {
Class reciever = null;
try {
@@ -273,8 +273,8 @@
return transportin;
}
- public AxisTransportOut proccessTrasnsportOUT() throws DeploymentException {
- AxisTransportOut transportout = null;
+ public TransportOutDescription proccessTrasnsportOUT() throws DeploymentException {
+ TransportOutDescription transportout = null;
String attname;
String attvalue;
int attribCount = pullparser.getAttributeCount();
@@ -282,7 +282,7 @@
attname = pullparser.getAttributeLocalName(i);
attvalue = pullparser.getAttributeValue(i);
if (ATTNAME.equals(attname)) {
- transportout = new AxisTransportOut(new QName(attvalue));
+ transportout = new TransportOutDescription(new QName(attvalue));
} else if (transportout != null && CLASSNAME.equals(attname)) {
Class sender = null;
try {
@@ -310,7 +310,7 @@
Parameter parameter = processParameter();
transportout.addParameter(parameter);
} else if (transportout != null && INFLOWST.equals(tagnae)) {
- throw new DeploymentException("InFlow dose not support in AxisTransportOut " + tagnae);
+ throw new DeploymentException("InFlow dose not support in TransportOutDescription " + tagnae);
} else if (transportout != null && OUTFLOWST.equals(tagnae)) {
Flow outFlow = processOutFlow();
transportout.setOutFlow(outFlow);
@@ -339,7 +339,7 @@
/**
* to process service.xml
*/
- private void procesServiceXML(AxisService axisService) throws DeploymentException {
+ private void procesServiceXML(ServiceDescription axisService) throws DeploymentException {
int attribCount = pullparser.getAttributeCount();
if (attribCount >= 1) {
for (int i = 0; i < attribCount; i++) {
@@ -382,7 +382,7 @@
// todo this should implemnt latter
// processBeanMapping();
} else if (OPRATIONST.equals(ST)) {
- AxisOperation operation = processOperation();
+ OperationDescription operation = processOperation();
axisService.addOperation(operation);
} else if (INFLOWST.equals(ST)) {
Flow inFlow = processInFlow();
@@ -484,10 +484,10 @@
* @throws org.apache.axis.deployment.DeploymentException
*
*/
- private HandlerMetadata processHandler() throws DeploymentException {
+ private HandlerDescription processHandler() throws DeploymentException {
// String name = pullparser.getLocalName();
boolean ref_name = false;
- HandlerMetadata handler = new HandlerMetadata();
+ HandlerDescription handler = new HandlerDescription();
int attribCount = pullparser.getAttributeCount();
for (int i = 0; i < attribCount; i++) {
@@ -612,9 +612,9 @@
}
- private AxisOperation processOperation() throws DeploymentException {
+ private OperationDescription processOperation() throws DeploymentException {
// String name = pullparser.getLocalName();
- AxisOperation operation = new AxisOperation();
+ OperationDescription operation = new OperationDescription();
int attribCount = pullparser.getAttributeCount();
if (attribCount > 0) { // there should be two attributes
for (int i = 0; i < attribCount; i++) {
@@ -731,7 +731,7 @@
}
- public void processModule(AxisModule module) throws DeploymentException {
+ public void processModule(ModuleDescription module) throws DeploymentException {
int attribCount = pullparser.getAttributeCount();
boolean ref_name = false;
boolean foundClass = false;
@@ -822,7 +822,7 @@
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String tagnae = pullparser.getLocalName();
if (HANDERST.equals(tagnae)) {
- HandlerMetadata handler = processHandler();
+ HandlerDescription handler = processHandler();
inFlow.addHandler(handler);
} else {
throw new DeploymentException("parser Exception : un supported element" + tagnae);
@@ -857,7 +857,7 @@
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String tagnae = pullparser.getLocalName();
if (HANDERST.equals(tagnae)) {
- HandlerMetadata handler = processHandler();
+ HandlerDescription handler = processHandler();
outFlow.addHandler(handler);
} else {
throw new DeploymentException("parser Exception : un supported element" + tagnae);
@@ -893,7 +893,7 @@
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String tagnae = pullparser.getLocalName();
if (HANDERST.equals(tagnae)) {
- HandlerMetadata handler = processHandler();
+ HandlerDescription handler = processHandler();
faultFlow.addHandler(handler);
} else {
throw new DeploymentException("parser Exception : un supported element" + tagnae);
@@ -927,7 +927,7 @@
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String tagnae = pullparser.getLocalName();
if (HANDERST.equals(tagnae)) {
- HandlerMetadata handler = processHandler();
+ HandlerDescription handler = processHandler();
faultFlow.addHandler(handler);
} else {
throw new DeploymentException("parser Exception : un supported element" + tagnae);
@@ -1027,7 +1027,7 @@
/**
* to process either module.xml or module elemnt in the service.xml
*/
- public void procesModuleXML(AxisModule module) throws DeploymentException {
+ public void procesModuleXML(ModuleDescription module) throws DeploymentException {
boolean END_DOCUMENT = false;
try {
while (!END_DOCUMENT) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java Thu May 12 05:32:55 2005
@@ -25,31 +25,31 @@
import org.apache.axis.deployment.DeploymentException;
import org.apache.axis.deployment.DeploymentParser;
import org.apache.axis.description.AxisDescWSDLComponentFactory;
-import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.description.ModuleDescription;
+import org.apache.axis.description.ServiceDescription;
import org.apache.axis.wsdl.builder.wsdl4j.WSDL1ToWOMBuilder;
public class ArchiveReader implements DeploymentConstants {
- public AxisService createService(String filename) throws DeploymentException {
+ public ServiceDescription createService(String filename) throws DeploymentException {
WSDL1ToWOMBuilder builder = new WSDL1ToWOMBuilder();
String strArchive = filename;
ZipInputStream zin;
boolean foundwsdl = false;
- AxisService service = null;
+ ServiceDescription service = null;
try {
zin = new ZipInputStream(new FileInputStream(strArchive));
ZipEntry entry;
while ((entry = zin.getNextEntry()) != null) {
if (entry.getName().equals(SERVICEWSDL)) {
- service = (AxisService) builder.build(zin, new AxisDescWSDLComponentFactory());
+ service = (ServiceDescription) builder.build(zin, new AxisDescWSDLComponentFactory());
foundwsdl = true;
break;
}
}
zin.close();
if (!foundwsdl) {
- service = new AxisService();
+ service = new ServiceDescription();
}
} catch (Exception e) {
throw new DeploymentException(e.getMessage());
@@ -65,7 +65,7 @@
* @param engine
*/
- public void readServiceArchive(String filename, DeploymentEngine engine, AxisService service) throws DeploymentException {
+ public void readServiceArchive(String filename, DeploymentEngine engine, ServiceDescription service) throws DeploymentException {
// get attribute values
boolean foundServiceXML = false;
String strArchive = filename;
@@ -90,7 +90,7 @@
}
}
- public void readModuleArchive(String filename, DeploymentEngine engine, AxisModule module) throws DeploymentException {
+ public void readModuleArchive(String filename, DeploymentEngine engine, ModuleDescription module) throws DeploymentException {
// get attribute values
boolean foundmoduleXML = false;
String strArchive = filename;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisDescWSDLComponentFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisDescWSDLComponentFactory.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisDescWSDLComponentFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisDescWSDLComponentFactory.java Thu May 12 05:32:55 2005
@@ -46,7 +46,7 @@
public WSDLService createService() {
- return new AxisService();
+ return new ServiceDescription();
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/Flow.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/Flow.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/Flow.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/Flow.java Thu May 12 05:32:55 2005
@@ -33,12 +33,12 @@
* @param index
* @return
*/
- public HandlerMetadata getHandler(int index);
+ public HandlerDescription getHandler(int index);
/**
* Method addHandler
*
* @param handler
*/
- public void addHandler(HandlerMetadata handler);
+ public void addHandler(HandlerDescription handler);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/FlowImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/FlowImpl.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/FlowImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/FlowImpl.java Thu May 12 05:32:55 2005
@@ -39,7 +39,7 @@
*
* @param handler
*/
- public void addHandler(HandlerMetadata handler) {
+ public void addHandler(HandlerDescription handler) {
list.add(handler);
}
@@ -49,8 +49,8 @@
* @param index
* @return
*/
- public HandlerMetadata getHandler(int index) {
- return (HandlerMetadata) list.get(index);
+ public HandlerDescription getHandler(int index) {
+ return (HandlerDescription) list.get(index);
}
/**
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java Thu May 12 05:32:55 2005
@@ -18,7 +18,7 @@
import java.util.ArrayList;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisConfiguration;
/**
* Util class to implements the Phases include with delegation
@@ -49,13 +49,13 @@
* @throws AxisFault
*/
public ArrayList getPhases(int flow) throws AxisFault {
- if (flow == AxisSystem.INFLOW) {
+ if (flow == AxisConfiguration.INFLOW) {
return inflow;
- } else if (flow == AxisSystem.OUTFLOW) {
+ } else if (flow == AxisConfiguration.OUTFLOW) {
return outflow;
- } else if (flow == AxisSystem.FAULT_IN_FLOW) {
+ } else if (flow == AxisConfiguration.FAULT_IN_FLOW) {
return faultInflow;
- } else if (flow == AxisSystem.FAULT_OUT_FLOW) {
+ } else if (flow == AxisConfiguration.FAULT_OUT_FLOW) {
return faultOutflow;
} else {
throw new AxisFault("Unknown type flow ");
@@ -70,13 +70,13 @@
* @throws AxisFault
*/
public void setPhases(ArrayList phases, int flow) throws AxisFault {
- if (flow == AxisSystem.INFLOW) {
+ if (flow == AxisConfiguration.INFLOW) {
inflow = phases;
- } else if (flow == AxisSystem.OUTFLOW) {
+ } else if (flow == AxisConfiguration.OUTFLOW) {
outflow = phases;
- } else if (flow == AxisSystem.FAULT_IN_FLOW) {
+ } else if (flow == AxisConfiguration.FAULT_IN_FLOW) {
faultInflow = phases;
- }else if (flow == AxisSystem.FAULT_OUT_FLOW) {
+ }else if (flow == AxisConfiguration.FAULT_OUT_FLOW) {
faultOutflow = phases;
} else {
throw new AxisFault("Unknown type flow ");
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java Thu May 12 05:32:55 2005
@@ -18,10 +18,10 @@
import javax.xml.namespace.QName;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.context.SystemContext;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
-import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.context.ConfigurationContext;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.description.HandlerDescription;
import org.apache.axis.handlers.AbstractHandler;
/**
@@ -37,10 +37,10 @@
/**
* Constructor Dispatcher
*/
- private SystemContext engineContext;
+ private ConfigurationContext engineContext;
public AbstractDispatcher() {
- init(new HandlerMetadata(NAME));
+ init(new HandlerDescription(NAME));
}
/**
@@ -52,14 +52,14 @@
public final void invoke(MessageContext msgctx) throws AxisFault {
if(msgctx.getServiceContext() == null){
- AxisService axisService = findService(msgctx);
+ ServiceDescription axisService = findService(msgctx);
if(axisService != null){
msgctx.setServiceContext(axisService.findServiceContext(msgctx));
}
}
if (msgctx.getServiceContext() == null && msgctx.getOperationContext() == null) {
- AxisOperation axisOperation = findOperation(msgctx.getServiceContext().getServiceConfig(),msgctx);
+ OperationDescription axisOperation = findOperation(msgctx.getServiceContext().getServiceConfig(),msgctx);
if(axisOperation != null){
msgctx.setOperationContext(axisOperation.findOperationContext(msgctx,msgctx.getServiceContext(),msgctx.isServerSide()));
}
@@ -67,7 +67,7 @@
}
- public abstract AxisService findService(MessageContext messageContext)throws AxisFault;
- public abstract AxisOperation findOperation(AxisService service,MessageContext messageContext)throws AxisFault;
+ public abstract ServiceDescription findService(MessageContext messageContext)throws AxisFault;
+ public abstract OperationDescription findOperation(ServiceDescription service,MessageContext messageContext)throws AxisFault;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java Thu May 12 05:32:55 2005
@@ -19,10 +19,10 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.context.SystemContext;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
-import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.context.ConfigurationContext;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.description.HandlerDescription;
/**
* Class Dispatcher
@@ -37,20 +37,20 @@
/**
* Constructor Dispatcher
*/
- private SystemContext engineContext;
+ private ConfigurationContext engineContext;
public AddressingBasedDispatcher() {
- init(new HandlerMetadata(NAME));
+ init(new HandlerDescription(NAME));
}
- public AxisOperation findOperation(AxisService service, MessageContext messageContext)
+ public OperationDescription findOperation(ServiceDescription service, MessageContext messageContext)
throws AxisFault {
String action = (String) messageContext.getWSAAction();
if (action != null) {
QName operationName = new QName(action);
- AxisOperation op = service.getOperation(operationName);
+ OperationDescription op = service.getOperation(operationName);
if (op != null) {
return op;
} else {
@@ -66,10 +66,10 @@
/* (non-Javadoc)
* @see org.apache.axis.engine.AbstractDispatcher#findService(org.apache.axis.context.MessageContext)
*/
- public AxisService findService(MessageContext messageContext) throws AxisFault {
+ public ServiceDescription findService(MessageContext messageContext) throws AxisFault {
EndpointReference toEPR = messageContext.getTo();
QName serviceName = new QName(toEPR.getAddress());
- AxisService service = engineContext.getEngineConfig().getService(serviceName);
+ ServiceDescription service = engineContext.getEngineConfig().getService(serviceName);
if (service != null) {
return service;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java Thu May 12 05:32:55 2005
@@ -19,8 +19,8 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.OperationContext;
-import org.apache.axis.context.SystemContext;
-import org.apache.axis.description.AxisOperation;
+import org.apache.axis.context.ConfigurationContext;
+import org.apache.axis.description.OperationDescription;
import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.SOAPBody;
import org.apache.axis.om.SOAPEnvelope;
@@ -37,14 +37,14 @@
* Field log
*/
private Log log = LogFactory.getLog(getClass());
- private SystemContext engineContext;
+ private ConfigurationContext engineContext;
/**
* Constructor AxisEngine
*
*
*/
- public AxisEngine(SystemContext engineContext) {
+ public AxisEngine(ConfigurationContext engineContext) {
log.info("Axis Engine Started");
this.engineContext = engineContext;
}
@@ -90,7 +90,7 @@
*/
public void receive(MessageContext context) throws AxisFault {
try {
- SystemContext sysCtx = context.getSystemContext();
+ ConfigurationContext sysCtx = context.getSystemContext();
ArrayList phases = sysCtx.getEngineConfig().getInPhasesUptoAndIncludingPostDispatch();
invokePhases(phases, context);
@@ -143,7 +143,7 @@
OperationContext opContext = context.getOperationContext();
if(opContext == null){
- AxisOperation axisOperation = opContext.getAxisOperation();
+ OperationDescription axisOperation = opContext.getAxisOperation();
ArrayList phases = axisOperation.getPhasesInFaultOutFlow();
invokePhases(phases, context);
}
@@ -161,7 +161,7 @@
private void verifyContextBuilt(MessageContext msgctx) throws AxisFault {
if (msgctx.getSystemContext() == null) {
- throw new AxisFault("SystemContext can not be null");
+ throw new AxisFault("ConfigurationContext can not be null");
}
if (msgctx.getOperationContext() == null) {
throw new AxisFault("OperationContext can not be null");
@@ -187,7 +187,7 @@
* @param obj the object to be stored
* @return the storage key
*/
- public Object store(SystemContext context, Object obj) {
+ public Object store(ConfigurationContext context, Object obj) {
return context.getStorage().put(obj);
}
@@ -198,7 +198,7 @@
* @param key
* @return
*/
- public Object retrieve(SystemContext context, Object key) {
+ public Object retrieve(ConfigurationContext context, Object key) {
return context.getStorage().get(key);
}
@@ -208,7 +208,7 @@
* @param key
* @return the object removed
*/
- public Object remove(SystemContext context, Object key) {
+ public Object remove(ConfigurationContext context, Object key) {
return context.getStorage().remove(key);
}
@@ -217,7 +217,7 @@
* @param context
* @return
*/
- public boolean clearStorage(SystemContext context) {
+ public boolean clearStorage(ConfigurationContext context) {
return context.getStorage().clean();
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java Thu May 12 05:32:55 2005
@@ -21,16 +21,16 @@
import javax.xml.namespace.QName;
-import org.apache.axis.description.AxisGlobal;
-import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisService;
-import org.apache.axis.description.AxisTransportIn;
-import org.apache.axis.description.AxisTransportOut;
+import org.apache.axis.description.GlobalDescription;
+import org.apache.axis.description.ModuleDescription;
+import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
/**
* Class EngineRegistryImpl
*/
-public class AxisSystemImpl implements AxisSystem {
+public class AxisSystemImpl implements AxisConfiguration {
/**
* To store Erroness services
*/
@@ -58,7 +58,7 @@
/**
* Field global
*/
- private final AxisGlobal global;
+ private final GlobalDescription global;
/**
* Field phases
@@ -72,7 +72,7 @@
*
* @param global
*/
- public AxisSystemImpl(AxisGlobal global) {
+ public AxisSystemImpl(GlobalDescription global) {
this.global = global;
inPhases = new ArrayList();
outPhases = new ArrayList();
@@ -100,7 +100,7 @@
* @param module
* @throws AxisFault
*/
- public synchronized void addMdoule(AxisModule module) throws AxisFault {
+ public synchronized void addMdoule(ModuleDescription module) throws AxisFault {
modules.put(module.getName(), module);
}
@@ -110,7 +110,7 @@
* @param service
* @throws AxisFault
*/
- public synchronized void addService(AxisService service) throws AxisFault {
+ public synchronized void addService(ServiceDescription service) throws AxisFault {
services.put(service.getName(), service);
}
@@ -120,7 +120,7 @@
* @return
* @throws AxisFault
*/
- public AxisGlobal getGlobal() throws AxisFault {
+ public GlobalDescription getGlobal() throws AxisFault {
return global;
}
@@ -131,8 +131,8 @@
* @return
* @throws AxisFault
*/
- public AxisModule getModule(QName name) throws AxisFault {
- return (AxisModule) modules.get(name);
+ public ModuleDescription getModule(QName name) throws AxisFault {
+ return (ModuleDescription) modules.get(name);
}
/**
@@ -151,8 +151,8 @@
* @return
* @throws AxisFault
*/
- public AxisService getService(QName name) throws AxisFault {
- return (AxisService) services.get(name);
+ public ServiceDescription getService(QName name) throws AxisFault {
+ return (ServiceDescription) services.get(name);
}
/**
@@ -168,8 +168,8 @@
- public AxisTransportIn getTransportIn(QName name) throws AxisFault {
- return (AxisTransportIn) transportsIn.get(name);
+ public TransportInDescription getTransportIn(QName name) throws AxisFault {
+ return (TransportInDescription) transportsIn.get(name);
}
/**
@@ -178,12 +178,12 @@
* @param transport
* @throws AxisFault
*/
- public synchronized void addTransportIn(AxisTransportIn transport)
+ public synchronized void addTransportIn(TransportInDescription transport)
throws AxisFault {
transportsIn.put(transport.getName(), transport);
}
- public AxisTransportOut getTransportOut(QName name) throws AxisFault {
- return (AxisTransportOut) transportsOut.get(name);
+ public TransportOutDescription getTransportOut(QName name) throws AxisFault {
+ return (TransportOutDescription) transportsOut.get(name);
}
/**
@@ -192,7 +192,7 @@
* @param transport
* @throws AxisFault
*/
- public synchronized void addTransportOut(AxisTransportOut transport)
+ public synchronized void addTransportOut(TransportOutDescription transport)
throws AxisFault {
transportsOut.put(transport.getName(), transport);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Handler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Handler.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Handler.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Handler.java Thu May 12 05:32:55 2005
@@ -20,7 +20,7 @@
import javax.xml.namespace.QName;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.Parameter;
/**
@@ -32,7 +32,7 @@
*
* @param handlerdesc
*/
- public void init(HandlerMetadata handlerdesc);
+ public void init(HandlerDescription handlerdesc);
/**
* Invoke is called to do the actual work of the Handler object.
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java Thu May 12 05:32:55 2005
@@ -19,10 +19,10 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.context.SystemContext;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
-import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.context.ConfigurationContext;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.description.HandlerDescription;
/**
* Class Dispatcher
@@ -40,13 +40,13 @@
* Constructor Dispatcher
*/
public RequestURIBasedDispatcher() {
- init(new HandlerMetadata(NAME));
+ init(new HandlerDescription(NAME));
}
- public AxisOperation findOperation(AxisService service, MessageContext messageContext)
+ public OperationDescription findOperation(ServiceDescription service, MessageContext messageContext)
throws AxisFault {
if (operatoinName != null) {
- AxisOperation axisOp = service.getOperation(operatoinName);
+ OperationDescription axisOp = service.getOperation(operatoinName);
return axisOp;
}
return null;
@@ -56,7 +56,7 @@
/* (non-Javadoc)
* @see org.apache.axis.engine.AbstractDispatcher#findService(org.apache.axis.context.MessageContext)
*/
- public AxisService findService(MessageContext messageContext) throws AxisFault {
+ public ServiceDescription findService(MessageContext messageContext) throws AxisFault {
final String URI_ID_STRING = "/services";
if (messageContext.isServerSide()) {
@@ -68,7 +68,7 @@
if (index > 0) {
serviceStr = filePart.substring(index + URI_ID_STRING.length() + 1);
- SystemContext engineContext = messageContext.getSystemContext();
+ ConfigurationContext engineContext = messageContext.getSystemContext();
if ((index = serviceStr.indexOf('/')) > 0) {
serviceName = new QName(serviceStr.substring(0, index));
@@ -77,7 +77,7 @@
serviceName = new QName(serviceStr);
}
- AxisSystem registry = messageContext.getSystemContext().getEngineConfig();
+ AxisConfiguration registry = messageContext.getSystemContext().getEngineConfig();
return registry.getService(serviceName);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/AbstractHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/AbstractHandler.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/AbstractHandler.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/AbstractHandler.java Thu May 12 05:32:55 2005
@@ -18,7 +18,7 @@
import javax.xml.namespace.QName;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.Parameter;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Handler;
@@ -30,13 +30,13 @@
/**
* Field EMPTY_HANDLER_METADATA
*/
- private static HandlerMetadata EMPTY_HANDLER_METADATA =
- new HandlerMetadata();
+ private static HandlerDescription EMPTY_HANDLER_METADATA =
+ new HandlerDescription();
/**
* Field handlerDesc
*/
- protected HandlerMetadata handlerDesc;
+ protected HandlerDescription handlerDesc;
/**
* Constructor AbstractHandler
@@ -85,7 +85,7 @@
*
* @param handlerdesc
*/
- public void init(HandlerMetadata handlerdesc) {
+ public void init(HandlerDescription handlerdesc) {
this.handlerDesc = handlerdesc;
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java Thu May 12 05:32:55 2005
@@ -17,7 +17,7 @@
package org.apache.axis.modules;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.AxisSystem;
+import org.apache.axis.engine.AxisConfiguration;
/**
* Every module provides an implementation of this class. Modules are in one of
@@ -35,11 +35,11 @@
*/
public interface Module {
// initialize the module
- public void init(AxisSystem axisSystem) throws AxisFault;
+ public void init(AxisConfiguration axisSystem) throws AxisFault;
// TODO figure out how to get the engage() concept done
// public void engage(ExecutionChain exeChain) throws AxisFault;
// shutdown the module
- public void shutdown(AxisSystem axisSystem) throws AxisFault;
+ public void shutdown(AxisConfiguration axisSystem) throws AxisFault;
}