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 [4/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/receivers/RawXMLINOnlyMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java Tue Oct 25 21:29:17 2005
@@ -19,7 +19,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
@@ -75,8 +75,8 @@
Class ImplClass = obj.getClass();
DependencyManager.configureBusinessLogicProvider(obj, msgContext, null);
- OperationDescription op = msgContext.getOperationContext()
- .getOperationDescription();
+ AxisOperation op = msgContext.getOperationContext()
+ .getAxisOperation();
if (op == null) {
throw new AxisFault(
"Operation is not located, if this is doclit style the SOAP-ACTION should specified via the SOAP Action to use the RawXMLProvider");
@@ -101,7 +101,7 @@
SOAPEnvelope envelope = null;
String style = msgContext.getOperationContext()
- .getOperationDescription()
+ .getAxisOperation()
.getStyle();
if (WSDLService.STYLE_DOC.equals(style)) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Tue Oct 25 21:29:17 2005
@@ -19,7 +19,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
@@ -74,12 +74,12 @@
//Inject the Message Context if it is asked for
DependencyManager.configureBusinessLogicProvider(obj, msgContext, newmsgContext);
- OperationDescription opDesc = msgContext.getOperationContext()
- .getOperationDescription();
+ AxisOperation opDesc = msgContext.getOperationContext()
+ .getAxisOperation();
Method method = findOperation(opDesc, ImplClass);
if (method != null) {
String style = msgContext.getOperationContext()
- .getOperationDescription()
+ .getAxisOperation()
.getStyle();
Class[] parameters = method.getParameterTypes();
@@ -144,7 +144,7 @@
}
- public Method findOperation(OperationDescription op, Class ImplClass) {
+ public Method findOperation(AxisOperation op, Class ImplClass) {
Method method = null;
String methodName = op.getName().getLocalPart();
Method[] methods = ImplClass.getMethods();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java Tue Oct 25 21:29:17 2005
@@ -20,10 +20,10 @@
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.http.server.AdminAppException;
@@ -335,7 +335,7 @@
String operationName = req.getParameter("operation");
if (serviceName != null && moduleName != null && operationName != null) {
try {
- OperationDescription od =
+ AxisOperation od =
configContext.getAxisConfiguration().getService(
serviceName)
.getOperation(new QName(operationName));
@@ -454,7 +454,7 @@
throws IOException {
if(req.getParameter("changePara")!=null){
String serviceName = req.getParameter("service");
- ServiceDescription service = configContext.getAxisConfiguration().
+ AxisService service = configContext.getAxisConfiguration().
getService(serviceName);
if(service !=null){
ArrayList service_para = service.getParameters();
@@ -466,14 +466,14 @@
HashMap operation = service.getOperations();
Collection op_col = operation.values();
for (Iterator iterator = op_col.iterator(); iterator.hasNext();) {
- OperationDescription operationDescription =
- (OperationDescription) iterator.next();
- String op_name = operationDescription.getName().getLocalPart();
- ArrayList operation_para = operationDescription.getParameters();
+ AxisOperation axisOperation =
+ (AxisOperation) iterator.next();
+ String op_name = axisOperation.getName().getLocalPart();
+ ArrayList operation_para = axisOperation.getParameters();
for (int i = 0; i < operation_para.size(); i++) {
Parameter parameter = (Parameter) operation_para.get(i);
String para = req.getParameter(op_name + "_" + parameter.getName());
- operationDescription.addParameter(
+ axisOperation.addParameter(
new ParameterImpl(parameter.getName(),para));
}
}
@@ -580,7 +580,7 @@
if (wsdl != null) {
res.setContentType("text/xml");
PrintWriter out_writer = new PrintWriter(out);
- ((ServiceDescription) serviceObj).printWSDL(out_writer,
+ ((AxisService) serviceObj).printWSDL(out_writer,
filePart);
out.flush();
out.close();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Tue Oct 25 21:29:17 2005
@@ -92,18 +92,18 @@
return newmsgCtx;
}
- public static ServiceDescription createSimpleService(QName serviceName,
+ public static AxisService createSimpleService(QName serviceName,
MessageReceiver messageReceiver,
String className,
QName opName) throws AxisFault {
- ServiceDescription service = new ServiceDescription(serviceName);
+ AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(
new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
className));
//todo I assumed in-out mep , this has to be imroved : Deepal
- OperationDescription axisOp = new InOutOperationDescrition(opName);
+ AxisOperation axisOp = new InOutAxisOperation(opName);
axisOp.setMessageReceiver(messageReceiver);
axisOp.setStyle(WSDLService.STYLE_RPC);
service.addOperation(axisOp);
@@ -111,7 +111,7 @@
}
// public static ServiceContext createServiceContext(
- // ServiceDescription service,
+ // AxisService service,
// ConfigurationContext engineContext)
// throws AxisFault {
// ServiceContext serviceContext = new ServiceContext(service, engineContext);
@@ -119,7 +119,7 @@
// return serviceContext;
// }
- public static ServiceDescription createSimpleService(QName serviceName,
+ public static AxisService createSimpleService(QName serviceName,
String className,
QName opName) throws AxisFault {
return createSimpleService(serviceName,
@@ -137,10 +137,10 @@
// }
// }
public static void resolvePhases(AxisConfiguration axisconfig,
- ServiceDescription serviceDesc)
+ AxisService axisService)
throws AxisFault, PhaseException {
//todo we do not need this
-// PhaseResolver pr = new PhaseResolver(axisconfig, serviceDesc);
+// PhaseResolver pr = new PhaseResolver(axisconfig, axisService);
// pr.buildchains();
// fixing the BUG AXIS2-278
// we do not need to do this , since when adding a service this automatically done
@@ -189,39 +189,39 @@
AxisConfiguration registry =
messageContext.getSystemContext().getAxisConfiguration();
if (serviceNameAndGroupStrings[0] != null) {
- ServiceGroupDescription serviceGroup = registry.getServiceGroup(serviceNameAndGroupStrings[0]);
+ AxisServiceGroup axisServiceGroup = registry.getServiceGroup(serviceNameAndGroupStrings[0]);
String serviceNameStr = "";
if (serviceNameAndGroupStrings.length == 1) {
// This means user has not given a service name.
// the notations is ...../axis2/services/<ServiceGroupName>
serviceNameStr = serviceNameAndGroupStrings[0];
}
- ServiceDescription serviceDescription = registry.getService(serviceNameStr);
- if (serviceGroup != null && serviceDescription != null) {
- messageContext.setServiceGroupDescription(serviceGroup);
- messageContext.setServiceDescription(serviceDescription);
+ AxisService axisService = registry.getService(serviceNameStr);
+ if (axisServiceGroup != null && axisService != null) {
+ messageContext.setAxisServiceGroup(axisServiceGroup);
+ messageContext.setAxisService(axisService);
}
}
}
}
- public static ServiceContext fillContextInformation(OperationDescription operationDesc, ServiceDescription serviceDesc, ConfigurationContext configurationContext) throws AxisFault {
+ public static ServiceContext fillContextInformation(AxisOperation axisOperation, AxisService axisService, ConfigurationContext configurationContext) throws AxisFault {
MessageContext msgContext;
// 2. if null, create new opCtxt
- OperationContext operationContext = new OperationContext(operationDesc);
-// OperationContext operationContext = OperationContextFactory.createOperationContext(operationDesc.getAxisSpecifMEPConstant(), operationDesc);
+ OperationContext operationContext = new OperationContext(axisOperation);
+// OperationContext operationContext = OperationContextFactory.createOperationContext(axisOperation.getAxisSpecifMEPConstant(), axisOperation);
// fill the service group context and service context info
- return fillServiceContextAndServiceGroupContext(serviceDesc, configurationContext);
+ return fillServiceContextAndServiceGroupContext(axisService, configurationContext);
}
- private static ServiceContext fillServiceContextAndServiceGroupContext(ServiceDescription serviceDesc, ConfigurationContext configurationContext) throws AxisFault {
+ private static ServiceContext fillServiceContextAndServiceGroupContext(AxisService axisService, ConfigurationContext configurationContext) throws AxisFault {
String serviceGroupContextId = UUIDGenerator.getUUID();
- ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configurationContext, serviceDesc.getParent());
+ ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configurationContext, axisService.getParent());
serviceGroupContext.setId(serviceGroupContextId);
configurationContext.registerServiceGroupContext(serviceGroupContext);
- return new ServiceContext(serviceDesc, serviceGroupContext);
+ return new ServiceContext(axisService, serviceGroupContext);
}
public static ConfigurationContext getNewConfigurationContext(String repositry) throws Exception {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java Tue Oct 25 21:29:17 2005
@@ -18,18 +18,18 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.InOutOperationDescrition;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisConfigurationImpl;
import javax.xml.namespace.QName;
public class ContextHierarchyTest extends TestCase {
- private OperationDescription operationDescription;
- private ServiceDescription serviceDescription;
+ private AxisOperation axisOperation;
+ private AxisService axisService;
private AxisConfiguration axisConfiguration;
public ContextHierarchyTest(String arg0) {
@@ -37,23 +37,23 @@
}
protected void setUp() throws Exception {
- operationDescription = new InOutOperationDescrition(new QName("Temp"));
- serviceDescription = new ServiceDescription(new QName("Temp"));
+ axisOperation = new InOutAxisOperation(new QName("Temp"));
+ axisService = new AxisService(new QName("Temp"));
axisConfiguration = new AxisConfigurationImpl();
- serviceDescription.addOperation(operationDescription);
- axisConfiguration.addService(serviceDescription);
+ axisService.addOperation(axisOperation);
+ axisConfiguration.addService(axisService);
}
public void testCompleteHiracy() throws AxisFault {
ConfigurationContext configurationContext =
new ConfigurationContext(axisConfiguration);
- ServiceGroupContext serviceGroupContext = serviceDescription.getParent().getServiceGroupContext(configurationContext);
+ ServiceGroupContext serviceGroupContext = axisService.getParent().getServiceGroupContext(configurationContext);
ServiceContext serviceCOntext =
- serviceGroupContext.getServiceContext(serviceDescription.getName().getLocalPart());
+ serviceGroupContext.getServiceContext(axisService.getName().getLocalPart());
MessageContext msgctx =
new MessageContext(configurationContext);
OperationContext opContext =
- operationDescription.findOperationContext(msgctx,
+ axisOperation.findOperationContext(msgctx,
serviceCOntext);
msgctx.setServiceContext(serviceCOntext);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java Tue Oct 25 21:29:17 2005
@@ -4,9 +4,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.miheaders.RelatesTo;
import org.apache.axis2.deployment.DeploymentException;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.ServiceGroupDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEngine;
import org.apache.wsdl.WSDLConstants;
@@ -48,9 +48,9 @@
AxisConfiguration axisConfiguration;
AxisConfiguration newaxisConfiguration;
- ServiceGroupDescription serviceGroupDescription;
- ServiceDescription serviceDescription;
- OperationDescription operationDescription;
+ AxisServiceGroup axisServiceGroup;
+ AxisService axisService;
+ AxisOperation axisOperation;
QName serviceDescQName = new QName (SERVICE_NAME);
QName operationDescName = new QName (OPERATION_NAME);
@@ -61,14 +61,14 @@
ConfigurationContext configurationContext = builder.buildConfigurationContext(repo);
axisConfiguration =configurationContext.getAxisConfiguration();
- serviceGroupDescription = axisConfiguration.getServiceGroup(SERVICE_GROUP_NAME);
- serviceDescription = axisConfiguration.getService(SERVICE_NAME);
- ServiceGroupContext serviceGroupContext = serviceDescription.getParent().getServiceGroupContext(configurationContext);
+ axisServiceGroup = axisConfiguration.getServiceGroup(SERVICE_GROUP_NAME);
+ axisService = axisConfiguration.getService(SERVICE_NAME);
+ ServiceGroupContext serviceGroupContext = axisService.getParent().getServiceGroupContext(configurationContext);
serviceGroupContext.setId(SERVICE_GROUP_CONTEXT_ID);
configurationContext.registerServiceGroupContext(serviceGroupContext);
- ServiceContext serviceContext = serviceGroupContext.getServiceContext(serviceDescription.getName().getLocalPart());
+ ServiceContext serviceContext = serviceGroupContext.getServiceContext(axisService.getName().getLocalPart());
- operationDescription = serviceDescription.getOperation(operationDescName);
+ axisOperation = axisService.getOperation(operationDescName);
//setting message contexts
MessageContext inMessage = new MessageContext(configurationContext);
MessageContext outMessage = new MessageContext(configurationContext);
@@ -81,10 +81,10 @@
outMessage.setServiceGroupContext(serviceGroupContext);
inMessage.setServiceContext(serviceContext);
outMessage.setServiceContext(serviceContext);
- inMessage.setOperationDescription(operationDescription);
- outMessage.setOperationDescription(operationDescription);
+ inMessage.setAxisOperation(axisOperation);
+ outMessage.setAxisOperation(axisOperation);
- OperationContext operationContext = operationDescription.findOperationContext(inMessage,serviceContext);
+ OperationContext operationContext = axisOperation.findOperationContext(inMessage,serviceContext);
operationContext.addMessageContext(outMessage);
outMessage.setOperationContext(operationContext);
@@ -124,9 +124,9 @@
AxisConfiguration axisConfiguration1 = newConfigContext.getAxisConfiguration();
assertNotNull(axisConfiguration1);
- assertNotNull(operationContext1.getOperationDescription());
+ assertNotNull(operationContext1.getAxisOperation());
assertNotNull(serviceGroupcontext1.getDescription());
- assertNotNull(serviceContext1.getServiceConfig());
+ assertNotNull(serviceContext1.getAxisService());
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java Tue Oct 25 21:29:17 2005
@@ -19,10 +19,10 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.miheaders.RelatesTo;
-import org.apache.axis2.description.InOutOperationDescrition;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.ServiceGroupDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.wsdl.WSDLConstants;
@@ -50,9 +50,9 @@
File file = new File ("target/tempfile.tmp");
AxisConfiguration axisConfiguration;
- ServiceGroupDescription serviceGroupDescription;
- ServiceDescription serviceDescription;
- OperationDescription operationDescription;
+ AxisServiceGroup axisServiceGroup;
+ AxisService axisService;
+ AxisOperation axisOperation;
QName serviceDescQName = new QName (SERVICE_NAME);
QName operationDescName = new QName (OPERATION_NAME);
@@ -61,16 +61,16 @@
protected void setUp() throws Exception {
//Initializing descriptions
axisConfiguration = new AxisConfigurationImpl ();
- serviceGroupDescription = new ServiceGroupDescription (axisConfiguration);
- serviceGroupDescription.setServiceGroupName(SERVICE_GROUP_NAME);
- serviceDescription = new ServiceDescription (serviceDescQName);
- operationDescription = new InOutOperationDescrition (operationDescName);
+ axisServiceGroup = new AxisServiceGroup (axisConfiguration);
+ axisServiceGroup.setServiceGroupName(SERVICE_GROUP_NAME);
+ axisService = new AxisService (serviceDescQName);
+ axisOperation = new InOutAxisOperation (operationDescName);
//Creating links
- axisConfiguration.addServiceGroup(serviceGroupDescription);
- axisConfiguration.addService(serviceDescription);
- serviceGroupDescription.addService(serviceDescription);
- serviceDescription.addOperation(operationDescription);
+ axisConfiguration.addServiceGroup(axisServiceGroup);
+ axisConfiguration.addService(axisService);
+ axisServiceGroup.addService(axisService);
+ axisService.addOperation(axisOperation);
if (file.exists()) {
file.delete();
@@ -88,10 +88,10 @@
//Setting contexts.
ConfigurationContext configurationContext = new ConfigurationContext(axisConfiguration);
- ServiceGroupContext serviceGroupContext = serviceDescription.getParent().getServiceGroupContext(configurationContext);
+ ServiceGroupContext serviceGroupContext = axisService.getParent().getServiceGroupContext(configurationContext);
serviceGroupContext.setId(SERVICE_GROUP_CONTEXT_ID);
configurationContext.registerServiceGroupContext(serviceGroupContext);
- ServiceContext serviceContext = serviceGroupContext.getServiceContext(serviceDescription.getName().getLocalPart());
+ ServiceContext serviceContext = serviceGroupContext.getServiceContext(axisService.getName().getLocalPart());
//setting message contexts
MessageContext inMessage = new MessageContext(configurationContext);
@@ -105,10 +105,10 @@
outMessage.setServiceGroupContext(serviceGroupContext);
inMessage.setServiceContext(serviceContext);
outMessage.setServiceContext(serviceContext);
- inMessage.setOperationDescription(operationDescription);
- outMessage.setOperationDescription(operationDescription);
+ inMessage.setAxisOperation(axisOperation);
+ outMessage.setAxisOperation(axisOperation);
- OperationContext operationContext = operationDescription.findOperationContext(inMessage,serviceContext);
+ OperationContext operationContext = axisOperation.findOperationContext(inMessage,serviceContext);
operationContext.addMessageContext(outMessage);
outMessage.setOperationContext(operationContext);
@@ -166,9 +166,9 @@
AxisConfiguration axisConfiguration1 = configurationContext.getAxisConfiguration();
assertNotNull(axisConfiguration1);
- assertNotNull(operationContext1.getOperationDescription());
+ assertNotNull(operationContext1.getAxisOperation());
assertNotNull(serviceGroupcontext1.getDescription());
- assertNotNull(serviceContext1.getServiceConfig());
+ assertNotNull(serviceContext1.getAxisService());
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java Tue Oct 25 21:29:17 2005
@@ -19,7 +19,11 @@
import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.miheaders.RelatesTo;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.InOutAxisOperation;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.util.UUIDGenerator;
@@ -35,7 +39,7 @@
public void testMEPfindingOnRelatesTO() throws Exception {
- ServiceDescription serviceConfig = new ServiceDescription(new QName("TempSC"));
+ AxisService serviceConfig = new AxisService(new QName("TempSC"));
engineCtx.getAxisConfiguration().addService(serviceConfig);
ServiceGroupContext sgc = serviceConfig.getParent().getServiceGroupContext(engineCtx);
@@ -44,7 +48,7 @@
messageContext1.setMessageID(
UUIDGenerator.getUUID());
- OperationDescription axisOperation = new InOutOperationDescrition(
+ AxisOperation axisOperation = new InOutAxisOperation(
new QName("test"));
OperationContext operationContext1 = axisOperation.findOperationContext(
messageContext1, sessionContext);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServiceXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServiceXMLTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServiceXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServiceXMLTest.java Tue Oct 25 21:29:17 2005
@@ -17,7 +17,7 @@
package org.apache.axis2.deployment;
import org.apache.axis2.AbstractTestCase;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisService;
import javax.xml.stream.XMLStreamException;
import java.io.FileInputStream;
@@ -38,7 +38,7 @@
getTestResourceFile("deployment/BadService.xml"));
// DeploymentParser parser = new DeploymentParser(in, null);
- ServiceDescription axisService = new ServiceDescription();
+ AxisService axisService = new AxisService();
ServiceBuilder builder = new ServiceBuilder(in,null,axisService);
builder.populateService(builder.buildOM());
fail(
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java Tue Oct 25 21:29:17 2005
@@ -18,9 +18,9 @@
import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Flow;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.engine.AxisConfiguration;
import javax.xml.namespace.QName;
@@ -40,7 +40,7 @@
.getAxisConfiguration();
assertNotNull(er);
- ServiceDescription service = er.getService("service2");
+ AxisService service = er.getService("service2");
assertNotNull(service);
//commentd since there is no service based messgeReceivers
/*MessageReceiver provider = service.getMessageReceiver();
@@ -61,7 +61,7 @@
assertTrue(flow.getHandlerCount() > 0);
assertNotNull(service.getParameter("para2"));
- OperationDescription op = service.getOperation(new QName("opname"));
+ AxisOperation op = service.getOperation(new QName("opname"));
assertNotNull(op);
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java Tue Oct 25 21:29:17 2005
@@ -3,7 +3,7 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.AxisConfiguration;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -36,7 +36,7 @@
public void testServiceGroup() throws AxisFault {
ConfigurationContextFactory builder = new ConfigurationContextFactory();
ar = builder.buildConfigurationContext(repo).getAxisConfiguration();
- ServiceDescription servie = ar.getService("serevice1");
+ AxisService servie = ar.getService("serevice1");
assertNotNull(servie);
servie = ar.getService("serevice4");
assertNotNull(servie);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java Tue Oct 25 21:29:17 2005
@@ -19,8 +19,8 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContextFactory;
-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;
public class ServiceGroupTest extends TestCase {
AxisConfiguration ar;
@@ -34,11 +34,11 @@
}
public void testServiceGroup() throws AxisFault {
- ServiceGroupDescription sgd = ar.getServiceGroup("serviceGroup");
+ AxisServiceGroup sgd = ar.getServiceGroup("serviceGroup");
assertNotNull(sgd);
- ServiceDescription service1 = ar.getService("service1");
+ AxisService service1 = ar.getService("service1");
assertNotNull(service1);
- ServiceDescription service2 = ar.getService("service2");
+ AxisService service2 = ar.getService("service2");
assertNotNull(service2);
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java Tue Oct 25 21:29:17 2005
@@ -28,7 +28,7 @@
public class RegistryTest extends AbstractTestCase {
private AxisConfiguration reg = new AxisConfigurationImpl();
- ServiceDescription service = new ServiceDescription(
+ AxisService service = new AxisService(
new QName("Service1"));
public RegistryTest(String testName) {
@@ -47,7 +47,7 @@
reg.addMdoule(modlue);
QName serviceName = new QName("service");
- ServiceDescription service = new ServiceDescription(serviceName);
+ AxisService service = new AxisService(serviceName);
reg.addService(service);
assertSame(modlue, reg.getModule(moduleName));
@@ -77,7 +77,7 @@
}
public void testOpeartion() throws AxisFault {
- OperationDescription op = new InOutOperationDescrition(new QName("op"));
+ AxisOperation op = new InOutAxisOperation(new QName("op"));
op.setParent(service);
testParameteInClude(op);
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java Tue Oct 25 21:29:17 2005
@@ -26,7 +26,7 @@
// protected AxisConfiguration engineRegistry;
// protected QName serviceName = new QName("axis/services/NullService");
// protected QName opearationName = new QName("NullOperation");
-// protected ServiceDescription service;
+// protected AxisService service;
public AbstractEngineTest() {
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java Tue Oct 25 21:29:17 2005
@@ -21,7 +21,12 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.description.InOutAxisOperation;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.soap.SOAPFactory;
@@ -56,11 +61,11 @@
protected void setUp() throws Exception {
- ServiceDescription service = new ServiceDescription(serviceName);
+ AxisService service = new AxisService(serviceName);
service.setStyle(WSDLService.STYLE_DOC);
engineContext.getAxisConfiguration().addService(service);
- OperationDescription axisOp = new InOutOperationDescrition(operationName);
+ AxisOperation axisOp = new InOutAxisOperation(operationName);
axisOp.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Tue Oct 25 21:29:17 2005
@@ -20,13 +20,15 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.InOutAxisOperation;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
-import org.apache.wsdl.WSDLConstants;
import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
@@ -38,9 +40,9 @@
private AxisConfiguration engineRegistry;
private QName serviceName = new QName("axis/services/NullService");
private QName opearationName = new QName("NullOperation");
- private ServiceDescription service;
+ private AxisService service;
private ConfigurationContext engineContext;
- private OperationDescription axisOp;
+ private AxisOperation axisOp;
public EngineWithoutPhaseResolvingTest() {
}
@@ -60,9 +62,9 @@
TransportInDescription transportIn = new TransportInDescription(
new QName("null"));
- axisOp = new InOutOperationDescrition(opearationName);
+ axisOp = new InOutAxisOperation(opearationName);
- service = new ServiceDescription(serviceName);
+ service = new AxisService(serviceName);
axisOp.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
// TODO Auto-generated method stub
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java Tue Oct 25 21:29:17 2005
@@ -20,7 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.impl.llom.SOAPProcessingException;
@@ -35,7 +35,7 @@
public void testMesssageContext() throws AxisFault,
SOAPProcessingException {
AxisConfiguration er = new AxisConfigurationImpl();
- ServiceDescription servicesDesc = new ServiceDescription();
+ AxisService servicesDesc = new AxisService();
servicesDesc.setName(new QName("testService"));
er.addService(servicesDesc);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java Tue Oct 25 21:29:17 2005
@@ -21,10 +21,10 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.deployment.ServiceBuilder;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.ModuleConfiguration;
-import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ServiceDescription;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -65,7 +65,7 @@
ar = builder.buildConfigurationContext(repo).getAxisConfiguration();
- ServiceDescription service = new ServiceDescription();
+ AxisService service = new AxisService();
service.setName(new QName("testService"));
ar.addService(service);
InputStream in = new FileInputStream(repo + "/service1.xml");
@@ -77,7 +77,7 @@
Parameter para = moduleConfiguration.getParameter("Servie_module_para");
assertNotNull(para);
- OperationDescription op = service.getOperation("echoString");
+ AxisOperation op = service.getOperation("echoString");
assertNotNull(op);
moduleConfiguration = op.getModuleConfig(new QName("Op_Module"));
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java Tue Oct 25 21:29:17 2005
@@ -20,9 +20,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.deployment.DeploymentException;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.ModuleDescription;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.phaseresolver.PhaseException;
import javax.xml.namespace.QName;
@@ -43,9 +43,9 @@
ModuleDescription module = ac.getModule(new QName("module1"));
assertNotNull(module);
ac.engageModule(new QName("module1"));
- ServiceDescription service = ac.getService("service2");
+ AxisService service = ac.getService("service2");
assertNotNull(service);
- OperationDescription moduleOperation = service.getOperation(
+ AxisOperation moduleOperation = service.getOperation(
new QName("creatSeq"));
assertNotNull(moduleOperation);
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java Tue Oct 25 21:29:17 2005
@@ -18,7 +18,12 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.InOutAxisOperation;
+import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ParameterImpl;
import javax.xml.namespace.QName;
/**
@@ -36,7 +41,7 @@
para.setLocked(true);
reg.addParameter(para);
- ServiceDescription service = new ServiceDescription(new QName("Service1"));
+ AxisService service = new AxisService(new QName("Service1"));
reg.addService(service);
service.addParameter(para);
fail("This should fails with Parmter is locked can not overide");
@@ -69,10 +74,10 @@
para.setLocked(true);
reg.addParameter(para);
- ServiceDescription service = new ServiceDescription(new QName("Service1"));
+ AxisService service = new AxisService(new QName("Service1"));
reg.addService(service);
- OperationDescription opertion = new InOutOperationDescrition();
+ AxisOperation opertion = new InOutAxisOperation();
opertion.setParent(service);
opertion.addParameter(para);
fail("This should fails with Parmter is locked can not overide");
@@ -90,11 +95,11 @@
para.setName("PARA_NAME");
para.setLocked(true);
- ServiceDescription service = new ServiceDescription(new QName("Service1"));
+ AxisService service = new AxisService(new QName("Service1"));
reg.addService(service);
service.addParameter(para);
- OperationDescription opertion = new InOutOperationDescrition();
+ AxisOperation opertion = new InOutAxisOperation();
opertion.setParent(service);
opertion.addParameter(para);
fail("This should fails with Parmter is locked can not overide");
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterLocked.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterLocked.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterLocked.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterLocked.java Tue Oct 25 21:29:17 2005
@@ -22,8 +22,8 @@
import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.deployment.ModuleBuilder;
import org.apache.axis2.deployment.ServiceBuilder;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.ModuleDescription;
-import org.apache.axis2.description.ServiceDescription;
import javax.xml.stream.XMLStreamException;
import java.io.FileInputStream;
@@ -44,7 +44,7 @@
public void testOveride_Non_locked_Para_Service(){
try {
assertNotNull(ar);
- ServiceDescription service = new ServiceDescription();
+ AxisService service = new AxisService();
ar.addService(service);
InputStream in = new FileInputStream(repo + "/service_overide_non_locked_para.xml");
ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
@@ -65,7 +65,7 @@
public void testOveride_locked_Para_Service(){
try {
assertNotNull(ar);
- ServiceDescription service = new ServiceDescription();
+ AxisService service = new AxisService();
ar.addService(service);
InputStream in = new FileInputStream(repo + "/service_overide_locked_para.xml");
ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
@@ -86,7 +86,7 @@
public void testOveride_locked_Para_Operation(){
try {
assertNotNull(ar);
- ServiceDescription service = new ServiceDescription();
+ AxisService service = new AxisService();
ar.addService(service);
InputStream in = new FileInputStream(repo + "/op_overide_global_para.xml");
ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
@@ -107,7 +107,7 @@
public void testOveride_Service_locked_Para_Operation(){
try {
assertNotNull(ar);
- ServiceDescription service = new ServiceDescription();
+ AxisService service = new AxisService();
ar.addService(service);
InputStream in = new FileInputStream(repo + "/Op_overide_Service_para.xml");
ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java Tue Oct 25 21:29:17 2005
@@ -62,8 +62,8 @@
// public void testTransportReceiver(){
// ConfigurationContext configContext = new ConfigurationContext(new AxisConfigurationImpl());
-// ServiceDescription serviceDesc = new ServiceDescription(new QName("TempService"));
-// OperationDescription opDesc = new OperationDescription();
+// AxisService serviceDesc = new AxisService(new QName("TempService"));
+// AxisOperation opDesc = new AxisOperation();
// TCPServer tcpServer = new TCPServer();
// }
Modified: webservices/axis2/trunk/java/modules/core/webapp/EngageToServiceGroup.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/EngageToServiceGroup.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/EngageToServiceGroup.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/EngageToServiceGroup.jsp Tue Oct 25 21:29:17 2005
@@ -1,9 +1,8 @@
<%@ page contentType="text/html; charset=iso-8859-1" language="java" import="org.apache.axis2.Constants,
- org.apache.axis2.description.ModuleDescription,
- org.apache.axis2.description.ServiceGroupDescription,
+ org.apache.axis2.description.AxisServiceGroup,
java.util.Collection,
- java.util.HashMap,
- java.util.Iterator" errorPage="" %>
+ java.util.HashMap" errorPage="" %>
+<%@ page import="java.util.Iterator"%>
<jsp:include page="include/adminheader.jsp"></jsp:include>
<%
String status = (String)request.getSession().getAttribute(Constants.ENGAGE_STATUS);
@@ -12,13 +11,13 @@
Iterator servicesGroups = (Iterator)request.getSession().getAttribute(Constants.SERVICE_GROUP_MAP);
%>
<h1>Engage Module for a Service Group</h1>
-<p>To engage a module for a set of services grouped a service group, first select the module you want to engage and then select the service group you like the module to be engaged on and click "Engage".</p>
+<p>To engage a module for a set of services grouped a axisService group, first select the module you want to engage and then select the axisService group you like the module to be engaged on and click "Engage".</p>
<%
if (!moduleCol.iterator().hasNext()) {%>
<p>No modules are present to be engaged.</p>
<%} else {
if (!servicesGroups.hasNext()) {%>
- <p>No service groups are present to be engaged.</p>
+ <p>No axisService groups are present to be engaged.</p>
<%} else {
%>
<form method="get" name="engaginModule" action="engageToServiceGroup">
@@ -31,8 +30,8 @@
<select name="modules">
<%
for (Iterator iterator = moduleCol.iterator(); iterator.hasNext();) {
- ModuleDescription description = (ModuleDescription) iterator.next();
- String modulename = description.getName().getLocalPart();
+ ModuleDescription axisOperation = (ModuleDescription) iterator.next();
+ String modulename = axisOperation.getName().getLocalPart();
%> <option align="left" value="<%=modulename%>"><%=modulename%></option>
<%
}
@@ -50,12 +49,12 @@
</tr>
<tr>
<td>
- <select name="service">
+ <select name="axisService">
<%
while(servicesGroups.hasNext()){
- ServiceGroupDescription groupDescription = (ServiceGroupDescription) servicesGroups.next();
- String serviceName = groupDescription.getServiceGroupName();
+ AxisServiceGroup axisServiceGroup = (AxisServiceGroup) servicesGroups.next();
+ String serviceName = axisServiceGroup.getServiceGroupName();
%> <option align="left" value="<%=serviceName%>"><%=serviceName%></option>
<%
}
Modified: webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp Tue Oct 25 21:29:17 2005
@@ -118,7 +118,7 @@
String category,
String classname,
String jarFile,
- String description,
+ String axisOperation,
String errorText,
String homePage) throws IOException {
try {
@@ -137,10 +137,10 @@
} else {
String location = getLocation(out, clazz);
if(location == null) {
- out.write("Found "+ description + " (" + classname + ")<br>");
+ out.write("Found "+ axisOperation + " (" + classname + ")<br>");
}
else {
- out.write("Found "+ description + " (" + classname + ") at " + location + "<br>");
+ out.write("Found "+ axisOperation + " (" + classname + ") at " + location + "<br>");
}
return 0;
}
@@ -204,14 +204,14 @@
int needClass(JspWriter out,
String classname,
String jarFile,
- String description,
+ String axisOperation,
String errorText,
String homePage) throws IOException {
return probeClass(out,
"<b>Error</b>",
classname,
jarFile,
- description,
+ axisOperation,
errorText,
homePage);
}
@@ -229,14 +229,14 @@
int wantClass(JspWriter out,
String classname,
String jarFile,
- String description,
+ String axisOperation,
String errorText,
String homePage) throws IOException {
return probeClass(out,
"<b>Warning</b>",
classname,
jarFile,
- description,
+ axisOperation,
errorText,
homePage);
}
@@ -427,20 +427,20 @@
%>
<p>
<B><I>Note:</I></B> Even if everything this page probes for is present, there is no guarantee your
-web service will work, because there are many configuration options that we do
+web axisService will work, because there are many configuration options that we do
not check for. These tests are <i>necessary</i> but not <i>sufficient</i>
-<h2>Examining echo service</h2>
+<h2>Examining echo axisService</h2>
<%
boolean serviceStatus = inVokeTheService();
if(serviceStatus){
%>
<p>
<font color="blue" >
- Found the Axis2 default Version service and Axis2 is working properly.Now you can drop a web service in
+ Found the Axis2 default Version axisService and Axis2 is working properly.Now you can drop a web axisService in
axis2/WEB-INF/services and refresh this page.
- Following output was produced while invoking the version service:
+ Following output was produced while invoking the version axisService:
<br>
<%= value%> </font>
</p>
@@ -450,7 +450,7 @@
%>
<p>
<font color="brown" >
- You can test the deployement functionality by uploading the echo service jar, which can be found in the
+ You can test the deployement functionality by uploading the echo axisService jar, which can be found in the
samples directory of the axis distribution.
<br>
</font>
Modified: webservices/axis2/trunk/java/modules/core/webapp/LeftFrame.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/LeftFrame.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/LeftFrame.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/LeftFrame.jsp Tue Oct 25 21:29:17 2005
@@ -154,7 +154,7 @@
</td>
<td>
- <a href="removeService">Undeploy service</a>
+ <a href="removeService">Undeploy axisService</a>
</td>
</tr>
<tr>
Modified: webservices/axis2/trunk/java/modules/core/webapp/ListServiceGroup.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/ListServiceGroup.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/ListServiceGroup.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/ListServiceGroup.jsp Tue Oct 25 21:29:17 2005
@@ -1,46 +1,48 @@
<%@ page import="org.apache.axis2.Constants" %>
-<%@ page import="org.apache.axis2.description.ServiceDescription" %>
-<%@ page import="org.apache.axis2.description.ServiceGroupDescription" %>
+<%@ page import="org.apache.axis2.description.AxisService" %>
+<%@ page import="org.apache.axis2.description.AxisServiceGroup" %>
<%@ page import="javax.xml.namespace.QName" %>
<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Iterator"%>
+<%@ page import="java.util.Iterator" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"></jsp:include>
+<jsp:include page="include/adminheader.jsp">
+</jsp:include>
<h1>Available Service Groups</h1>
<%
- Iterator serviceGroup = (Iterator)request.getSession().getAttribute(
+ Iterator axisServiceGroupIter = (Iterator) request.getSession().getAttribute(
Constants.SERVICE_GROUP_MAP);
- while(serviceGroup.hasNext()){
- ServiceGroupDescription groupDescription = (ServiceGroupDescription) serviceGroup.next();
- String groupName = groupDescription.getServiceGroupName();
- ArrayList modules = groupDescription.getServiceGroupModules();
- Iterator service = groupDescription.getServices();
+ while (axisServiceGroupIter.hasNext()) {
+ AxisServiceGroup axisServiceGroup = (AxisServiceGroup) axisServiceGroupIter.next();
+ String groupName = axisServiceGroup.getServiceGroupName();
+ ArrayList modules = axisServiceGroup.getServiceGroupModules();
+ Iterator axisServiceIter = axisServiceGroup.getServices();
%>
<h2><%=groupName%></h2><ul>
<%
- while(service.hasNext()){
- ServiceDescription serviceDescription = (ServiceDescription) service.next();
- String serviceName = serviceDescription.getName().getLocalPart();
+ while (axisServiceIter.hasNext()){
+ AxisService axisService = (AxisService) axisServiceIter.next();
+ String serviceName = axisService.getAxisServiceName();
%>
<li><font color="blue"><a href="listGroupService.jsp?serviceName=<%=serviceName%>">
- <%=serviceName%> </a></font></li>
+ <%=serviceName%></a></font></li>
<%
}
%>
</ul>
<%
- if(modules.size() >0){
+ if (modules.size() > 0) {
%>
<I>Engaged modules</I><ul>
-<%
- for (int i = 0; i < modules.size(); i++) {
- QName modulDesc = (QName)modules.get(i);
-%>
- <li><%=modulDesc.getLocalPart()%></li>
-<%
- }
- %></ul><%
- }
+ <%
+ for (int i = 0; i < modules.size(); i++) {
+ QName modulDesc = (QName) modules.get(i);
+ %>
+ <li><%=modulDesc.getLocalPart()%></li>
+ <%
+ }
+ %></ul><%
+ }
}
%>
-<jsp:include page="include/adminfooter.jsp"></jsp:include>
\ No newline at end of file
+<jsp:include page="include/adminfooter.jsp">
+</jsp:include>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/core/webapp/RemoveService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/RemoveService.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/RemoveService.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/RemoveService.jsp Tue Oct 25 21:29:17 2005
@@ -1,32 +1,32 @@
<%@ page import="org.apache.axis2.Constants,
- org.apache.axis2.description.ServiceDescription,
+ org.apache.axis2.description.AxisService,
java.util.Collection,
java.util.HashMap,
java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="include/adminheader.jsp"></jsp:include>
-<h1>Turn off service</h1>
+<h1>Turn off axisService</h1>
<form method="get" name="serviceRemove" action="removeService">
<table width="100%" border="0">
<tr>
<td colspan="2" >
- <p>The service will be removed the from the running system, but if the system restarts then the service will be available again</p>
-<%-- <b>Remove Service :</b> The selected service will be removed from the file system and if the--%>
+ <p>The axisService will be removed the from the running system, but if the system restarts then the axisService will be available again</p>
+<%-- <b>Remove Service :</b> The selected axisService will be removed from the file system and if the--%>
<%-- system restart it wont be there next time--%>
</td>
</tr>
<tr>
<td width="20%"> Select Service : </td>
<td width="80%">
- <select name="service" class="selectBoxes" >
+ <select name="axisService" class="selectBoxes" >
<%
HashMap services = (HashMap)request.getSession().getAttribute(Constants.SERVICE_MAP);
Collection col = services.values();
for (Iterator iterator = col.iterator(); iterator.hasNext();) {
- ServiceDescription serviceDescription = (ServiceDescription) iterator.next();
- %> <option value="<%=serviceDescription.getName().getLocalPart()%>">
- <%=serviceDescription.getName().getLocalPart()%></option> <%
+ AxisService axisServicesService) iterator.next();
+ %> <option value="<%=axisServicee().getLocalPart()%>">
+ <%=axisServicee().getLocalPart()%></option> <%
}
%>
</td>
Modified: webservices/axis2/trunk/java/modules/core/webapp/SelectService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/SelectService.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/SelectService.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/SelectService.jsp Tue Oct 25 21:29:17 2005
@@ -1,5 +1,5 @@
<%@ page import="org.apache.axis2.Constants,
- org.apache.axis2.description.ServiceDescription,
+ org.apache.axis2.description.AxisService,
java.util.Collection,
java.util.HashMap,
java.util.Iterator"%>
@@ -41,17 +41,17 @@
action = "listOperations";
buttonName = " View Operations";
heading = "Select a Service to view Operation specific Chains";
- disc = "Select a service from the combo and click on the 'View Operations' button to view Operation specific Chains.";
+ disc = "Select a axisService from the combo and click on the 'View Operations' button to view Operation specific Chains.";
} else if(status != null && status.equals("VIEW")){
buttonName = " View ";
action = "viewServiceHandlers";
heading = "Select a Service to view Service Handlers";
- disc = "Select a service from the combo and click on the 'View' button to view Service Handlers.";
+ disc = "Select a axisService from the combo and click on the 'View' button to view Service Handlers.";
} else if (status != null && status.equals("SERVICE_PARAMETER")){
buttonName = " Edit Parameters ";
action = Constants.EDIR_SERVICE_PARA;
heading = "Select a Service to Edit Parameters";
- disc = "Select a service from the combo and click on the 'Edit Parameters' button to Edit Parameters.";
+ disc = "Select a axisService from the combo and click on the 'Edit Parameters' button to Edit Parameters.";
}
%>
<h1><%=heading%></h1>
@@ -60,12 +60,12 @@
<table border="0" width="50%" cellspacing="1" cellpadding="1">
<tr>
<td width="35%">Select a Service :</td><td width="65%">
- <select name="service">
+ <select name="axisService">
<%
HashMap services = (HashMap)request.getSession().getAttribute(Constants.SERVICE_MAP);
Collection serviceCol = services.values();
for (Iterator iterator = serviceCol.iterator(); iterator.hasNext();) {
- ServiceDescription axisService = (ServiceDescription)iterator.next();
+ AxisService axisService = (AxisService)iterator.next();
String serviceName = axisService.getName().getLocalPart();
%> <option align="left" value="<%=serviceName%>"><%=serviceName%></option>
<%
Modified: webservices/axis2/trunk/java/modules/core/webapp/ServiceParaEdit.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/ServiceParaEdit.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/ServiceParaEdit.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/ServiceParaEdit.jsp Tue Oct 25 21:29:17 2005
@@ -1,7 +1,5 @@
<%@ page import="org.apache.axis2.Constants,
- org.apache.axis2.description.OperationDescription,
- org.apache.axis2.description.Parameter,
- org.apache.axis2.description.ServiceDescription,
+ org.apache.axis2.description.AxisOperation,
java.util.ArrayList,
java.util.Collection,
java.util.HashMap,
@@ -11,23 +9,23 @@
<h1>Edit Service Parameters</h1>
<form method="get" name="editServicepara" action="editServicepara">
<%
- ServiceDescription service = (ServiceDescription)request.getSession().
+ AxisService axisService = (AxisService)request.getSession().
getAttribute(Constants.SERVICE);
- if(service != null ){
+ if(axisService != null ){
%> <table width="100%">
<tr>
<td colspan="2" ><b>
<%
- String servicName = service.getName().getLocalPart();
+ String servicName = axisService.getName().getLocalPart();
%>Service Parameters :: <%=servicName%>
</b></td>
</tr>
<tr>
- <td colspan="2" ><input style="display:none" name="service" value="<%=servicName%>"></td>
+ <td colspan="2" ><input style="display:none" name="axisService" value="<%=servicName%>"></td>
</tr>
<%
- ArrayList service_para = service.getParameters();
+ ArrayList service_para = axisService.getParameters();
for (int i = 0; i < service_para.size(); i++) {
Parameter parameter = (Parameter) service_para.get(i);
%>
@@ -39,7 +37,7 @@
</tr>
<%
}
- HashMap operations = service.getOperations();
+ HashMap operations = axisService.getOperations();
Collection ops = operations.values();
if(ops.size() >0){
%>
@@ -56,8 +54,8 @@
ArrayList op_paras ;
for (Iterator iterator = ops.iterator(); iterator.hasNext();) {
- OperationDescription description = (OperationDescription) iterator.next();
- String opeartionName = description.getName().getLocalPart();
+ AxisOperation axisOperationon = (AxisOperation) iterator.next();
+ String opeartionName = axisOperationon.getName().getLocalPart();
%>
<tr>
<td colspan="2" > </td>
@@ -66,7 +64,7 @@
<td colspan="2" ><b>Operation : <%=opeartionName%></b></td>
</tr>
<%
- op_paras = description.getParameters();
+ op_paras = axisOperationon.getParameters();
for (int i = 0; i < op_paras.size(); i++) {
Parameter parameter = (Parameter) op_paras.get(i);
%>
Modified: webservices/axis2/trunk/java/modules/core/webapp/ViewServiceHandlers.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/ViewServiceHandlers.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/ViewServiceHandlers.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/ViewServiceHandlers.jsp Tue Oct 25 21:29:17 2005
@@ -1,6 +1,5 @@
<%@ page import="org.apache.axis2.Constants,
- org.apache.axis2.description.OperationDescription,
- org.apache.axis2.description.ServiceDescription,
+ org.apache.axis2.description.AxisOperation,
org.apache.axis2.engine.Handler,
org.apache.axis2.engine.Phase,
java.util.ArrayList,
@@ -37,16 +36,16 @@
<jsp:include page="include/adminheader.jsp"></jsp:include>
<h1>View Operation specific Chains</h1>
<%
- ServiceDescription service = (ServiceDescription)request.getSession().
+ AxisService axisService = (AxisService)request.getSession().
getAttribute(Constants.SERVICE_HANDLERS);
- if(service != null ){
+ if(axisService != null ){
ArrayList handlers ;
- HashMap operations = service.getOperations();
+ HashMap operations = axisService.getOperations();
Collection ops = operations.values();
for (Iterator iterator = ops.iterator(); iterator.hasNext();) {
- OperationDescription description = (OperationDescription) iterator.next();
- %><h2>Operation Name : <%=description.getName().getLocalPart()%></h2><%
- ArrayList phases = description.getRemainingPhasesInFlow();
+ AxisOperation axisOperationon = (AxisOperation) iterator.next();
+ %><h2>Operation Name : <%=axisOperationon.getName().getLocalPart()%></h2><%
+ ArrayList phases = axisOperationon.getRemainingPhasesInFlow();
%>
<h3> In Flow </h3>
<ul>
@@ -71,7 +70,7 @@
%>
</ul>
<%
- phases = description.getPhasesInFaultFlow();
+ phases = axisOperationon.getPhasesInFaultFlow();
%>
<h3> In Fault Flow </h3>
<ul>
@@ -97,7 +96,7 @@
</ul>
<%
- phases = description.getPhasesOutFlow();
+ phases = axisOperationon.getPhasesOutFlow();
%>
<h3> Out Flow </h3>
<ul>
@@ -122,7 +121,7 @@
%>
</ul>
<%
- phases = description.getPhasesOutFaultFlow();
+ phases = axisOperationon.getPhasesOutFaultFlow();
%>
<h3> Out Fault Flow </h3>
<ul>
Modified: webservices/axis2/trunk/java/modules/core/webapp/enaggingtoanopeartion.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/enaggingtoanopeartion.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/enaggingtoanopeartion.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/enaggingtoanopeartion.jsp Tue Oct 25 21:29:17 2005
@@ -1,6 +1,6 @@
<%@ page contentType="text/html; charset=iso-8859-1" language="java" import="org.apache.axis2.Constants,
+ org.apache.axis2.description.AxisOperation,
org.apache.axis2.description.ModuleDescription,
- org.apache.axis2.description.OperationDescription,
java.util.Collection,
java.util.HashMap,
java.util.Iterator" errorPage="" %>
@@ -9,7 +9,7 @@
String status = (String)request.getSession().getAttribute(Constants.ENGAGE_STATUS);
%>
<h1>Engage Module for an Operation</h1>
-<p>To engage a module for a operation, first select the module you want to engage and then select the operation you like the module to be engaged on and click "Engage".</p>
+<p>To engage a module for a axisOperation, first select the module you want to engage and then select the axisOperation you like the module to be engaged on and click "Engage".</p>
<form method="get" name="engaginModule" action="listOperations">
<table border="0" width="100%" cellspacing="1" cellpadding="1">
<tr>
@@ -28,8 +28,8 @@
HashMap moduels = (HashMap)request.getSession().getAttribute(Constants.MODULE_MAP);
Collection moduleCol = moduels.values();
for (Iterator iterator = moduleCol.iterator(); iterator.hasNext();) {
- ModuleDescription description = (ModuleDescription) iterator.next();
- String modulename = description.getName().getLocalPart();
+ ModuleDescription axisOperation = (ModuleDescription) iterator.next();
+ String modulename = axisOperation.getName().getLocalPart();
%> <option align="left" value="<%=modulename%>"><%=modulename%></option>
<%
}
@@ -47,13 +47,13 @@
</tr>
<tr>
<td>
- <select name="operation">
+ <select name="axisOperation">
<%
HashMap operations = (HashMap)request.getSession().getAttribute(Constants.OPEARTION_MAP);
Collection serviceCol = operations.values();
for (Iterator iterator = serviceCol.iterator(); iterator.hasNext();) {
- OperationDescription operation = (OperationDescription)iterator.next();
- String opname = operation.getName().getLocalPart();
+ AxisOperation axisOperationtion = (AxisOperation)iterator.next();
+ String opname = axisOperationtion.getName().getLocalPart();
%> <option align="left" value="<%=opname%>"><%=opname%></option>
<%
}
Modified: webservices/axis2/trunk/java/modules/core/webapp/engagingglobally.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/engagingglobally.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/engagingglobally.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/engagingglobally.jsp Tue Oct 25 21:29:17 2005
@@ -45,8 +45,8 @@
HashMap moduels = (HashMap)request.getSession().getAttribute(Constants.MODULE_MAP);
Collection moduleCol = moduels.values();
for (Iterator iterator = moduleCol.iterator(); iterator.hasNext();) {
- ModuleDescription description = (ModuleDescription) iterator.next();
- String modulename = description.getName().getLocalPart();
+ ModuleDescription axisOperation = (ModuleDescription) iterator.next();
+ String modulename = axisOperation.getName().getLocalPart();
%> <option align="left" value="<%=modulename%>"><%=modulename%></option>
<%
}
Modified: webservices/axis2/trunk/java/modules/core/webapp/engagingtoaservice.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/engagingtoaservice.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/engagingtoaservice.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/engagingtoaservice.jsp Tue Oct 25 21:29:17 2005
@@ -1,6 +1,6 @@
<%@ page contentType="text/html; charset=iso-8859-1" language="java" import="org.apache.axis2.Constants,
+ org.apache.axis2.description.AxisService,
org.apache.axis2.description.ModuleDescription,
- org.apache.axis2.description.ServiceDescription,
java.util.Collection,
java.util.HashMap,
java.util.Iterator" errorPage="" %>
@@ -9,7 +9,7 @@
String status = (String)request.getSession().getAttribute(Constants.ENGAGE_STATUS);
%>
<h1>Engage Module for a Service</h1>
-<p>To engage a module for a service, first select the module you want to engage and then select the service you like the module to be engaged on and click "Engage".</p>
+<p>To engage a module for a axisService, first select the module you want to engage and then select the axisService you like the module to be engaged on and click "Engage".</p>
<form method="get" name="engaginModule" action="engageToService">
<table border="0" width="100%" cellspacing="1" cellpadding="1">
<tr>
@@ -28,8 +28,8 @@
HashMap moduels = (HashMap)request.getSession().getAttribute(Constants.MODULE_MAP);
Collection moduleCol = moduels.values();
for (Iterator iterator = moduleCol.iterator(); iterator.hasNext();) {
- ModuleDescription description = (ModuleDescription) iterator.next();
- String modulename = description.getName().getLocalPart();
+ ModuleDescription axisOperation = (ModuleDescription) iterator.next();
+ String modulename = axisOperation.getName().getLocalPart();
%> <option align="left" value="<%=modulename%>"><%=modulename%></option>
<%
}
@@ -47,12 +47,12 @@
</tr>
<tr>
<td>
- <select name="service">
+ <select name="axisService">
<%
HashMap services = (HashMap)request.getSession().getAttribute(Constants.SERVICE_MAP);
Collection serviceCol = services.values();
for (Iterator iterator = serviceCol.iterator(); iterator.hasNext();) {
- ServiceDescription axisService = (ServiceDescription)iterator.next();
+ AxisService axisService = (AxisService)iterator.next();
String serviceName = axisService.getName().getLocalPart();
%> <option align="left" value="<%=serviceName%>"><%=serviceName%></option>
<%
Modified: webservices/axis2/trunk/java/modules/core/webapp/globalModules.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/globalModules.jsp?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/globalModules.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/globalModules.jsp Tue Oct 25 21:29:17 2005
@@ -37,8 +37,8 @@
Collection moduleCol = (Collection)request.getSession().getAttribute(Constants.MODULE_MAP);
if(moduleCol != null && moduleCol.size() > 0) {
for (Iterator iterator = moduleCol.iterator(); iterator.hasNext();) {
- QName description = (QName) iterator.next();
- modulename = description.getLocalPart();
+ QName axisOperation = (QName) iterator.next();
+ modulename = axisOperation.getLocalPart();
if (!wroteUL){
wroteUL = true;
%>