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/09/14 09:36:45 UTC
svn commit: r280798 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/description/ core/src/org/apache/axis2/util/
core/test/org/apache/axis2/context/ core/test/org/apache/axis2/engine/
integration/test/org/apache/axis2/engine/ inte...
Author: chinthaka
Date: Wed Sep 14 00:35:54 2005
New Revision: 280798
URL: http://svn.apache.org/viewcvs?rev=280798&view=rev
Log:
Fixing the build to compile
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java Wed Sep 14 00:35:54 2005
@@ -1,13 +1,14 @@
package org.apache.axis2.description;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEvent;
-import org.apache.axis2.AxisFault;
import org.apache.axis2.phaseresolver.PhaseResolver;
import javax.xml.namespace.QName;
-import java.util.HashMap;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
/*
@@ -192,5 +193,10 @@
this.parent.notifyObservers(AxisEvent.SERVICE_DEPLOY , service);
}
services.remove(name);
+ }
+
+ public ServiceGroupContext getServiceGroupContext(){
+ //TODO Deepal
+ return null;
}
}
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -17,7 +17,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.*;
import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
@@ -167,21 +167,42 @@
String[] serviceNameAndGroupStrings = serviceNameAndGroup.split(":");
AxisConfiguration registry =
messageContext.getSystemContext().getAxisConfiguration();
- if(serviceNameAndGroupStrings[0] != null){
+ if (serviceNameAndGroupStrings[0] != null) {
ServiceGroupDescription serviceGroup = registry.getServiceGroup(serviceNameAndGroupStrings[0]);
String serviceNameStr = "";
- if(serviceNameAndGroupStrings.length == 1){
+ 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){
+ if (serviceGroup != null && serviceDescription != null) {
messageContext.setServiceGroupDescription(serviceGroup);
messageContext.setServiceDescription(serviceDescription);
}
}
}
+ }
+
+ public static ServiceContext fillContextInformation(OperationDescription operationDesc, ServiceDescription serviceDesc, ConfigurationContext configurationContext) throws AxisFault {
+ MessageContext msgContext;
+ // 2. if null, create new opCtxt
+ OperationContext operationContext =
+ OperationContextFactory.createOperationContext(operationDesc.getAxisSpecifMEPConstant(), operationDesc);
+
+ // fill the service group context and service context info
+ return fillServiceContextAndServiceGroupContext(serviceDesc, configurationContext);
+
+ }
+
+ private static ServiceContext fillServiceContextAndServiceGroupContext(ServiceDescription serviceDesc, ConfigurationContext configurationContext) throws AxisFault {
+ String serviceGroupContextId = UUIDGenerator.getUUID();
+ ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configurationContext);
+ serviceGroupContext.setId(serviceGroupContextId);
+ configurationContext.registerServiceGroupContext(serviceGroupContext);
+ ServiceContext serviceContext = new ServiceContext(serviceDesc, serviceGroupContext);
+ serviceGroupContext.registerServiceContext(serviceContext);
+ return serviceContext;
}
}
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -52,8 +52,7 @@
ConfigurationContext configurationContext =
new ConfigurationContext(axisConfiguration);
ServiceContext serviceCOntext =
- configurationContext.createServiceContext(
- serviceDescription.getName());
+ serviceDescription.getParent().getServiceGroupContext().getServiceContext(serviceDescription.getName().getLocalPart());
MessageContext msgctx =
new MessageContext(configurationContext);
OperationContext opContext =
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -20,7 +20,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.miheaders.RelatesTo;
import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
@@ -39,8 +38,8 @@
public void testMEPfindingOnRelatesTO() throws Exception {
- ServiceContext sessionContext = new ServiceContext(
- new ServiceDescription(), new ConfigurationContext(null));
+// ServiceContext sessionContext = new ServiceContext(
+// new ServiceDescription(), new ConfigurationContext(null));
MessageContext messageContext1 = this.getBasicMessageContext();
messageContext1.setMessageID(
@@ -48,7 +47,7 @@
OperationDescription axisOperation = new OperationDescription(
new QName("test"));
OperationContext operationContext1 = axisOperation.findOperationContext(
- messageContext1, sessionContext);
+ messageContext1, null);
MessageContext messageContext2 = this.getBasicMessageContext();
messageContext2.setMessageID(
@@ -56,7 +55,7 @@
messageContext2.getMessageInformationHeaders().setRelatesTo(
new RelatesTo(messageContext1.getMessageID()));
OperationContext operationContext2 = axisOperation.findOperationContext(
- messageContext2, sessionContext);
+ messageContext2, null);
assertEquals(operationContext1, operationContext2);
}
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -21,7 +21,6 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.*;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.om.OMAbstractFactory;
@@ -110,10 +109,10 @@
phase3.addHandler(new TempHandler(26));
phase3.addHandler(new TempHandler(27));
- ServiceContext serviceContext = new ServiceContext(service,
- engineContext);
- engineContext.registerServiceContext(
- serviceContext.getServiceInstanceID(), serviceContext);
+// ServiceContext serviceContext = new ServiceContext(service,
+// engineContext);
+// engineContext.registerServiceContext(
+// serviceContext.getServiceInstanceID(), serviceContext);
//TODO
axisOp.getRemainingPhasesInFlow().add(phase1);
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -21,7 +21,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContextFactory;
-import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.description.TransportInDescription;
@@ -76,8 +75,8 @@
service.setStyle(WSDLService.STYLE_DOC);
service.addOperation(axisOp);
- ServiceContext serviceContext = engineContext.createServiceContext(
- serviceName);
+// ServiceContext serviceContext = engineContext.createServiceContext(
+// serviceName);
mc =
new MessageContext(engineContext,
@@ -87,8 +86,8 @@
mc.setOperationContext(
OperationContextFactory.createOperationContext(
WSDLConstants.MEP_CONSTANT_IN_OUT,
- axisOp,
- serviceContext));
+ axisOp
+ ));
mc.setTransportOut(transport);
mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
mc.setServerSide(true);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java Wed Sep 14 00:35:54 2005
@@ -21,7 +21,6 @@
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.om.OMAbstractFactory;
@@ -53,8 +52,6 @@
private QName operationName = new QName("echoOMElement");
- private ServiceContext serviceContext;
-
private ServiceDescription service;
private boolean finish = false;
@@ -71,11 +68,6 @@
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(
- service.getName());
-
-
}
protected void tearDown() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java Wed Sep 14 00:35:54 2005
@@ -72,9 +72,6 @@
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(
- service.getName());
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java Wed Sep 14 00:35:54 2005
@@ -71,8 +71,7 @@
operationName);
UtilServer.deployService(service);
serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(
- service.getName());
+ service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java Wed Sep 14 00:35:54 2005
@@ -22,7 +22,6 @@
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.integration.UtilServer;
@@ -50,7 +49,7 @@
private MessageContext mc;
//private Thread thisThread;
// private SimpleHTTPServer sas;
- private ServiceContext serviceContext;
+// private ServiceContext serviceContext;
private ServiceDescription service;
private boolean finish = false;
@@ -70,9 +69,7 @@
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(
- service.getName());
+
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java Wed Sep 14 00:35:54 2005
@@ -38,8 +38,8 @@
public class EchoRawXMLOnTwoChannelsSyncTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference("http://127.0.0.1:"
- + (UtilServer.TESTING_PORT)
- + "/axis/services/EchoXMLService");
+ + (UtilServer.TESTING_PORT)
+ + "/axis/services/EchoXMLService");
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("EchoXMLService");
private QName operationName = new QName("echoOMElement");
@@ -72,9 +72,7 @@
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(
- service.getName());
+ serviceContext = service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java Wed Sep 14 00:35:54 2005
@@ -53,7 +53,6 @@
private MessageContext mc;
private Thread thisThread;
private SimpleHTTPServer sas;
- private ServiceContext serviceContext;
private boolean finish = false;
@@ -75,9 +74,6 @@
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(
- service.getName());
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java Wed Sep 14 00:35:54 2005
@@ -75,8 +75,7 @@
operationName);
UtilServer.deployService(service);
serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(
- service.getName());
+ service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java Wed Sep 14 00:35:54 2005
@@ -71,8 +71,7 @@
operationName);
UtilServer.deployService(service);
serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(
- service.getName());
+ service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java Wed Sep 14 00:35:54 2005
@@ -71,9 +71,6 @@
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(
- service.getName());
}
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -122,9 +122,10 @@
//sysContext.getAxisConfiguration().engageModule(moduleDesc.getName());
sysContext.getAxisConfiguration().addService(service);
- //Utils.resolvePhases(sysContext.getEngineConfig(), service);
- return sysContext.createServiceContext(
- service.getName());
+
+ return service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
+
+
}
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -17,10 +17,7 @@
package org.apache.axis2.mail;
-import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
@@ -44,6 +41,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+
/**
* These tests willcheck wheather the mail transport works ok with charactor set
* encoding changes.
@@ -78,19 +77,19 @@
ConfigurationContext clientConfigContext;
+ ConfigurationContext configContext;
+
public MailCharSetEncodingTest() {
super(MailCharSetEncodingTest.class.getName());
}
protected void setUp() throws Exception {
- ConfigurationContext configContext = UtilsMailServer.start();
+ configContext = UtilsMailServer.start();
ServiceDescription service = Utils.createSimpleService(serviceName,
Echo.class.getName(), operationName);
configContext.getAxisConfiguration().addService(service);
Utils.resolvePhases(configContext.getAxisConfiguration(), service);
- ServiceContext serviceContext = configContext
- .createServiceContext(serviceName);
SimpleMailListener ml = new SimpleMailListener();
@@ -124,8 +123,7 @@
clientService.addOperation(clientOperation);
engineRegistry.addService(clientService);
Utils.resolvePhases(engineRegistry, clientService);
- clientServiceContext = clientConfigContext
- .createServiceContext(serviceName);
+ clientServiceContext = Utils.fillContextInformation(clientOperation, clientService, clientConfigContext);
org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(
clientServiceContext);
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -86,8 +86,7 @@
service.addOperation(operation);
configContext.getAxisConfiguration().addService(service);
Utils.resolvePhases(configContext.getAxisConfiguration(), service);
- ServiceContext serviceContext = configContext.createServiceContext(
- serviceName);
+ ServiceContext serviceContext = Utils.fillContextInformation(operation, service, configContext);
}
protected void tearDown() throws Exception {
@@ -118,8 +117,7 @@
service.addOperation(operation);
configContext.getAxisConfiguration().addService(service);
Utils.resolvePhases(configContext.getAxisConfiguration(), service);
- ServiceContext serviceContext = configContext.createServiceContext(
- serviceName);
+ ServiceContext serviceContext = Utils.fillContextInformation(operation, service, configContext);
SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -89,8 +89,7 @@
operationName);
configContext.getAxisConfiguration().addService(service);
Utils.resolvePhases(configContext.getAxisConfiguration(), service);
- ServiceContext serviceContext = configContext.createServiceContext(
- serviceName);
+ ServiceContext serviceContext = service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}
protected void tearDown() throws Exception {
@@ -123,8 +122,7 @@
service.addOperation(operation);
configContext.getAxisConfiguration().addService(service);
Utils.resolvePhases(configContext.getAxisConfiguration(), service);
- ServiceContext serviceContext = configContext.createServiceContext(
- serviceName);
+ ServiceContext serviceContext = service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -85,8 +85,6 @@
operationName);
configContext.getAxisConfiguration().addService(service);
Utils.resolvePhases(configContext.getAxisConfiguration(), service);
- ServiceContext serviceContext = configContext.createServiceContext(
- serviceName);
}
protected void tearDown() throws Exception {
@@ -120,8 +118,10 @@
service.addOperation(operation);
configContext.getAxisConfiguration().addService(service);
Utils.resolvePhases(configContext.getAxisConfiguration(), service);
- ServiceContext serviceContext = configContext.createServiceContext(
- serviceName);
+
+
+
+ ServiceContext serviceContext = Utils.fillContextInformation(operation, service, configContext);
org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(
serviceContext);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java Wed Sep 14 00:35:54 2005
@@ -72,8 +72,7 @@
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext = UtilServer.getConfigurationContext()
- .createServiceContext(service.getName());
+ serviceContext = service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}
protected void tearDown() throws Exception {
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -17,25 +17,25 @@
package org.apache.axis2.mtom;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.httpclient.*;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
-import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.Constants;
import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.swa.EchoRawSwATest;
+import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.Constants;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
+import org.apache.axis2.swa.EchoRawSwATest;
+import org.apache.commons.httpclient.*;
+import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
/**
* Author: Saminda Abeyruwan <sa...@wso2.com>
@@ -48,8 +48,6 @@
private QName operationName = new QName("mtomSample");
- private ServiceContext serviceContext;
-
private ServiceDescription service;
public EchoRawMTOMFaultReportTest() {
@@ -72,8 +70,6 @@
axisOp.setStyle(WSDLService.STYLE_DOC);
service.addOperation(axisOp);
UtilServer.deployService(service);
- serviceContext = UtilServer.getConfigurationContext()
- .createServiceContext(service.getName());
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java Wed Sep 14 00:35:54 2005
@@ -16,8 +16,6 @@
*/
package org.apache.axis2.mtom;
-import javax.xml.namespace.QName;
-
import org.apache.axis2.Constants;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.ServiceDescription;
@@ -25,6 +23,8 @@
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.util.Utils;
+import javax.xml.namespace.QName;
+
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
*/
@@ -51,8 +51,7 @@
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext = UtilServer.getConfigurationContext()
- .createServiceContext(service.getName());
+ serviceContext = service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}
protected void tearDown() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java Wed Sep 14 00:35:54 2005
@@ -16,8 +16,6 @@
*/
package org.apache.axis2.mtom;
-import javax.xml.namespace.QName;
-
import org.apache.axis2.Constants;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.ServiceDescription;
@@ -25,6 +23,8 @@
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.util.Utils;
+import javax.xml.namespace.QName;
+
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
*/
@@ -51,8 +51,7 @@
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext = UtilServer.getConfigurationContext()
- .createServiceContext(service.getName());
+ serviceContext = service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}
protected void tearDown() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java Wed Sep 14 00:35:54 2005
@@ -20,22 +20,14 @@
* @author <a href="mailto:thilina@opensource.lk">Thilina Gunarathne </a>
*/
-import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.*;
import org.apache.axis2.om.impl.llom.OMTextImpl;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPFactory;
@@ -43,6 +35,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+
public class EchoRawMTOMLoadTest extends TestCase {
private EndpointReference targetEPR = new EndpointReference("http://127.0.0.1:"
+ (UtilServer.TESTING_PORT)
@@ -76,8 +71,7 @@
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext = UtilServer.getConfigurationContext()
- .createServiceContext(service.getName());
+ serviceContext = service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}
protected void tearDown() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Wed Sep 14 00:35:54 2005
@@ -20,14 +20,7 @@
* @author <a href="mailto:thilina@opensource.lk">Thilina Gunarathne </a>
*/
-import java.awt.Image;
-import java.io.InputStream;
-
-import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
@@ -39,11 +32,7 @@
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.*;
import org.apache.axis2.om.impl.llom.OMTextImpl;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPEnvelope;
@@ -52,6 +41,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+import java.awt.*;
+import java.io.InputStream;
+
public class EchoRawMTOMTest extends TestCase {
private EndpointReference targetEPR = new EndpointReference("http://127.0.0.1:"
+ (UtilServer.TESTING_PORT)
@@ -84,8 +78,6 @@
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext = UtilServer.getConfigurationContext()
- .createServiceContext(service.getName());
}
protected void tearDown() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java Wed Sep 14 00:35:54 2005
@@ -21,14 +21,12 @@
*/
import junit.framework.TestCase;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.attachments.ByteArrayDataSource;
import org.apache.axis2.clientapi.AsyncResult;
import org.apache.axis2.clientapi.Callback;
-import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
@@ -55,8 +53,6 @@
private QName operationName = new QName("echoMTOMtoBase64");
- private ServiceContext serviceContext;
-
private ServiceDescription service;
OMText expectedTextData;
@@ -76,8 +72,6 @@
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext = UtilServer.getConfigurationContext()
- .createServiceContext(service.getName());
}
protected void tearDown() throws Exception {
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -72,7 +72,7 @@
service = Utils.createSimpleService(serviceName, Echo.class.getName(), operationName);
UtilServer.deployService(service);
serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(service.getName());
+ service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}
@@ -85,7 +85,7 @@
public void sendMessageWithHeader(SOAPEnvelope envelope) throws AxisFault{
InOutMEPClient inOutMC;
ServiceContext serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(service.getName());
+ service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
inOutMC = new InOutMEPClient(serviceContext);
try{
MessageContext msgctx = new MessageContext(serviceContext.getEngineContext());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java?rev=280798&r1=280797&r2=280798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java Wed Sep 14 00:35:54 2005
@@ -86,8 +86,7 @@
operationName);
UtilServer.deployService(service);
serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(
- service.getName());
+ service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
//
// Runnable runnable = new Runnable() {
// public void run() {
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=280798&r1=280797&r2=280798&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 Wed Sep 14 00:35:54 2005
@@ -20,17 +20,7 @@
* @author <a href="mailto:thilina@opensource.lk">Thilina Gunarathne </a>
*/
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketException;
-
-import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-
import org.apache.axis2.Constants;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.OperationDescription;
@@ -45,6 +35,14 @@
import org.apache.commons.logging.LogFactory;
import org.apache.wsdl.WSDLService;
+import javax.xml.namespace.QName;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketException;
+
public class EchoRawSwATest extends TestCase {
private Log log = LogFactory.getLog(getClass());
@@ -81,8 +79,7 @@
axisOp.setStyle(WSDLService.STYLE_DOC);
service.addOperation(axisOp);
UtilServer.deployService(service);
- serviceContext = UtilServer.getConfigurationContext()
- .createServiceContext(service.getName());
+ serviceContext = service.getParent().getServiceGroupContext().getServiceContext(service.getName().getLocalPart());
}