You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2005/12/13 17:51:21 UTC
svn commit: r356539 [2/2] - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/databinding/extensions/
codegen/src/org/apache/axis2/rpc/
codegen/src/org/apache/axis2/wsdl/template/java/
codegen/test/org/apache/axis2/rpc/ core/src/or...
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Tue Dec 13 08:50:12 2005
@@ -184,7 +184,7 @@
*/
public synchronized void addService(AxisService service) throws AxisFault {
AxisServiceGroup axisServiceGroup = new AxisServiceGroup();
- axisServiceGroup.setServiceGroupName(service.getName().getLocalPart());
+ axisServiceGroup.setServiceGroupName(service.getName());
axisServiceGroup.setParent(this);
axisServiceGroup.addService(service);
addServiceGroup(axisServiceGroup);
@@ -196,15 +196,15 @@
AxisService description;
while (services.hasNext()) {
description = (AxisService) services.next();
- if (allservices.get(description.getName().getLocalPart()) != null) {
+ if (allservices.get(description.getName()) != null) {
throw new AxisFault("Two services can not have same name, a service with " +
- description.getName().getLocalPart() + " alredy exist in the system");
+ description.getName() + " alredy exist in the system");
}
}
services = axisServiceGroup.getServices();
while (services.hasNext()) {
description = (AxisService) services.next();
- allservices.put(description.getName().getLocalPart(), description);
+ allservices.put(description.getName(), description);
notifyObservers(AxisEvent.SERVICE_DEPLOY, description);
}
Iterator enModule = engagedModules.iterator();
@@ -454,7 +454,7 @@
Iterator servics = axisServiceGroup.getServices();
while (servics.hasNext()) {
AxisService axisService = (AxisService) servics.next();
- allservices.put(axisService.getName().getLocalPart(), axisService);
+ allservices.put(axisService.getName(), axisService);
}
}
return allservices;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Tue Dec 13 08:50:12 2005
@@ -30,7 +30,6 @@
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPFactory;
-import javax.xml.namespace.QName;
public abstract class AbstractMessageReceiver implements MessageReceiver {
public static final String SERVICE_CLASS = "ServiceClass";
@@ -46,40 +45,40 @@
* @throws AxisFault
*/
protected Object makeNewServiceObject(MessageContext msgContext)
- throws AxisFault {
+ throws AxisFault {
try {
String nsURI = msgContext.getEnvelope().getNamespace().getName();
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
fac = OMAbstractFactory.getSOAP12Factory();
} else if (
- SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
fac = OMAbstractFactory.getSOAP11Factory();
} else {
throw new AxisFault(Messages.getMessage("invalidSOAPversion"));
}
AxisService service =
- msgContext
- .getOperationContext()
- .getServiceContext()
- .getAxisService();
+ msgContext
+ .getOperationContext()
+ .getServiceContext()
+ .getAxisService();
ClassLoader classLoader = service.getClassLoader();
Parameter implInfoParam = service.getParameter(SERVICE_CLASS);
if (implInfoParam != null) {
Class implClass =
- Class.forName(
- ((String) implInfoParam.getValue()).trim(),
- true,
- classLoader);
+ Class.forName(
+ ((String) implInfoParam.getValue()).trim(),
+ true,
+ classLoader);
return implClass.newInstance();
} else {
throw new AxisFault(
- Messages.getMessage(
- "paramIsNotSpecified",
- "SERVICE_CLASS"));
+ Messages.getMessage(
+ "paramIsNotSpecified",
+ "SERVICE_CLASS"));
}
-
+
} catch (Exception e) {
throw AxisFault.makeFault(e);
}
@@ -93,37 +92,37 @@
* @throws AxisFault
*/
protected Object getTheImplementationObject(MessageContext msgContext)
- throws AxisFault {
+ throws AxisFault {
AxisService service =
- msgContext
- .getOperationContext()
- .getServiceContext()
- .getAxisService();
+ msgContext
+ .getOperationContext()
+ .getServiceContext()
+ .getAxisService();
Parameter scopeParam = service.getParameter(SCOPE);
- QName serviceName = service.getName();
+ String serviceName = service.getName();
if (scopeParam != null
- && Constants.SESSION_SCOPE.equals(scopeParam.getValue())) {
+ && Constants.SESSION_SCOPE.equals(scopeParam.getValue())) {
SessionContext sessionContext = msgContext.getSessionContext();
synchronized (sessionContext) {
Object obj =
- sessionContext.getProperty(serviceName.getLocalPart());
+ sessionContext.getProperty(serviceName);
if (obj == null) {
obj = makeNewServiceObject(msgContext);
- sessionContext.setProperty(serviceName.getLocalPart(), obj);
+ sessionContext.setProperty(serviceName, obj);
}
return obj;
}
} else if (
- scopeParam != null
- && Constants.APPLICATION_SCOPE.equals(scopeParam.getValue())) {
+ scopeParam != null
+ && Constants.APPLICATION_SCOPE.equals(scopeParam.getValue())) {
ConfigurationContext globalContext = msgContext.getConfigurationContext();
synchronized (globalContext) {
Object obj =
- globalContext.getProperty(serviceName.getLocalPart());
+ globalContext.getProperty(serviceName);
if (obj == null) {
obj = makeNewServiceObject(msgContext);
- globalContext.setProperty(serviceName.getLocalPart(), obj);
+ globalContext.setProperty(serviceName, obj);
}
return obj;
}
@@ -135,6 +134,6 @@
public SOAPFactory getSOAPFactory() {
return fac;
}
-
+
}
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=356539&r1=356538&r2=356539&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 Dec 13 08:50:12 2005
@@ -17,14 +17,12 @@
package org.apache.axis2.receivers;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.wsdl.WSDLService;
@@ -45,7 +43,6 @@
/**
* Field scope
*/
- private String scope;
/**
* Field method
@@ -55,13 +52,11 @@
/**
* Field classLoader
*/
- private ClassLoader classLoader;
/**
* Constructor RawXMLProvider
*/
public RawXMLINOnlyMessageReceiver() {
- scope = Constants.APPLICATION_SCOPE;
}
public void invokeBusinessLogic(MessageContext msgContext)
@@ -97,8 +92,7 @@
OMElement methodElement = msgContext.getEnvelope().getBody()
.getFirstElement();
- OMElement parmeter = null;
- SOAPEnvelope envelope = null;
+ OMElement parmeter;
String style = msgContext.getOperationContext()
.getAxisOperation()
@@ -108,17 +102,17 @@
parmeter = methodElement;
Object[] parms = new Object[]{parmeter};
//Need not have a return here
- method.invoke(obj, parms);
+ method.invoke(obj, parms);
} else if (WSDLService.STYLE_RPC.equals(style)) {
parmeter = methodElement.getFirstElement();
Object[] parms = new Object[]{parmeter};
// invoke the WebService
- method.invoke(obj, parms);
+ method.invoke(obj, parms);
} else {
- throw new AxisFault(Messages.getMessage("unknownStyle",style));
+ throw new AxisFault(Messages.getMessage("unknownStyle", style));
}
} else {
throw new AxisFault(Messages.getMessage("rawXmlProivdeIsLimited"));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java Tue Dec 13 08:50:12 2005
@@ -302,7 +302,7 @@
operations = axisService.getOperations();
operationsList = operations.values();
- temp += "<h3>" + axisService.getName().getLocalPart() +
+ temp += "<h3>" + axisService.getName() +
"</h3>";
if (operationsList.size() > 0) {
temp += "Available operations <ul>";
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=356539&r1=356538&r2=356539&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 Dec 13 08:50:12 2005
@@ -20,12 +20,7 @@
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.MessageInformationHeaders;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.ServiceGroupContext;
+import org.apache.axis2.context.*;
import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
@@ -87,10 +82,10 @@
}
public static AxisService createSimpleService(QName serviceName,
- MessageReceiver messageReceiver,
- String className,
- QName opName) throws AxisFault {
- AxisService service = new AxisService(serviceName);
+ MessageReceiver messageReceiver,
+ String className,
+ QName opName) throws AxisFault {
+ AxisService service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(
new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
@@ -114,8 +109,8 @@
// }
public static AxisService createSimpleService(QName serviceName,
- String className,
- QName opName) throws AxisFault {
+ String className,
+ QName opName) throws AxisFault {
return createSimpleService(serviceName,
new RawXMLINOutMessageReceiver(),
className,
@@ -134,9 +129,10 @@
/**
* Break a full path into pieces
+ *
* @param path
* @return an array where element [0] always contains the service, and element 1, if not null, contains
- * the path after the first element. all ? parameters are discarded.
+ * the path after the first element. all ? parameters are discarded.
*/
public static String[] parseRequestURLForServiceAndOperation(
String path) {
@@ -149,10 +145,10 @@
int serviceStart = index + Constants.REQUEST_URL_PREFIX.length();
service = path.substring(serviceStart + 1);
int queryIndex = service.indexOf('?');
- if(queryIndex>0) {
- service = service.substring(0,queryIndex);
+ if (queryIndex > 0) {
+ service = service.substring(0, queryIndex);
}
- int operationIndex= service.indexOf('/');
+ int operationIndex = service.indexOf('/');
if (operationIndex > 0) {
values[0] = service.substring(0, operationIndex);
values[1] = service.substring(operationIndex + 1);
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=356539&r1=356538&r2=356539&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 Dec 13 08:50:12 2005
@@ -39,7 +39,7 @@
protected void setUp() throws Exception {
axisOperation = new InOutAxisOperation(new QName("Temp"));
- axisService = new AxisService(new QName("Temp"));
+ axisService = new AxisService("Temp");
axisConfiguration = new AxisConfiguration();
axisService.addOperation(axisOperation);
axisConfiguration.addService(axisService);
@@ -51,7 +51,7 @@
ServiceGroupContext serviceGroupContext = new ServiceGroupContext(
configurationContext, axisService.getParent());
ServiceContext serviceContext = serviceGroupContext
- .getServiceContext(axisService.getName().getLocalPart());
+ .getServiceContext(axisService.getName());
MessageContext msgctx = new MessageContext(configurationContext);
OperationContext opContext = axisOperation.findOperationContext(msgctx,
serviceContext);
@@ -93,7 +93,6 @@
String value1 = "Val1";
String value2 = "value2";
String key2 = "key2";
- String value3 = "value";
configurationContext.setProperty(key1, value1);
assertEquals(value1, msgctx.getProperty(key1));
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=356539&r1=356538&r2=356539&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 Dec 13 08:50:12 2005
@@ -19,11 +19,7 @@
import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.RelatesTo;
-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.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.util.UUIDGenerator;
@@ -40,7 +36,7 @@
public void testMEPfindingOnRelatesTO() throws Exception {
- AxisService axisService = new AxisService(new QName("TempSC"));
+ AxisService axisService = new AxisService("TempSC");
configContext.getAxisConfiguration().addService(axisService);
ServiceGroupContext sgc = new ServiceGroupContext(configContext,
axisService.getParent());
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=356539&r1=356538&r2=356539&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 Dec 13 08:50:12 2005
@@ -20,7 +20,6 @@
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.engine.AxisConfiguration;
import javax.xml.namespace.QName;
@@ -53,13 +52,7 @@
assertNotNull(service.getName());
//no style for the service
// assertEquals(service.getStyle(),"rpc");
-
- Flow flow = service.getFaultInFlow();
- assertTrue(flow.getHandlerCount() > 0);
- flow = service.getInFlow();
- assertTrue(flow.getHandlerCount() > 0);
- flow = service.getOutFlow();
- assertTrue(flow.getHandlerCount() > 0);
+ //no need the following since
assertNotNull(service.getParameter("para2"));
AxisOperation op = service.getOperation(new QName("opname"));
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=356539&r1=356538&r2=356539&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 Dec 13 08:50:12 2005
@@ -27,8 +27,7 @@
public class RegistryTest extends AbstractTestCase {
private AxisConfiguration reg = new AxisConfiguration();
- AxisService service = new AxisService(
- new QName("Service1"));
+ AxisService service = new AxisService("Service1");
public RegistryTest(String testName) {
super(testName);
@@ -65,7 +64,6 @@
public void testService() throws AxisFault {
reg.addService(service);
testParameteInClude(service);
- testFlowIncludeTest(service);
}
public void testModule() throws AxisFault {
@@ -105,7 +103,7 @@
public void testHandlers() throws AxisFault {
Handler handler = new AbstractHandler() {
- public void invoke(MessageContext msgContext) throws AxisFault {
+ public void invoke(MessageContext msgContext) {
}
};
handler.init(new HandlerDescription());
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=356539&r1=356538&r2=356539&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 Dec 13 08:50:12 2005
@@ -26,7 +26,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
-import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -42,7 +41,7 @@
private MessageContext mc;
private ArrayList executedHandlers;
- public EnginePausingTest(String arg0) throws AxisFault {
+ public EnginePausingTest(String arg0) {
super(arg0);
executedHandlers = new ArrayList();
AxisConfiguration engineRegistry = new AxisConfiguration();
@@ -55,13 +54,12 @@
protected void setUp() throws Exception {
- AxisService service = new AxisService(serviceName);
- service.setStyle(WSDLService.STYLE_DOC);
+ AxisService service = new AxisService(serviceName.getLocalPart());
engineContext.getAxisConfiguration().addService(service);
AxisOperation axisOp = new InOutAxisOperation(operationName);
axisOp.setMessageReceiver(new MessageReceiver() {
- public void receive(MessageContext messgeCtx) throws AxisFault {
+ public void receive(MessageContext messgeCtx) {
}
});
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=356539&r1=356538&r2=356539&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 Dec 13 08:50:12 2005
@@ -21,22 +21,15 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-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.description.*;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
-import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
-import java.util.ArrayList;
public class EngineWithoutPhaseResolvingTest extends AbstractEngineTest {
private MessageContext mc;
- private ArrayList executedHandlers = new ArrayList();
private AxisConfiguration engineRegistry;
private QName serviceName = new QName("axis/services/NullService");
private QName operationName = new QName("NullOperation");
@@ -64,7 +57,7 @@
new QName("null"));
axisOp = new InOutAxisOperation(operationName);
- service = new AxisService(serviceName);
+ service = new AxisService(serviceName.getLocalPart());
axisOp.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
// TODO Auto-generated method stub
@@ -72,7 +65,6 @@
}
});
engineRegistry.addService(service);
- service.setStyle(WSDLService.STYLE_DOC);
service.addOperation(axisOp);
mc =
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=356539&r1=356538&r2=356539&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 Dec 13 08:50:12 2005
@@ -25,8 +25,6 @@
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPProcessingException;
-import javax.xml.namespace.QName;
-
public class MessageContextTest extends AbstractTestCase {
public MessageContextTest(String testName) {
super(testName);
@@ -36,7 +34,7 @@
SOAPProcessingException {
AxisConfiguration er = new AxisConfiguration();
AxisService servicesDesc = new AxisService();
- servicesDesc.setName(new QName("testService"));
+ servicesDesc.setName("testService");
er.addService(servicesDesc);
ConfigurationContext engineContext = new ConfigurationContext(er);
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=356539&r1=356538&r2=356539&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 Dec 13 08:50:12 2005
@@ -66,7 +66,7 @@
AxisService service = new AxisService();
- service.setName(new QName("testService"));
+ service.setName("testService");
ar.addService(service);
InputStream in = new FileInputStream(repo + "/service1.xml");
ServiceBuilder sbuilder = new ServiceBuilder(in, null, service);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java Tue Dec 13 08:50:12 2005
@@ -41,7 +41,7 @@
para.setLocked(true);
reg.addParameter(para);
- AxisService service = new AxisService(new QName("Service1"));
+ AxisService service = new AxisService("Service1");
reg.addService(service);
service.addParameter(para);
fail("This should fails with Parmter is locked can not overide");
@@ -74,7 +74,7 @@
para.setLocked(true);
reg.addParameter(para);
- AxisService service = new AxisService(new QName("Service1"));
+ AxisService service = new AxisService("Service1");
reg.addService(service);
AxisOperation opertion = new InOutAxisOperation();
@@ -95,7 +95,7 @@
para.setName("PARA_NAME");
para.setLocked(true);
- AxisService service = new AxisService(new QName("Service1"));
+ AxisService service = new AxisService("Service1");
reg.addService(service);
service.addParameter(para);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java Tue Dec 13 08:50:12 2005
@@ -65,7 +65,8 @@
QName opName = new QName("");
- AxisOperation opDesc = new OutInAxisOperation(opName);
+ AxisOperation opDesc = new OutInAxisOperation();
+ opDesc.setName(opName);
MessageContext retMsgCtx = call.invokeBlocking(opDesc, msgCtx);
//SOAPEnvelope responseEnvelop = replyContext.getEnvelope();
retEnv = retMsgCtx.getEnvelope();
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java Tue Dec 13 08:50:12 2005
@@ -52,7 +52,7 @@
AxisConfiguration axisConfig = new AxisConfiguration();
ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
MessageContext msgCtx = new MessageContext(configCtx);
- AxisOperation opDesc = new OutInAxisOperation(new QName(""));
+ AxisOperation opDesc = new OutInAxisOperation();
SOAPEnvelope requestEnvilope = util.getEchoSoapEnvelope();
msgCtx.setEnvelope(requestEnvilope);
MessageContext responseMCtx = call.invokeBlocking(opDesc, msgCtx);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java Tue Dec 13 08:50:12 2005
@@ -54,7 +54,7 @@
ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
MessageContext msgCtx = new MessageContext(configCtx);
- AxisOperation opDesc = new OutInAxisOperation(new QName(""));
+ AxisOperation opDesc = new OutInAxisOperation();
SOAPEnvelope requestEnvilope = util.getEchoSoapEnvelope();
msgCtx.setEnvelope(requestEnvilope);
MessageContext resMsgCtx = call.invokeBlocking(opDesc, msgCtx);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java Tue Dec 13 08:50:12 2005
@@ -79,7 +79,7 @@
LocalTransportReceiver.CONFIG_CONTEXT = new ConfigurationContext(
config);
- AxisService service = new AxisService(serviceName);
+ AxisService service = new AxisService(serviceName.getLocalPart());
service.addParameter(
new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
MessageContextEnabledEcho.class.getName()));
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java Tue Dec 13 08:50:12 2005
@@ -57,8 +57,6 @@
operationName);
- service.setInFlow(new MockFlow("service inflow", 4));
- service.setOutFlow(new MockFlow("service outflow", 5));
//service.setFaultInFlow(new MockFlow("service faultflow", 1));
ModuleDescription m1 = new ModuleDescription(
@@ -69,7 +67,8 @@
service.engageModule(m1,engineRegistry);
AxisOperation axisOperation = new OutInAxisOperation(
- operationName);
+ );
+ axisOperation.setName(operationName);
service.addOperation(axisOperation);
UtilServer.deployService(service);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java Tue Dec 13 08:50:12 2005
@@ -55,7 +55,7 @@
protected void setUp() throws Exception {
UtilServer.start();
- AxisService service = new AxisService(serviceName);
+ AxisService service = new AxisService(serviceName.getLocalPart());
AxisOperation axisOperation = new OutInAxisOperation(
operationName);
axisOperation.setMessageReceiver(new MessageReceiver() {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java Tue Dec 13 08:50:12 2005
@@ -37,7 +37,8 @@
AxisOperation axisConfig =
getServiceContext().getAxisService().getOperation(new QName(axisop));
if (axisConfig == null) {
- axisConfig = new OutInAxisOperation(new QName(axisop));
+ axisConfig = new OutInAxisOperation();
+ axisConfig.setName(new QName(axisop));
axisConfig.setRemainingPhasesInFlow(axisOperationTemplate.getRemainingPhasesInFlow());
axisConfig.setPhasesOutFlow(axisOperationTemplate.getPhasesOutFlow());
axisConfig.setPhasesInFaultFlow(axisOperationTemplate.getPhasesInFaultFlow());
@@ -57,7 +58,8 @@
AxisOperation axisConfig =
getServiceContext().getAxisService().getOperation(new QName(axisop));
if (axisConfig == null) {
- axisConfig = new OutInAxisOperation(new QName(axisop));
+ axisConfig = new OutInAxisOperation();
+ axisConfig.setName(new QName(axisop));
axisConfig.setRemainingPhasesInFlow(axisOperationTemplate.getRemainingPhasesInFlow());
axisConfig.setPhasesOutFlow(axisOperationTemplate.getPhasesOutFlow());
axisConfig.setPhasesInFaultFlow(axisOperationTemplate.getPhasesInFaultFlow());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Tue Dec 13 08:50:12 2005
@@ -139,7 +139,7 @@
configContext.getAxisConfiguration().addService(service);
return new ServiceGroupContext(configContext, service.getParent())
- .getServiceContext(service.getName().getLocalPart());
+ .getServiceContext(service.getName());
}
public static ServiceContext createAdressedEnabledClientSide(
@@ -161,7 +161,7 @@
configContext.getAxisConfiguration().addService(service);
return new ServiceGroupContext(configContext, service.getParent())
- .getServiceContext(service.getName().getLocalPart());
+ .getServiceContext(service.getName());
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java Tue Dec 13 08:50:12 2005
@@ -230,7 +230,7 @@
envelope.getBody().addChild(method);
MessageContext requestContext = new MessageContext(configContext);
- AxisService srevice = new AxisService(serviceName);
+ AxisService srevice = new AxisService(serviceName.getLocalPart());
srevice.addOperation(opdesc);
configContext.getAxisConfiguration().addService(srevice);
requestContext.setAxisService(service);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java Tue Dec 13 08:50:12 2005
@@ -109,9 +109,10 @@
engineRegistry = clientConfigContext.getAxisConfiguration();
}
AxisService clientService = new AxisService(
- serviceName);
+ serviceName.getLocalPart());
AxisOperation clientOperation = new OutInAxisOperation(
- operationName);
+ );
+ clientOperation.setName(operationName);
clientOperation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
envelope = messgeCtx.getEnvelope();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java Tue Dec 13 08:50:12 2005
@@ -77,9 +77,10 @@
new QName(Constants.TRANSPORT_MAIL)));
ml.start();
- AxisService service = new AxisService(serviceName);
+ AxisService service = new AxisService(serviceName.getLocalPart());
AxisOperation axisOperation = new OutInAxisOperation(
- operationName);
+ );
+ axisOperation.setName(operationName);
axisOperation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
envelope = messgeCtx.getEnvelope();
@@ -107,9 +108,10 @@
}
public void testOneWay() throws Exception {
- AxisService service = new AxisService(serviceName);
+ AxisService service = new AxisService(serviceName.getLocalPart());
AxisOperation axisOperation = new OutInAxisOperation(
- operationName);
+ );
+ axisOperation.setName(operationName);
axisOperation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
envelope = messgeCtx.getEnvelope();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java Tue Dec 13 08:50:12 2005
@@ -35,7 +35,6 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.engine.ServiceGroupContextTest;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMFactory;
@@ -94,8 +93,6 @@
AxisService service = Utils.createSimpleService(serviceName, Echo.class
.getName(), operationName);
configContext.getAxisConfiguration().addService(service);
- ServiceContext serviceContext = new ServiceGroupContext(configContext,
- service.getParent()).getServiceContext(service.getName().getLocalPart());
}
protected void tearDown() throws Exception {
@@ -118,8 +115,9 @@
ConfigurationContext configContext = UtilsMailServer
.createClientConfigurationContext();
- AxisService service = new AxisService(serviceName);
- AxisOperation axisOperation = new OutInAxisOperation(operationName);
+ AxisService service = new AxisService(serviceName.getLocalPart());
+ AxisOperation axisOperation = new OutInAxisOperation();
+ axisOperation.setName(operationName);
axisOperation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
envelope = messgeCtx.getEnvelope();
@@ -129,7 +127,7 @@
configContext.getAxisConfiguration().addService(service);
ServiceContext serviceContext = new ServiceGroupContext(configContext,
service.getParent()).getServiceContext(service.getName()
- .getLocalPart());
+ );
org.apache.axis2.client.Call call = new org.apache.axis2.client.Call(
serviceContext);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java Tue Dec 13 08:50:12 2005
@@ -107,9 +107,9 @@
ConfigurationContext configContext = UtilsMailServer.createClientConfigurationContext();
- AxisService service = new AxisService(serviceName);
- AxisOperation axisOperation = new OutInAxisOperation(
- operationName);
+ AxisService service = new AxisService(serviceName.getLocalPart());
+ AxisOperation axisOperation = new OutInAxisOperation();
+ axisOperation.setName(operationName);
axisOperation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
envelope = messgeCtx.getEnvelope();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java Tue Dec 13 08:50:12 2005
@@ -62,7 +62,7 @@
protected void setUp() throws Exception {
UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
- service = new AxisService(serviceName);
+ service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
EchoService.class.getName()));
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java Tue Dec 13 08:50:12 2005
@@ -82,7 +82,7 @@
ServiceContext serviceContext = new ServiceGroupContext(
configContext, service.getParent())
- .getServiceContext(service.getName().getLocalPart());
+ .getServiceContext(service.getName());
inOutMC = new InOutMEPClient(serviceContext);
MessageContext msgctx = new MessageContext(serviceContext
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java Tue Dec 13 08:50:12 2005
@@ -96,7 +96,7 @@
+ "/axis/services/EchoXMLService/" + opName);
String className = "org.apache.axis2.rpc.RPCServiceClass";
operationName = new QName("http://localhost/my", opName, "req");
- AxisService service = new AxisService(serviceName);
+ AxisService service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
className));
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java Tue Dec 13 08:50:12 2005
@@ -136,7 +136,7 @@
+ "/axis/services/EchoXMLService/" + opName);
String className = "org.apache.axis2.rpc.RPCServiceClass";
operationName = new QName("http://localhost/my", opName, "req");
- AxisService service = new AxisService(serviceName);
+ AxisService service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
className));
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java Tue Dec 13 08:50:12 2005
@@ -66,7 +66,7 @@
protected void setUp() throws Exception {
UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
- service = new AxisService(serviceName);
+ service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(new ParameterImpl(
AbstractMessageReceiver.SERVICE_CLASS, EchoSwA.class
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Tue Dec 13 08:50:12 2005
@@ -230,7 +230,7 @@
envelope.getBody().addChild(method);
MessageContext requestContext = new MessageContext(configContext);
- AxisService srevice = new AxisService(serviceName);
+ AxisService srevice = new AxisService(serviceName.getLocalPart());
srevice.addOperation(opdesc);
configContext.getAxisConfiguration().addService(srevice);
requestContext.setAxisService(service);
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java Tue Dec 13 08:50:12 2005
@@ -166,7 +166,8 @@
.createXMLStreamWriter
(System.out));
QName opName = new QName("urn:GoogleSearch", "doGoogleSearch");
- AxisOperation opdesc = new OutInAxisOperation(opName);
+ AxisOperation opdesc = new OutInAxisOperation();
+ opdesc.setName(opName);
call.invokeNonBlocking(opdesc,
requestContext,
new ClientCallbackHandler());
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java Tue Dec 13 08:50:12 2005
@@ -122,11 +122,7 @@
} catch (DeploymentException e) {
e.printStackTrace();
}
- try {
- msgContext = new MessageContext(configContext);
- } catch (AxisFault axisFault) {
- axisFault.printStackTrace();
- }
+ msgContext = new MessageContext(configContext);
msgContext.setEnvelope(reqEnv);
return msgContext;
}
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java Tue Dec 13 08:50:12 2005
@@ -101,7 +101,8 @@
try {
options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
QName opName = new QName("urn:GoogleSearch", "doGoogleSearch");
- AxisOperation opdesc = new OutInAxisOperation(opName);
+ AxisOperation opdesc = new OutInAxisOperation();
+ opdesc.setName(opName);
// AxisOperation opdesc = new AxisOperation(new QName("viewVersion"));
call.invokeNonBlocking(opdesc,
requestContext,
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java Tue Dec 13 08:50:12 2005
@@ -119,11 +119,7 @@
ConfigurationContextFactory fac = new ConfigurationContextFactory();
ConfigurationContext configContext = fac.buildClientConfigurationContext(
"doGoogleSearch");
- try {
- msgContext = new MessageContext(configContext);
- } catch (AxisFault axisFault) {
- axisFault.printStackTrace();
- }
+ msgContext = new MessageContext(configContext);
msgContext.setEnvelope(envelope);
return msgContext;
}
Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java?rev=356539&r1=356538&r2=356539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java (original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java Tue Dec 13 08:50:12 2005
@@ -34,7 +34,7 @@
*/
public class InteropScenarioClient {
-
+
public void invokeWithStaticConfig(String clientRepo, String url) throws Exception {
TicketType ticket = TicketType.Factory.newInstance();
ticket.setId("My ticket Id");
@@ -75,10 +75,10 @@
//Enable MTOM to those scenarios where they are configured using:
//<optimizeParts>xpathExpression</optimizeParts>
stub._getClientOptions().setProperty(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
-
+
//Engage the security module
stub.engageModule("security");
-
+
if(outflowConfig !=null){
stub._getClientOptions().setProperty(WSSHandlerConstants.OUTFLOW_SECURITY, outflowConfig.getProperty());
}