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 ch...@apache.org on 2005/10/26 06:33:01 UTC
svn commit: r328554 [2/6] - in /webservices/axis2/trunk/java:
modules/codegen/src/org/apache/axis2/databinding/extensions/
modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeans/
modules/codegen/src/org/apache/axis2/rpc/ modules/codegen/s...
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java Tue Oct 25 21:29:17 2005
@@ -22,10 +22,10 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.OperationDescriptionFactory;
-import org.apache.axis2.description.OutInOperationDescription;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisOperationFactory;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.OutInAxisOperation;
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.soap.SOAPEnvelope;
@@ -39,7 +39,7 @@
*/
public class Call extends InOutMEPClient {
- protected static OperationDescription operationTemplate;
+ protected static AxisOperation axisOperationTemplate;
protected MessageContext lastResponseMessage;
/**
@@ -81,10 +81,10 @@
public OMElement invokeBlocking(String axisop, OMElement toSend)
throws AxisFault {
- OperationDescription opDesc =
- serviceContext.getServiceConfig().getOperation(new QName(axisop));
+ AxisOperation opDesc =
+ serviceContext.getAxisService().getOperation(new QName(axisop));
opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop,WSDLConstants.MEP_CONSTANT_OUT_IN);
- opDesc.setParent(serviceContext.getServiceConfig());
+ opDesc.setParent(serviceContext.getAxisService());
MessageContext msgctx = prepareTheSOAPEnvelope(toSend);
this.lastResponseMessage = super.invokeBlocking(opDesc, msgctx);
@@ -103,11 +103,11 @@
public SOAPEnvelope invokeBlocking(String axisop, SOAPEnvelope envelope)
throws AxisFault {
- OperationDescription opDesc =
- serviceContext.getServiceConfig().getOperation(new QName(axisop));
+ AxisOperation opDesc =
+ serviceContext.getAxisService().getOperation(new QName(axisop));
opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop, WSDLConstants.MEP_CONSTANT_OUT_IN);
- MessageContext msgctx = new MessageContext(serviceContext.getEngineContext());
+ MessageContext msgctx = new MessageContext(serviceContext.getConfigurationContext());
if(envelope == null || envelope.getBody() == null){
throw new AxisFault("SOAP envelope or SOAP Body can not be null");
}
@@ -132,8 +132,8 @@
OMElement toSend,
Callback callback)
throws AxisFault {
- OperationDescription opDesc =
- serviceContext.getServiceConfig().getOperation(new QName(axisop));
+ AxisOperation opDesc =
+ serviceContext.getAxisService().getOperation(new QName(axisop));
opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop,WSDLConstants.MEP_CONSTANT_OUT_IN);
MessageContext msgctx = prepareTheSOAPEnvelope(toSend);
//call the underline implementation
@@ -154,11 +154,11 @@
SOAPEnvelope envelope,
Callback callback)
throws AxisFault {
- OperationDescription opDesc =
- serviceContext.getServiceConfig().getOperation(new QName(axisop));
+ AxisOperation opDesc =
+ serviceContext.getAxisService().getOperation(new QName(axisop));
opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop,WSDLConstants.MEP_CONSTANT_OUT_IN);
- MessageContext msgctx = new MessageContext(serviceContext.getEngineContext());
+ MessageContext msgctx = new MessageContext(serviceContext.getConfigurationContext());
if(envelope == null || envelope.getBody() == null){
throw new AxisFault("SOAP envelope or SOAP Body can not be null");
}
@@ -172,24 +172,24 @@
* @param opDesc
* @param axisOp
*/
- protected OperationDescription createOpDescAndFillInFlowInformation(
- OperationDescription opDesc,
+ protected AxisOperation createOpDescAndFillInFlowInformation(
+ AxisOperation opDesc,
String axisOp , int mepURL) throws AxisFault {
if (opDesc == null) {
//if the operation is not alrady define we will copy the
//crated Phases from the templete operation to the this Operation
-// opDesc = new OperationDescription(new QName(axisOp));
- opDesc = OperationDescriptionFactory.getOperetionDescription(mepURL);
+// opDesc = new AxisOperation(new QName(axisOp));
+ opDesc = AxisOperationFactory.getOperetionDescription(mepURL);
opDesc.setName(new QName(axisOp));
opDesc.setRemainingPhasesInFlow(
- operationTemplate.getRemainingPhasesInFlow());
- opDesc.setPhasesOutFlow(operationTemplate.getPhasesOutFlow());
+ axisOperationTemplate.getRemainingPhasesInFlow());
+ opDesc.setPhasesOutFlow(axisOperationTemplate.getPhasesOutFlow());
opDesc.setPhasesInFaultFlow(
- operationTemplate.getPhasesInFaultFlow());
+ axisOperationTemplate.getPhasesInFaultFlow());
opDesc.setPhasesOutFaultFlow(
- operationTemplate.getPhasesOutFaultFlow());
- serviceContext.getServiceConfig().addOperation(opDesc);
+ axisOperationTemplate.getPhasesOutFaultFlow());
+ serviceContext.getAxisService().addOperation(opDesc);
}
return opDesc;
}
@@ -214,19 +214,19 @@
sysContext = ListenerManager.configurationContext;
}
QName assumedServiceName = new QName("AnonymousService");
- ServiceDescription axisService =sysContext.getAxisConfiguration().getService("AnonymousService");
+ AxisService axisService =sysContext.getAxisConfiguration().getService("AnonymousService");
if(axisService == null) {
//we will assume a Service and operations
- axisService = new ServiceDescription(assumedServiceName);
-// operationTemplate = new OperationDescription(new QName("TemplateOperation"));
- operationTemplate = new OutInOperationDescription(new QName("TemplateOperation"));
+ axisService = new AxisService(assumedServiceName);
+// axisOperationTemplate = new AxisOperation(new QName("TemplateOperation"));
+ axisOperationTemplate = new OutInAxisOperation(new QName("TemplateOperation"));
PhasesInfo info =((AxisConfigurationImpl)sysContext.getAxisConfiguration()).getPhasesinfo();
//to set the operation flows
if(info != null){
- info.setOperationPhases(operationTemplate);
+ info.setOperationPhases(axisOperationTemplate);
}
- axisService.addOperation(operationTemplate);
+ axisService.addOperation(axisOperationTemplate);
sysContext.getAxisConfiguration().addService(axisService);
}
return axisService.getParent().getServiceGroupContext(sysContext).getServiceContext(
@@ -246,7 +246,7 @@
* @param value
*/
public void set(String key, Object value) {
- serviceContext.getEngineContext().setProperty(key, value);
+ serviceContext.getConfigurationContext().setProperty(key, value);
}
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java Tue Oct 25 21:29:17 2005
@@ -23,7 +23,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEngine;
@@ -52,13 +52,13 @@
* @param msgctx
* @throws AxisFault
*/
- public void send(OperationDescription axisop, final MessageContext msgctx) throws AxisFault {
+ public void send(AxisOperation axisop, final MessageContext msgctx) throws AxisFault {
prepareInvocation(axisop, msgctx);
msgctx.setMessageInformationHeaders(messageInformationHeaders);
String messageID = String.valueOf("uuid:"+ UUIDGenerator.getUUID());
msgctx.setMessageID(messageID);
msgctx.setServiceContext(serviceContext);
- ConfigurationContext syscontext = serviceContext.getEngineContext();
+ ConfigurationContext syscontext = serviceContext.getConfigurationContext();
//if the transport to use for sending is not specified, try to find it from the URL
if (senderTransport == null) {
@@ -68,7 +68,7 @@
msgctx.setTransportOut(senderTransport);
//initialize and set the Operation Context
- ConfigurationContext sysContext = serviceContext.getEngineContext();
+ ConfigurationContext sysContext = serviceContext.getConfigurationContext();
AxisConfiguration registry = sysContext.getAxisConfiguration();
msgctx.setOperationContext(axisop.findOperationContext(msgctx, serviceContext));
@@ -132,7 +132,7 @@
*/
public void setSenderTransport(String senderTransport) throws AxisFault {
AxisConfiguration axisConfiguration =
- serviceContext.getEngineContext().getAxisConfiguration();
+ serviceContext.getConfigurationContext().getAxisConfiguration();
this.senderTransport =
axisConfiguration.getTransportOut(new QName(senderTransport));
if(senderTransport == null){
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java Tue Oct 25 21:29:17 2005
@@ -23,7 +23,7 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
@@ -87,7 +87,7 @@
* <p/>
* //create new service
* QName assumedServiceName = new QName("Your Service");
- * ServiceDescription axisService = new ServiceDescription(assumedServiceName);
+ * AxisService axisService = new AxisService(assumedServiceName);
* sysContext.getEngineConfig().addService(axisService);
* ServiceContext service = sysContext.createServiceContext(assumedServiceName);
* return service;
@@ -115,7 +115,7 @@
* </ol>
*/
- public MessageContext invokeBlocking(OperationDescription axisop,
+ public MessageContext invokeBlocking(AxisOperation axisop,
final MessageContext msgctx)
throws AxisFault {
prepareInvocation(axisop, msgctx);
@@ -148,7 +148,7 @@
//process the resule of the invocation
if (callback.envelope != null) {
MessageContext resMsgctx =
- new MessageContext(serviceContext.getEngineContext());
+ new MessageContext(serviceContext.getConfigurationContext());
resMsgctx.setEnvelope(callback.envelope);
return resMsgctx;
} else {
@@ -162,7 +162,7 @@
//This is the Usual Request-Response Sync implemetation
msgctx.setTo(to);
msgctx.setServiceContext(serviceContext);
- ConfigurationContext syscontext = serviceContext.getEngineContext();
+ ConfigurationContext syscontext = serviceContext.getConfigurationContext();
msgctx.setConfigurationContext(syscontext);
checkTransport(msgctx);
@@ -207,7 +207,7 @@
* This invocation done via this method blocks till the result arrives, using this method does not indicate
* anyhting about the transport used or the nature of the transport.
*/
- public void invokeNonBlocking(final OperationDescription axisop,
+ public void invokeNonBlocking(final AxisOperation axisop,
final MessageContext msgctx,
final Callback callback)
throws AxisFault {
@@ -215,7 +215,7 @@
msgctx.setTo(to);
try {
final ConfigurationContext syscontext =
- serviceContext.getEngineContext();
+ serviceContext.getConfigurationContext();
AxisEngine engine = new AxisEngine(syscontext);
checkTransport(msgctx);
@@ -231,7 +231,7 @@
callbackReceiver.addCallback(messageID, callback);
//set the replyto such that the response will arrive at the transport listener started
msgctx.setReplyTo(ListenerManager.replyToEPR(serviceContext
- .getServiceConfig()
+ .getAxisService()
.getName()
.getLocalPart()
+ "/"
@@ -247,7 +247,7 @@
} else {
//here a bloking invocation happens in a new thrad, so the progamming model is
//non blocking
- serviceContext.getEngineContext().getThreadPool().newThread(new NonBlockingInvocationWorker(callback, axisop, msgctx));
+ serviceContext.getConfigurationContext().getThreadPool().newThread(new NonBlockingInvocationWorker(callback, axisop, msgctx));
}
} catch (OMException e) {
@@ -303,7 +303,7 @@
//find and set the transport details
AxisConfiguration axisConfig =
- serviceContext.getEngineContext().getAxisConfiguration();
+ serviceContext.getConfigurationContext().getAxisConfiguration();
this.listenerTransport =
axisConfig.getTransportIn(new QName(listenerTransport));
this.senderTransport =
@@ -318,13 +318,13 @@
//if seperate transport is used, start the required listeners
if (useSeparateListener) {
if (!serviceContext
- .getEngineContext()
+ .getConfigurationContext()
.getAxisConfiguration()
.isEngaged(new QName(Constants.MODULE_ADDRESSING))) {
throw new AxisFault(Messages.getMessage("2channelNeedAddressing"));
}
ListenerManager.makeSureStarted(listenerTransport,
- serviceContext.getEngineContext());
+ serviceContext.getConfigurationContext());
}
}
@@ -341,7 +341,7 @@
if (listenerTransport == null) {
listenerTransport =
serviceContext
- .getEngineContext()
+ .getConfigurationContext()
.getAxisConfiguration()
.getTransportIn(senderTransport.getName());
}
@@ -386,11 +386,11 @@
private class NonBlockingInvocationWorker implements Runnable {
private Callback callback;
- private OperationDescription axisop;
+ private AxisOperation axisop;
private MessageContext msgctx;
public NonBlockingInvocationWorker(Callback callback,
- OperationDescription axisop,
+ AxisOperation axisop,
MessageContext msgctx) {
this.callback = callback;
this.axisop = axisop;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MEPClient.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MEPClient.java Tue Oct 25 21:29:17 2005
@@ -20,7 +20,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.i18n.Messages;
@@ -65,10 +65,10 @@
* prepare the message context for invocation, here the properties kept in the
* MEPClient copied to the MessageContext
*/
- protected void prepareInvocation(OperationDescription axisop, MessageContext msgCtx)
+ protected void prepareInvocation(AxisOperation axisop, MessageContext msgCtx)
throws AxisFault {
if (axisop == null) {
- throw new AxisFault(Messages.getMessage("cannotBeNullOperationDescription"));
+ throw new AxisFault(Messages.getMessage("cannotBeNullAxisOperation"));
}
//make sure operation is type right MEP
if (mep.equals(axisop.getMessageExchangePattern())) {
@@ -79,8 +79,8 @@
axisop.getMessageExchangePattern()));
}
//if operation not alrady added, add it
- if (serviceContext.getServiceConfig().getOperation(axisop.getName()) == null) {
- serviceContext.getServiceConfig().addOperation(axisop);
+ if (serviceContext.getAxisService().getOperation(axisop.getName()) == null) {
+ serviceContext.getAxisService().addOperation(axisop);
}
if (wsaAction != null) {
msgCtx.setWSAAction(wsaAction);
@@ -96,7 +96,7 @@
* @throws AxisFault
*/
protected MessageContext prepareTheSOAPEnvelope(OMElement toSend) throws AxisFault {
- MessageContext msgctx = new MessageContext(serviceContext.getEngineContext());
+ MessageContext msgctx = new MessageContext(serviceContext.getConfigurationContext());
SOAPEnvelope envelope = createDefaultSOAPEnvelope();
if (toSend != null) {
@@ -126,7 +126,7 @@
}
if (transport != null) {
- return serviceContext.getEngineContext().getAxisConfiguration().getTransportOut(
+ return serviceContext.getConfigurationContext().getAxisConfiguration().getTransportOut(
new QName(transport));
} else {
@@ -162,7 +162,7 @@
* @throws AxisFault
*/
public void engageModule(QName name) throws AxisFault {
- AxisConfiguration axisConf = serviceContext.getEngineContext().getAxisConfiguration();
+ AxisConfiguration axisConf = serviceContext.getConfigurationContext().getAxisConfiguration();
//if it is already engeged do not engege it agaien
if (!axisConf.isEngaged(name)) {
axisConf.engageModule(name);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java Tue Oct 25 21:29:17 2005
@@ -17,16 +17,16 @@
package org.apache.axis2.clientapi;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.context.ServiceGroupContext;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.OutInOperationDescription;
-import org.apache.axis2.description.OperationDescriptionFactory;
+import org.apache.axis2.deployment.util.PhasesInfo;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisOperationFactory;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.OutInAxisOperation;
+import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.om.OMElement;
import org.apache.wsdl.WSDLConstants;
@@ -38,7 +38,7 @@
*/
public class MessageSender extends InOnlyMEPClient {
- protected static OperationDescription operationTemplate;
+ protected static AxisOperation axisOperationTemplate;
/**
* Service context of the Service this MessageSender handles, compare this with the Call, simpler method.
* @param service
@@ -67,23 +67,23 @@
* @throws AxisFault
*/
public void send(String opName, OMElement toSend) throws AxisFault {
- OperationDescription axisOp = serviceContext.getServiceConfig()
+ AxisOperation axisOp = serviceContext.getAxisService()
.getOperation(opName);
if (axisOp == null) {
//todo I just assumed mep is alwas in-out , this has to improve : Deepal
- axisOp = new OutInOperationDescription(new QName(opName));
- serviceContext.getServiceConfig().addOperation(axisOp);
+ axisOp = new OutInAxisOperation(new QName(opName));
+ serviceContext.getAxisService().addOperation(axisOp);
- axisOp = OperationDescriptionFactory.getOperetionDescription(WSDLConstants.MEP_CONSTANT_IN_ONLY);
+ axisOp = AxisOperationFactory.getOperetionDescription(WSDLConstants.MEP_CONSTANT_IN_ONLY);
axisOp.setName(new QName(opName));
axisOp.setRemainingPhasesInFlow(
- operationTemplate.getRemainingPhasesInFlow());
- axisOp.setPhasesOutFlow(operationTemplate.getPhasesOutFlow());
+ axisOperationTemplate.getRemainingPhasesInFlow());
+ axisOp.setPhasesOutFlow(axisOperationTemplate.getPhasesOutFlow());
axisOp.setPhasesInFaultFlow(
- operationTemplate.getPhasesInFaultFlow());
+ axisOperationTemplate.getPhasesInFaultFlow());
axisOp.setPhasesOutFaultFlow(
- operationTemplate.getPhasesOutFaultFlow());
- serviceContext.getServiceConfig().addOperation(axisOp);
+ axisOperationTemplate.getPhasesOutFaultFlow());
+ serviceContext.getAxisService().addOperation(axisOp);
}
super.send(axisOp, prepareTheSOAPEnvelope(toSend));
}
@@ -104,22 +104,22 @@
//create new service
QName assumedServiceName = new QName("AnonymousService");
- ServiceDescription axisService = new ServiceDescription(assumedServiceName);
+ AxisService axisService = new AxisService(assumedServiceName);
//we will assume a Service and operations
-// operationTemplate = new OperationDescription(new QName("TemplateOperation"));
- operationTemplate = new OutInOperationDescription(new QName("TemplateOperation"));
+// axisOperationTemplate = new AxisOperation(new QName("TemplateOperation"));
+ axisOperationTemplate = new OutInAxisOperation(new QName("TemplateOperation"));
PhasesInfo info =((AxisConfigurationImpl)sysContext.getAxisConfiguration()).getPhasesinfo();
//to set the operation flows
if(info != null){
- info.setOperationPhases(operationTemplate);
+ info.setOperationPhases(axisOperationTemplate);
}
- axisService.addOperation(operationTemplate);
+ axisService.addOperation(axisOperationTemplate);
sysContext.getAxisConfiguration().addService(axisService);
ServiceGroupContext serviceGroupContext = axisService.getParent().getServiceGroupContext(sysContext);
return serviceGroupContext.getServiceContext(assumedServiceName.getLocalPart());
@@ -130,7 +130,7 @@
}
public void set(String key, Object value) {
- serviceContext.getEngineContext().setProperty(key, value);
+ serviceContext.getConfigurationContext().setProperty(key, value);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java Tue Oct 25 21:29:17 2005
@@ -22,7 +22,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMFactory;
@@ -38,7 +38,6 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -51,7 +50,7 @@
protected ConfigurationContext _configurationContext;
- protected static ServiceDescription _service;
+ protected static AxisService _service;
protected ServiceContext _serviceContext;
protected EndpointReference toEPR;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/TwoWayTransportBasedSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/TwoWayTransportBasedSender.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/TwoWayTransportBasedSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/TwoWayTransportBasedSender.java Tue Oct 25 21:29:17 2005
@@ -42,7 +42,7 @@
msgctx.getTransportOut());
response.setProperty(MessageContext.TRANSPORT_IN,
msgctx.getProperty(MessageContext.TRANSPORT_IN));
- msgctx.getOperationDescription().registerOperationContext(response,msgctx.getOperationContext());
+ msgctx.getAxisOperation().registerOperationContext(response,msgctx.getOperationContext());
response.setServerSide(false);
response.setServiceContext(msgctx.getServiceContext());
response.setServiceGroupContext(msgctx.getServiceGroupContext());
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java Tue Oct 25 21:29:17 2005
@@ -17,12 +17,12 @@
package org.apache.axis2.context;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.ServiceGroupDescription;
+import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.storage.AxisStorage;
import org.apache.axis2.util.UUIDGenerator;
-import org.apache.axis2.util.threadpool.ThreadPool;
import org.apache.axis2.util.threadpool.ThreadFactory;
+import org.apache.axis2.util.threadpool.ThreadPool;
import javax.xml.namespace.QName;
import java.io.File;
@@ -196,7 +196,7 @@
* @param pool
*/
public void setThreadPool(ThreadFactory pool) {
- threadPool = pool;
+ threadPool = pool;
}
/**
@@ -242,7 +242,7 @@
if (!isNull(serviceGroupContextId) && serviceGroupContextMap.get(serviceGroupContextId) != null) {
// SGC is already there
serviceGroupContext = (ServiceGroupContext) serviceGroupContextMap.get(serviceGroupContextId);
- serviceContext = serviceGroupContext.getServiceContext(messageContext.getServiceDescription().getName().
+ serviceContext = serviceGroupContext.getServiceContext(messageContext.getAxisService().getName().
getLocalPart());
} else {
// either the key is null or no SGC is found from the give key
@@ -250,18 +250,18 @@
serviceGroupContextId = UUIDGenerator.getUUID();
messageContext.setServiceGroupContextId(serviceGroupContextId);
}
- if (messageContext.getServiceDescription() != null) {
- ServiceGroupDescription servicGroupDescription =
- messageContext.getServiceDescription().getParent();
- serviceGroupContext = servicGroupDescription.getServiceGroupContext(this);
+ if (messageContext.getAxisService() != null) {
+ AxisServiceGroup axisServiceGroup =
+ messageContext.getAxisService().getParent();
+ serviceGroupContext = axisServiceGroup.getServiceGroupContext(this);
serviceContext = serviceGroupContext.getServiceContext(
- messageContext.getServiceDescription().getName().
+ messageContext.getAxisService().getName().
getLocalPart());
//set the serviceGroupContextID
serviceGroupContext.setId(serviceGroupContextId);
this.registerServiceGroupContext(serviceGroupContext);
} else {
- throw new AxisFault("ServiceDescription Not found yet");
+ throw new AxisFault("AxisService Not found yet");
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java Tue Oct 25 21:29:17 2005
@@ -3,9 +3,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.deployment.DeploymentException;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.ModuleDescription;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
@@ -161,7 +161,7 @@
* @param modules
* @throws PhaseException
*/
- public static void createChains(ServiceDescription service,
+ public static void createChains(AxisService service,
AxisConfiguration configurationContextVal,
ArrayList modules)
throws PhaseException {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Tue Oct 25 21:29:17 2005
@@ -98,9 +98,9 @@
private ServiceContext serviceContext;
private ServiceGroupContext serviceGroupContext;
- private transient OperationDescription operationDescription;
- private transient ServiceDescription serviceDescription;
- private transient ServiceGroupDescription serviceGroupDescription;
+ private transient AxisOperation axisOperation;
+ private transient AxisService axisService;
+ private transient AxisServiceGroup axisServiceGroup;
private ConfigurationContext configurationContext;
private transient TransportInDescription transportIn;
@@ -175,11 +175,11 @@
QName transportOutname = null;
- String serviceGroupDescId = null;
+ String serviceGroupId = null;
QName serviceDescName = null;
- QName operationDescName = null;
+ QName axisOperationName = null;
/**
* The method is used to do the intialization of the EngineContext
@@ -191,12 +191,12 @@
transportIn = axisConfiguration.getTransportIn(transportInName);
if (transportOutname != null)
transportOut = axisConfiguration.getTransportOut(transportOutname);
- if (serviceGroupDescId != null)
- serviceGroupDescription = axisConfiguration.getServiceGroup(serviceGroupDescId);
+ if (serviceGroupId != null)
+ axisServiceGroup = axisConfiguration.getServiceGroup(serviceGroupId);
if (serviceDescName != null)
- serviceDescription = axisConfiguration.getService(serviceDescName.getLocalPart());
- if (operationDescName != null)
- operationDescription = serviceDescription.getOperation(operationDescName);
+ axisService = axisConfiguration.getService(serviceDescName.getLocalPart());
+ if (axisOperationName != null)
+ axisOperation = axisService.getOperation(axisOperationName);
}
private void writeObject(ObjectOutputStream out) throws IOException {
@@ -204,12 +204,12 @@
transportInName = transportIn.getName();
if (transportOut != null)
transportOutname = transportOut.getName();
- if (serviceGroupDescription != null)
- serviceGroupDescId = serviceGroupDescription.getServiceGroupName();
- if (serviceDescription != null)
- serviceDescName = serviceDescription.getName();
- if (operationDescription != null)
- operationDescName = operationDescription.getName();
+ if (axisServiceGroup != null)
+ serviceGroupId = axisServiceGroup.getServiceGroupName();
+ if (axisService != null)
+ serviceDescName = axisService.getName();
+ if (axisOperation != null)
+ axisOperationName = axisOperation.getName();
out.defaultWriteObject();
}
@@ -548,7 +548,7 @@
}
this.setParent(operationContext);
if (operationContext != null) {
- this.setOperationDescription(operationContext.getOperationDescription());
+ this.setAxisOperation(operationContext.getAxisOperation());
}
}
@@ -606,7 +606,7 @@
if (operationContext != null && operationContext.getParent() != null) {
operationContext.setParent(context);
}
- this.setServiceDescription(context.getServiceConfig());
+ this.setAxisService(context.getAxisService());
}
/**
@@ -622,8 +622,8 @@
* any levle via this method , and the preferance is as follows,
* 1. Search in operation description if its there
* 2. if the paramter not found or operationContext is null will search in
- * ServiceDescription
- * 3. If the serviceDescription is null or , the paramter does not found will serach in
+ * AxisService
+ * 3. If the axisService is null or , the paramter does not found will serach in
* AxisConfiguration
*
* @param key
@@ -631,23 +631,23 @@
*/
public Parameter getParameter(String key) {
Parameter param = null;
- if (getOperationDescription() != null) {
- OperationDescription opDesc = getOperationDescription();
+ if (getAxisOperation() != null) {
+ AxisOperation opDesc = getAxisOperation();
param = opDesc.getParameter(key);
if(param !=null){
return param;
}
}
- if (getServiceDescription() != null) {
- ServiceDescription serviceDesc = getServiceDescription();
- param = serviceDesc.getParameter(key);
+ if (getAxisService() != null) {
+ AxisService axisService = getAxisService();
+ param = axisService.getParameter(key);
if(param !=null){
return param;
}
}
- if (getServiceGroupDescription() != null) {
- ServiceGroupDescription serviceDesc = getServiceGroupDescription();
- param = serviceDesc.getParameter(key);
+ if (getAxisServiceGroup() != null) {
+ AxisServiceGroup axisServiceDesc = getAxisServiceGroup();
+ param = axisServiceDesc.getParameter(key);
if(param !=null){
return param;
}
@@ -686,8 +686,8 @@
public Parameter getModuleParameter(String key, String moduleName, HandlerDescription handler) {
Parameter param = null;
ModuleConfiguration moduleConfig = null;
- if (getOperationDescription() != null) {
- OperationDescription opDesc = getOperationDescription();
+ if (getAxisOperation() != null) {
+ AxisOperation opDesc = getAxisOperation();
moduleConfig = opDesc.getModuleConfig(new QName(moduleName));
if (moduleConfig != null) {
param = moduleConfig.getParameter(key);
@@ -701,30 +701,30 @@
}
}
}
- if (getServiceDescription() != null) {
- ServiceDescription serviceDesc = getServiceDescription();
- moduleConfig = serviceDesc.getModuleConfig(new QName(moduleName));
+ if (getAxisService() != null) {
+ AxisService axisService = getAxisService();
+ moduleConfig = axisService.getModuleConfig(new QName(moduleName));
if (moduleConfig != null) {
param = moduleConfig.getParameter(key);
if(param !=null){
return param;
} else {
- param = serviceDesc.getParameter(key);
+ param = axisService.getParameter(key);
if(param !=null){
return param;
}
}
}
}
- if (getServiceGroupDescription() != null) {
- ServiceGroupDescription serviceDesc = getServiceGroupDescription();
- moduleConfig = serviceDesc.getModuleConfig(new QName(moduleName));
+ if (getAxisServiceGroup() != null) {
+ AxisServiceGroup axisServiceDesc = getAxisServiceGroup();
+ moduleConfig = axisServiceDesc.getModuleConfig(new QName(moduleName));
if (moduleConfig != null) {
param = moduleConfig.getParameter(key);
if(param !=null){
return param;
} else {
- param = serviceDesc.getParameter(key);
+ param = axisServiceDesc.getParameter(key);
if(param !=null){
return param;
}
@@ -889,35 +889,35 @@
this.serviceGroupContext = serviceGroupContext;
}
- public OperationDescription getOperationDescription() {
- return operationDescription;
+ public AxisOperation getAxisOperation() {
+ return axisOperation;
}
- public void setOperationDescription(OperationDescription operationDescription) {
- this.operationDescription = operationDescription;
- this.operationDescName = operationDescription.getName();
- if (operationDescription != null)
- this.operationDescName = operationDescription.getName();
+ public void setAxisOperation(AxisOperation axisOperation) {
+ this.axisOperation = axisOperation;
+ this.axisOperationName = axisOperation.getName();
+ if (axisOperation != null)
+ this.axisOperationName = axisOperation.getName();
}
- public ServiceDescription getServiceDescription() {
- return serviceDescription;
+ public AxisService getAxisService() {
+ return axisService;
}
- public void setServiceDescription(ServiceDescription serviceDescription) {
- this.serviceDescription = serviceDescription;
- if (serviceDescription != null)
- this.serviceDescName = serviceDescription.getName();
+ public void setAxisService(AxisService axisService) {
+ this.axisService = axisService;
+ if (axisService != null)
+ this.serviceDescName = axisService.getName();
}
- public ServiceGroupDescription getServiceGroupDescription() {
- return serviceGroupDescription;
+ public AxisServiceGroup getAxisServiceGroup() {
+ return axisServiceGroup;
}
- public void setServiceGroupDescription(ServiceGroupDescription serviceGroupDescription) {
- if (serviceGroupDescription != null) {
- this.serviceGroupDescId = serviceGroupDescription.getServiceGroupName();
- this.serviceGroupDescription = serviceGroupDescription;
+ public void setAxisServiceGroup(AxisServiceGroup axisServiceGroup) {
+ if (axisServiceGroup != null) {
+ this.serviceGroupId = axisServiceGroup.getServiceGroupName();
+ this.axisServiceGroup = axisServiceGroup;
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java Tue Oct 25 21:29:17 2005
@@ -17,8 +17,8 @@
package org.apache.axis2.context;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.AxisConfiguration;
import javax.xml.namespace.QName;
@@ -31,7 +31,7 @@
/**
* An OperationContext represents a running "instance" of an operation, which is
- * represented by an OperationDescription object. This concept is needed to allow
+ * represented by an AxisOperation 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
@@ -53,9 +53,9 @@
// private MessageContext outMessageContext;
- // 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 transient OperationDescription axisOperation;
+ // 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 transient AxisOperation axisOperation;
private int operationMEP;
@@ -103,42 +103,42 @@
/**
* Construct a new OperationContext.
*
- * @param axisOperation the OperationDescription whose running instances' state this
+ * @param axisOperation the AxisOperation 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(OperationDescription axisOperation,
+ public OperationContext(AxisOperation axisOperation,
ServiceContext serviceContext) {
super(serviceContext);
this.messageContexts = new HashMap();
this.axisOperation = axisOperation;
this.operationMEP = axisOperation.getAxisSpecifMEPConstant();
- this.operationContextMap = getServiceContext().getEngineContext()
+ this.operationContextMap = getServiceContext().getConfigurationContext()
.getOperationContextMap();
operationDescName = axisOperation.getName();
- ServiceDescription serviceDescription = axisOperation.getParent();
- if (serviceDescription!=null)
- serviceDescName = serviceDescription.getName();
+ AxisService axisService = axisOperation.getParent();
+ if (axisService !=null)
+ serviceDescName = axisService.getName();
}
- public OperationContext(OperationDescription axisOperation) {
+ public OperationContext(AxisOperation axisOperation) {
super(null);
this.messageContexts = new HashMap();
this.axisOperation = axisOperation;
this.operationMEP = axisOperation.getAxisSpecifMEPConstant();
operationDescName = axisOperation.getName();
- ServiceDescription serviceDescription = axisOperation.getParent();
- if (serviceDescription!=null)
- serviceDescName = serviceDescription.getName();
+ AxisService axisService = axisOperation.getParent();
+ if (axisService !=null)
+ serviceDescName = axisService.getName();
}
/**
* @return Returns the axisOperation.
*/
- public OperationDescription getOperationDescription() {
+ public AxisOperation getAxisOperation() {
return axisOperation;
}
@@ -164,7 +164,7 @@
* 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 OperationDescription
+ * message the MEPContext should be removed from the AxisOperation
*
* @param msgContext
*/
@@ -220,7 +220,7 @@
public void setParent(AbstractContext context) {
super.setParent(context);
- this.operationContextMap = getServiceContext().getEngineContext()
+ this.operationContextMap = getServiceContext().getConfigurationContext()
.getOperationContextMap();
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContextFactory.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContextFactory.java Tue Oct 25 21:29:17 2005
@@ -17,7 +17,7 @@
package org.apache.axis2.context;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.i18n.Messages;
import org.apache.wsdl.WSDLConstants;
@@ -29,7 +29,7 @@
public static OperationContext createOperationContext(
int mepURI,
- OperationDescription axisOp,
+ AxisOperation axisOp,
ServiceContext serviceContext)
throws AxisFault {
if (MEP_CONSTANT_IN_OUT == mepURI
@@ -56,7 +56,7 @@
*/
public static OperationContext createOperationContext(
int mepURI,
- OperationDescription axisOp)
+ AxisOperation axisOp)
throws AxisFault {
if (MEP_CONSTANT_IN_OUT == mepURI
|| MEP_CONSTANT_IN_ONLY == mepURI
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java Tue Oct 25 21:29:17 2005
@@ -17,8 +17,8 @@
package org.apache.axis2.context;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.AxisConfiguration;
import javax.xml.namespace.QName;
@@ -32,11 +32,11 @@
*/
public class ServiceContext extends AbstractContext {
- private transient ServiceDescription serviceConfig;
+ private transient AxisService axisService;
private String serviceInstanceID;
- private QName serviceDescName = null;
+ private QName axisServiceName = null;
/**
@@ -44,12 +44,12 @@
* @throws AxisFault
*/
public void init(AxisConfiguration axisConfiguration) throws AxisFault {
- serviceConfig = axisConfiguration.getService(serviceDescName.getLocalPart());
+ axisService = axisConfiguration.getService(axisServiceName.getLocalPart());
}
private void writeObject(ObjectOutputStream out) throws IOException {
- if (serviceConfig!=null)
- this.serviceDescName = serviceConfig.getName();
+ if (axisService !=null)
+ this.axisServiceName = axisService.getName();
out.defaultWriteObject();
}
@@ -59,13 +59,13 @@
}
public ServiceContext(
- ServiceDescription serviceConfig,
+ AxisService serviceConfig,
ServiceGroupContext serviceGroupContext) {
super(serviceGroupContext);
- this.serviceConfig = serviceConfig;
+ this.axisService = serviceConfig;
if (serviceConfig!=null){
- this.serviceDescName = serviceConfig.getName();
+ this.axisServiceName = serviceConfig.getName();
serviceInstanceID = serviceConfig.getName().getLocalPart();
}
@@ -86,19 +86,16 @@
this.serviceInstanceID = serviceInstanceID;
}
- /**
- * @return
- */
- public ServiceDescription getServiceConfig() {
- return serviceConfig;
+ public AxisService getAxisService() {
+ return axisService;
}
- public ConfigurationContext getEngineContext() {
+ public ConfigurationContext getConfigurationContext() {
return (ConfigurationContext) parent.getParent();
}
public OperationContext createOperationContext(QName name) {
- OperationDescription axisOp = serviceConfig.getOperation(name);
+ AxisOperation axisOp = axisService.getOperation(name);
return new OperationContext(axisOp, this);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java Tue Oct 25 21:29:17 2005
@@ -17,8 +17,8 @@
package org.apache.axis2.context;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.ServiceGroupDescription;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
import java.io.IOException;
@@ -32,19 +32,19 @@
private String id;
private Map serviceContextMap;
- private transient ServiceGroupDescription description;
- private String serviceGroupDescName=null;
+ private transient AxisServiceGroup axisServiceGroup;
+ private String axisServiceGroupName =null;
public void init(AxisConfiguration axisConfiguration) throws AxisFault {
- if (serviceGroupDescName!=null)
- description = axisConfiguration.getServiceGroup(serviceGroupDescName);
+ if (axisServiceGroupName !=null)
+ axisServiceGroup = axisConfiguration.getServiceGroup(axisServiceGroupName);
}
private void writeObject(ObjectOutputStream out) throws IOException {
- if (description!=null)
- this.serviceGroupDescName = description.getServiceGroupName();
+ if (axisServiceGroup !=null)
+ this.axisServiceGroupName = axisServiceGroup.getServiceGroupName();
out.defaultWriteObject();
}
@@ -54,13 +54,13 @@
nonPersistentMap = new HashMap ();
}
- public ServiceGroupContext(ConfigurationContext parent ,ServiceGroupDescription description) {
+ public ServiceGroupContext(ConfigurationContext parent ,AxisServiceGroup axisServiceGroup) {
super(parent);
- this.description = description;
+ this.axisServiceGroup = axisServiceGroup;
serviceContextMap = new HashMap();
- if (description!=null)
- this.serviceGroupDescName = description.getServiceGroupName();
+ if (axisServiceGroup !=null)
+ this.axisServiceGroupName = axisServiceGroup.getServiceGroupName();
fillServiceContexts();
}
@@ -83,17 +83,17 @@
* created
*/
private void fillServiceContexts(){
- Iterator services = description.getServices();
+ Iterator services = axisServiceGroup.getServices();
while (services.hasNext()) {
- ServiceDescription serviceDescription = (ServiceDescription) services.next();
- ServiceContext serviceContext = new ServiceContext(serviceDescription,this);
- String servicNams = serviceDescription.getName().getLocalPart();
+ AxisService axisService = (AxisService) services.next();
+ ServiceContext serviceContext = new ServiceContext(axisService,this);
+ String servicNams = axisService.getName().getLocalPart();
serviceContextMap.put(servicNams,serviceContext);
}
}
- public ServiceGroupDescription getDescription() {
- return description;
+ public AxisServiceGroup getDescription() {
+ return axisServiceGroup;
}
public Iterator getServiceContexts(){
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Tue Oct 25 21:29:17 2005
@@ -25,13 +25,13 @@
import org.apache.axis2.deployment.scheduler.Scheduler;
import org.apache.axis2.deployment.scheduler.SchedulerTask;
import org.apache.axis2.deployment.util.PhasesInfo;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.Flow;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.ModuleDescription;
-import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.ServiceGroupDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.engine.Handler;
@@ -377,44 +377,44 @@
}
- private void addnewService(ServiceGroupDescription serviceMetaData) throws AxisFault {
+ private void addnewService(AxisServiceGroup axisServiceMetaData) throws AxisFault {
// Iterator services = currentArchiveFile.getService().values().iterator();
Iterator services = currentArchiveFile.getDeploybleServices().iterator();
while (services.hasNext()) {
- ServiceDescription serviceDescription = (ServiceDescription) services.next();
- loadServiceProperties(serviceDescription);
- serviceDescription.setFileName(currentArchiveFile.getFile().getAbsolutePath());
+ AxisService axisService = (AxisService) services.next();
+ loadServiceProperties(axisService);
+ axisService.setFileName(currentArchiveFile.getFile().getAbsolutePath());
//module form serviceGroup
- ArrayList groupModules = serviceMetaData.getModules();
+ ArrayList groupModules = axisServiceMetaData.getModules();
for (int i = 0; i < groupModules.size(); i++) {
ModuleDescription module = axisConfig.getModule((QName) groupModules.get(i));
if (module != null) {
- serviceDescription.engageModule(module, axisConfig);
+ axisService.engageModule(module, axisConfig);
} else {
throw new DeploymentException(Messages.getMessage(
- DeploymentErrorMsgs.IN_VALID_MODUELE_REF, serviceDescription.getName().
+ DeploymentErrorMsgs.IN_VALID_MODUELE_REF, axisService.getName().
getLocalPart(), ((QName) groupModules.get(i)).getLocalPart()));
}
}
//modules from <service>
- ArrayList list = serviceDescription.getModules();
+ ArrayList list = axisService.getModules();
for (int i = 0; i < list.size(); i++) {
ModuleDescription module = axisConfig.getModule((QName) list.get(i));
if (module != null) {
- serviceDescription.engageModule(module, axisConfig);
+ axisService.engageModule(module, axisConfig);
} else {
throw new DeploymentException(Messages.getMessage(
- DeploymentErrorMsgs.IN_VALID_MODUELE_REF, serviceDescription.getName().
+ DeploymentErrorMsgs.IN_VALID_MODUELE_REF, axisService.getName().
getLocalPart(), ((QName) list.get(i)).getLocalPart()));
}
}
- HashMap opeartions = serviceDescription.getOperations();
+ HashMap opeartions = axisService.getOperations();
Collection opCol = opeartions.values();
for (Iterator iterator = opCol.iterator(); iterator.hasNext();) {
- OperationDescription opDesc = (OperationDescription) iterator.next();
+ AxisOperation opDesc = (AxisOperation) iterator.next();
ArrayList modules = opDesc.getModuleRefs();
for (int i = 0; i < modules.size(); i++) {
QName moduleName = (QName) modules.get(i);
@@ -429,9 +429,9 @@
}
}
- serviceMetaData.addService(serviceDescription);
+ axisServiceMetaData.addService(axisService);
}
- axisConfig.addServiceGroup(serviceMetaData);
+ axisConfig.addServiceGroup(axisServiceMetaData);
}
/**
@@ -441,7 +441,7 @@
* @param axisService
* @throws org.apache.axis2.AxisFault
*/
- private void loadServiceProperties(ServiceDescription axisService) throws AxisFault {
+ private void loadServiceProperties(AxisService axisService) throws AxisFault {
Flow inflow = axisService.getInFlow();
if (inflow != null) {
addFlowHandlers(inflow);
@@ -573,9 +573,9 @@
String serviceStatus = "";
try {
archiveReader.processWSDLs(currentArchiveFile,this);
- // ServiceDescription service = archiveReader.createService(currentArchiveFile.getAbsolutePath());
- ServiceGroupDescription sericeGroup =
- new ServiceGroupDescription(axisConfig);
+ // AxisService service = archiveReader.createService(currentArchiveFile.getAbsolutePath());
+ AxisServiceGroup sericeGroup =
+ new AxisServiceGroup(axisConfig);
archiveReader.processServiceGroup(currentArchiveFile.getAbsolutePath(),
this,
sericeGroup,explodedDir);
@@ -723,12 +723,12 @@
this.phasesinfo = phasesinfo;
}
- /* public ServiceDescription deployService(ClassLoader classLoder, InputStream serviceStream, String servieName) throws DeploymentException {
- ServiceDescription service = null;
+ /* public AxisService deployService(ClassLoader classLoder, InputStream serviceStream, String servieName) throws DeploymentException {
+ AxisService service = null;
try {
currentArchiveFileile = new ArchiveFileData(SERVICE, servieName);
currentArchiveFileile.setClassLoader(classLoder);
- service = new ServiceDescription();
+ service = new AxisService();
DeploymentParser schme = new DeploymentParser(serviceStream, this);
schme.parseServiceXML(service);
service = loadServiceProperties(service);
@@ -755,7 +755,7 @@
* @return
* @throws DeploymentException
*/
- public ServiceDescription buildService(ServiceDescription axisService,
+ public AxisService buildService(AxisService axisService,
InputStream serviceInputStream,
ClassLoader classLoader) throws DeploymentException {
try {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Tue Oct 25 21:29:17 2005
@@ -17,10 +17,10 @@
package org.apache.axis2.deployment;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.Flow;
import org.apache.axis2.description.FlowImpl;
import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.ParameterImpl;
import org.apache.axis2.description.ParameterInclude;
@@ -243,7 +243,7 @@
protected void processOpeasrtionModuleRefs(Iterator moduleRefs
- , OperationDescription opeartion) throws DeploymentException {
+ , AxisOperation opeartion) throws DeploymentException {
try {
while (moduleRefs.hasNext()) {
OMElement moduleref = (OMElement) moduleRefs.next();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java Tue Oct 25 21:29:17 2005
@@ -16,16 +16,16 @@
package org.apache.axis2.deployment;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.deployment.util.PhasesInfo;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisOperationFactory;
+import org.apache.axis2.description.InOnlyAxisOperation;
import org.apache.axis2.description.ModuleDescription;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.InOnlyOperationDescription;
-import org.apache.axis2.description.OperationDescriptionFactory;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMAttribute;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -117,7 +117,7 @@
Iterator op_itr = moduleElement.getChildrenWithName(new QName(OPRATIONST));
ArrayList opeartions = processOpeartions(op_itr);
for (int i = 0; i < opeartions.size(); i++) {
- OperationDescription opeartion = (OperationDescription) opeartions.get(i);
+ AxisOperation opeartion = (AxisOperation) opeartions.get(i);
module.addOperation(opeartion);
}
@@ -145,24 +145,24 @@
OMAttribute op_mep_att = operation.getAttribute(
new QName(MEP));
String mepURL =null;
- OperationDescription op_descrip;
+ AxisOperation op_descrip;
if(op_mep_att !=null){
mepURL= op_mep_att.getAttributeValue();
}
if(mepURL == null){
// assuming in-out mep
- op_descrip = new InOnlyOperationDescription();
+ op_descrip = new InOnlyAxisOperation();
} else {
try {
- op_descrip = OperationDescriptionFactory.getOperetionDescription(mepURL);
+ op_descrip = AxisOperationFactory.getOperetionDescription(mepURL);
} catch (AxisFault axisFault) {
throw new DeploymentException(Messages.getMessage(Messages.getMessage(
DeploymentErrorMsgs.OPERATION_PROCESS_ERROR,axisFault.getMessage())));
}
}
String opname = op_name_att.getAttributeValue();
-// OperationDescription op_descrip = new OperationDescription();
+// AxisOperation op_descrip = new AxisOperation();
op_descrip.setName(new QName(opname));
//Opeartion Paramters
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Tue Oct 25 21:29:17 2005
@@ -19,7 +19,13 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisOperationFactory;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.InOutAxisOperation;
+import org.apache.axis2.description.ModuleConfiguration;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ParameterInclude;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMAttribute;
@@ -45,15 +51,15 @@
public class ServiceBuilder extends DescriptionBuilder{
- private ServiceDescription service;
+ private AxisService service;
public ServiceBuilder(InputStream serviceInputSteram,
- DeploymentEngine engine,ServiceDescription service) {
+ DeploymentEngine engine,AxisService service) {
super(serviceInputSteram, engine);
this.service = service;
}
- public ServiceBuilder(DeploymentEngine engine,ServiceDescription service) {
+ public ServiceBuilder(DeploymentEngine engine,AxisService service) {
this.service = service;
super.engine = engine;
}
@@ -80,9 +86,9 @@
descriptionValue.serialize(new
OMOutputImpl(XMLOutputFactory.newInstance().createXMLStreamWriter(writer)));
writer.flush();
- service.setServiceDescription(writer.toString());
+ service.setAxisServiceName(writer.toString());
} else {
- service.setServiceDescription(descriptionElement.getText());
+ service.setAxisServiceName(descriptionElement.getText());
}
}
@@ -121,7 +127,7 @@
new QName(OPRATIONST));
ArrayList ops = processOpeartions(opeartinsItr);
for (int i = 0; i < ops.size(); i++) {
- OperationDescription opeartionDesc = (OperationDescription) ops.get(i);
+ AxisOperation opeartionDesc = (AxisOperation) ops.get(i);
ArrayList paramters = opeartionDesc.getParameters();
// Adding wsa-maping into service
@@ -173,25 +179,25 @@
String opname = op_name_att.getAttributeValue();
WSDLOperation wsdlOperation =service.getWSDLOPOperation(new QName(opname));
-// OperationDescription op_descrip = service.getOperation(new QName(opname));
- OperationDescription op_descrip = null;
+// AxisOperation op_descrip = service.getOperation(new QName(opname));
+ AxisOperation op_descrip = null;
if(wsdlOperation == null){
if(mepurl == null){
// assumed MEP is in-out
- op_descrip = new InOutOperationDescrition();
+ op_descrip = new InOutAxisOperation();
} else {
- op_descrip =OperationDescriptionFactory.getOperetionDescription(mepurl);
+ op_descrip =AxisOperationFactory.getOperetionDescription(mepurl);
}
-// op_descrip = new OperationDescription();
+// op_descrip = new AxisOperation();
op_descrip.setName(new QName(opname));
log.info(Messages.getMessage(DeploymentErrorMsgs.OP_NOT_FOUN_IN_WSDL, opname));
} else {
//craeting opeartion from existing opeartion
String mep = wsdlOperation.getMessageExchangePattern();
if(mep == null) {
- op_descrip = new InOutOperationDescrition(wsdlOperation);
+ op_descrip = new InOutAxisOperation(wsdlOperation);
} else {
- op_descrip =OperationDescriptionFactory.getOperetionDescription(mep);
+ op_descrip =AxisOperationFactory.getOperetionDescription(mep);
op_descrip.setWsdlopeartion((WSDLOperationImpl)wsdlOperation);
}
}
@@ -238,7 +244,7 @@
protected void processServiceModuleConfig(Iterator moduleConfigs ,
- ParameterInclude parent, ServiceDescription service)
+ ParameterInclude parent, AxisService service)
throws DeploymentException {
while (moduleConfigs.hasNext()) {
OMElement moduleConfig = (OMElement) moduleConfigs.next();
@@ -259,7 +265,7 @@
}
protected void processOperationModuleConfig(Iterator moduleConfigs ,
- ParameterInclude parent, OperationDescription opeartion)
+ ParameterInclude parent, AxisOperation opeartion)
throws DeploymentException {
while (moduleConfigs.hasNext()) {
OMElement moduleConfig = (OMElement) moduleConfigs.next();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Tue Oct 25 21:29:17 2005
@@ -17,10 +17,10 @@
package org.apache.axis2.deployment;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.ModuleConfiguration;
import org.apache.axis2.description.ParameterInclude;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.ServiceGroupDescription;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMAttribute;
import org.apache.axis2.om.OMElement;
@@ -36,20 +36,20 @@
}
- public void populateServiceGroup(ServiceGroupDescription serviceGroup) throws DeploymentException {
+ public void populateServiceGroup(AxisServiceGroup axisServiceGroup) throws DeploymentException {
try {
//Processing service level paramters
Iterator itr = servcice.getChildrenWithName(
new QName(PARAMETERST));
- processParameters(itr,serviceGroup,serviceGroup.getParent());
+ processParameters(itr,axisServiceGroup,axisServiceGroup.getParent());
Iterator moduleConfigs = servcice.getChildrenWithName(new QName(MODULECONFIG));
- processServiceModuleConfig(moduleConfigs,serviceGroup.getParent(),serviceGroup);
+ processServiceModuleConfig(moduleConfigs,axisServiceGroup.getParent(),axisServiceGroup);
//processing servicewide modules which required to engage gloabbly
Iterator moduleRefs = servcice.getChildrenWithName(
new QName(MODULEST));
- processModuleRefs(moduleRefs,serviceGroup);
+ processModuleRefs(moduleRefs,axisServiceGroup);
Iterator serviceitr = servcice.getChildrenWithName(new QName(SERVICE_ELEMENT));
while (serviceitr.hasNext()) {
@@ -62,18 +62,18 @@
throw new DeploymentException(Messages.getMessage(
DeploymentErrorMsgs.SEERVICE_NAME_ERROR));
} else {
- ServiceDescription serviceDecs = engine.getCurrentFileItem().getService(
+ AxisService axisService = engine.getCurrentFileItem().getService(
serviceName);
- if(serviceDecs == null){
- serviceDecs = new ServiceDescription(new QName(serviceName));
- engine.getCurrentFileItem().addService(serviceDecs);
- serviceDecs.setName(new QName(serviceName));
+ if(axisService == null){
+ axisService = new AxisService(new QName(serviceName));
+ engine.getCurrentFileItem().addService(axisService);
+ axisService.setName(new QName(serviceName));
}
// the service that has to be deploy
- engine.getCurrentFileItem().getDeploybleServices().add(serviceDecs);
- serviceDecs.setParent(serviceGroup);
- serviceDecs.setClassLoader(engine.getCurrentFileItem().getClassLoader());
- ServiceBuilder serviceBuilder = new ServiceBuilder(engine,serviceDecs);
+ engine.getCurrentFileItem().getDeploybleServices().add(axisService);
+ axisService.setParent(axisServiceGroup);
+ axisService.setClassLoader(engine.getCurrentFileItem().getClassLoader());
+ ServiceBuilder serviceBuilder = new ServiceBuilder(engine,axisService);
serviceBuilder.populateService(service);
}
}
@@ -85,7 +85,7 @@
}
protected void processServiceModuleConfig(Iterator moduleConfigs ,
- ParameterInclude parent, ServiceGroupDescription service)
+ ParameterInclude parent, AxisServiceGroup axisService)
throws DeploymentException {
while (moduleConfigs.hasNext()) {
OMElement moduleConfig = (OMElement) moduleConfigs.next();
@@ -100,7 +100,7 @@
new ModuleConfiguration(new QName(module),parent);
Iterator paramters= moduleConfig.getChildrenWithName(new QName(PARAMETERST));
processParameters(paramters,moduleConfiguration,parent);
- service.addModuleConfig(moduleConfiguration);
+ axisService.addModuleConfig(moduleConfiguration);
}
}
}
@@ -110,7 +110,7 @@
* @param moduleRefs <code>java.util.Iterator</code>
* @throws DeploymentException <code>DeploymentException</code>
*/
- protected void processModuleRefs(Iterator moduleRefs ,ServiceGroupDescription serviceGroup)
+ protected void processModuleRefs(Iterator moduleRefs ,AxisServiceGroup axisServiceGroup)
throws DeploymentException {
try {
while (moduleRefs.hasNext()) {
@@ -123,7 +123,7 @@
throw new DeploymentException(Messages.getMessage(
DeploymentErrorMsgs.MODEULE_NOT_FOUND, refName));
} else {
- serviceGroup.addModuleref(new QName(refName));
+ axisServiceGroup.addModuleref(new QName(refName));
}
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java Tue Oct 25 21:29:17 2005
@@ -17,10 +17,10 @@
package org.apache.axis2.deployment.repository.util;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.i18n.Messages;
import org.apache.axis2.deployment.DeploymentClassLoader;
import org.apache.axis2.deployment.DeploymentErrorMsgs;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.i18n.Messages;
import java.io.File;
import java.net.MalformedURLException;
@@ -188,12 +188,12 @@
}
- public void addService(ServiceDescription servicedesc){
+ public void addService(AxisService servicedesc){
service.put(servicedesc.getName().getLocalPart(),servicedesc);
}
- public ServiceDescription getService(String serviceName){
- return (ServiceDescription)service.get(serviceName);
+ public AxisService getService(String serviceName){
+ return (AxisService)service.get(serviceName);
}
public HashMap getService() {