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 de...@apache.org on 2005/09/15 06:56:04 UTC
svn commit: r289148 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/clientapi/ core/src/org/apache/axis2/context/
core/src/org/apache/axis2/description/ core/src/org/apache/axis2/util/
integration/test/org/apache/axis2/engine/ int...
Author: deepal
Date: Wed Sep 14 21:55:26 2005
New Revision: 289148
URL: http://svn.apache.org/viewcvs?rev=289148&view=rev
Log:
fixing bugs
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/TwoWayTransportBasedSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
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/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/EchoRawXMLOnTwoChannelsSyncTest.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/integration/UtilServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.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/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/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/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java?rev=289148&r1=289147&r2=289148&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java Wed Sep 14 21:55:26 2005
@@ -85,6 +85,7 @@
OperationDescription opDesc =
serviceContext.getServiceConfig().getOperation(new QName(axisop));
opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop);
+ opDesc.setParent(serviceContext.getServiceConfig());
MessageContext msgctx = prepareTheSOAPEnvelope(toSend);
this.lastResponseMessage = super.invokeBlocking(opDesc, msgctx);
@@ -201,17 +202,17 @@
ConfigurationContextFactory efac =
new ConfigurationContextFactory();
sysContext = efac.buildClientConfigurationContext(clientHome);
+ ListenerManager.configurationContext = sysContext;
} else {
sysContext = ListenerManager.configurationContext;
}
//we will assume a Service and operations
QName assumedServiceName = new QName("AnonymousService");
- ServiceDescription axisService =
- new ServiceDescription(assumedServiceName);
- operationTemplate =
- new OperationDescription(new QName("TemplateOperation"));
- ServiceGroupDescription serviceGroupDescription = new ServiceGroupDescription(sysContext.getAxisConfiguration());
+ ServiceDescription axisService = new ServiceDescription(assumedServiceName);
+ operationTemplate = new OperationDescription(new QName("TemplateOperation"));
+ ServiceGroupDescription serviceGroupDescription =
+ new ServiceGroupDescription(sysContext.getAxisConfiguration());
PhasesInfo info =((AxisConfigurationImpl)sysContext.getAxisConfiguration()).getPhasesinfo();
//to set the operation flows
@@ -220,11 +221,14 @@
}
axisService.addOperation(operationTemplate);
serviceGroupDescription.addService(axisService);
- serviceGroupDescription.getServiceGroupContext(sysContext).fillServiceContexts();
+ serviceGroupDescription.getServiceGroupContext(sysContext);
+ serviceGroupDescription.setServiceGroupName(assumedServiceName.getLocalPart());
+ sysContext.getAxisConfiguration().addServiceGroup(serviceGroupDescription);
// return sysContext.createServiceContext(assumedServiceName);
//todo fix me Chinthaka
- return serviceGroupDescription.getServiceGroupContext(sysContext).getServiceContext(assumedServiceName.getLocalPart());
+ return serviceGroupDescription.getServiceGroupContext(sysContext).getServiceContext(
+ assumedServiceName.getLocalPart());
}
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java?rev=289148&r1=289147&r2=289148&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java Wed Sep 14 21:55:26 2005
@@ -227,6 +227,8 @@
//Use message id all the time!
String messageID = String.valueOf(System.currentTimeMillis());
msgctx.setMessageID(messageID);
+ msgctx.getOperationContext().getServiceContext().getEngineContext().
+ registerOperationContext(messageID, msgctx.getOperationContext());
////
if (useSeparateListener) {
//the invocation happen via a seperate Channel, so we should set up the
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java?rev=289148&r1=289147&r2=289148&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java Wed Sep 14 21:55:26 2005
@@ -90,7 +90,6 @@
ServiceDescription axisService = new ServiceDescription(assumedServiceName);
sysContext.getAxisConfiguration().addService(axisService);
ServiceGroupContext serviceGroupContext = axisService.getParent().getServiceGroupContext(sysContext);
- serviceGroupContext.fillServiceContexts();
return serviceGroupContext.getServiceContext(assumedServiceName.getLocalPart());
//todo fixme Chinthaka
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/TwoWayTransportBasedSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/TwoWayTransportBasedSender.java?rev=289148&r1=289147&r2=289148&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/TwoWayTransportBasedSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/TwoWayTransportBasedSender.java Wed Sep 14 21:55:26 2005
@@ -47,6 +47,7 @@
response.setServerSide(false);
response.setOperationContext(msgctx.getOperationContext());
response.setServiceContext(msgctx.getServiceContext());
+ response.setServiceGroupContext(msgctx.getServiceGroupContext());
//If request is REST we assume the response is REST, so set the variable
response.setDoingREST(msgctx.isDoingREST());
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=289148&r1=289147&r2=289148&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Wed Sep 14 21:55:26 2005
@@ -540,6 +540,7 @@
operationContext.setParent(serviceContext);
}
this.setParent(operationContext);
+ this.setOperationDescription(operationContext.getAxisOperation());
}
/**
@@ -596,6 +597,7 @@
if (operationContext != null && operationContext.getParent() != null) {
operationContext.setParent(context);
}
+ this.setServiceDescription(context.getServiceConfig());
}
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java?rev=289148&r1=289147&r2=289148&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java Wed Sep 14 21:55:26 2005
@@ -63,6 +63,7 @@
if (description!=null)
this.serviceGroupDescName = description.getServiceGroupName();
+ fillServiceContexts();
}
public String getId() {
@@ -83,7 +84,7 @@
* if serviceGroup desc has 2 service init , then two serviceContext will be
* created
*/
- public void fillServiceContexts(){
+ private void fillServiceContexts(){
Iterator services = description.getServices();
while (services.hasNext()) {
ServiceDescription serviceDescription = (ServiceDescription) services.next();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java?rev=289148&r1=289147&r2=289148&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java Wed Sep 14 21:55:26 2005
@@ -232,8 +232,7 @@
// So this message is part of an ongoing MEP
// operationContext =
ConfigurationContext configContext = msgContext.getSystemContext();
- operationContext =
- configContext.getOperationContext(
+ operationContext = configContext.getOperationContext(
msgContext.getRelatesTo().getValue());
if (null == operationContext) {
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -208,7 +208,6 @@
public ServiceGroupContext getServiceGroupContext(ConfigurationContext parent){
ServiceGroupContext serviceGroupContext = new ServiceGroupContext(parent,this) ;
- serviceGroupContext.fillServiceContexts();
return serviceGroupContext;
}
}
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -198,7 +198,6 @@
private static ServiceContext fillServiceContextAndServiceGroupContext(ServiceDescription serviceDesc, ConfigurationContext configurationContext) throws AxisFault {
String serviceGroupContextId = UUIDGenerator.getUUID();
ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configurationContext,serviceDesc.getParent());
- serviceGroupContext.fillServiceContexts();
serviceGroupContext.setId(serviceGroupContextId);
configurationContext.registerServiceGroupContext(serviceGroupContext);
ServiceContext serviceContext = new ServiceContext(serviceDesc, serviceGroupContext);
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -67,15 +67,12 @@
}
protected void setUp() throws Exception {
- ConfigurationContext configurationContext = UtilServer.start();
+ UtilServer.start();
service =
Utils.createSimpleService(serviceName,
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- service.getParent().getServiceGroupContext(configurationContext).fillServiceContexts();
- ServiceContext serviceContext = service.getParent().getServiceGroupContext(configurationContext).getServiceContext(serviceName.getLocalPart());
-
}
protected void tearDown() throws Exception {
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -55,7 +55,6 @@
private ServiceDescription service;
private boolean finish = false;
- private ConfigurationContext config;
public EchoRawXMLChunckedTest() {
super(EchoRawXMLChunckedTest.class.getName());
@@ -66,16 +65,12 @@
}
protected void setUp() throws Exception {
- config = UtilServer.start(Constants.TESTING_PATH + "chuncked-enabledRepository");
+ UtilServer.start(Constants.TESTING_PATH + "chuncked-enabledRepository");
service =
Utils.createSimpleService(serviceName,
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext =
- service.getParent().getServiceGroupContext(config).getServiceContext(service.getName().getLocalPart());
-
-
}
protected void tearDown() throws Exception {
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -55,7 +55,6 @@
private boolean finish = false;
- private ConfigurationContext config;
public EchoRawXMLOnTwoChannelsSyncTest() {
super(EchoRawXMLOnTwoChannelsSyncTest.class.getName());
@@ -66,7 +65,7 @@
}
protected void setUp() throws Exception {
- config = UtilServer.start();
+ UtilServer.start();
UtilServer.getConfigurationContext().getAxisConfiguration()
.engageModule(new QName("addressing"));
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -70,15 +70,12 @@
}
protected void setUp() throws Exception {
- config = UtilServer.start();
+ UtilServer.start();
service =
Utils.createSimpleService(serviceName,
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext =
- service.getParent().getServiceGroupContext(config).getServiceContext(service.getName().getLocalPart());
-
}
protected void tearDown() throws Exception {
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -47,7 +47,8 @@
public class SOAPversionTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference("http://127.0.0.1:"
- + (UtilServer.TESTING_PORT)
+ + (5000)
+// + (UtilServer.TESTING_PORT)
+ "/axis/services/EchoXMLService/echoOMElement");
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("EchoXMLService");
@@ -56,7 +57,6 @@
"NullTransport");
private AxisConfiguration engineRegistry;
- private ConfigurationContext config;
private MessageContext mc;
//private Thread thisThread;
// private SimpleHTTPServer sas;
@@ -66,15 +66,12 @@
private boolean finish = false;
protected void setUp() throws Exception {
- config = UtilServer.start();
+ UtilServer.start();
service =
Utils.createSimpleService(serviceName,
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext =
- service.getParent().getServiceGroupContext(config).getServiceContext(service.getName().getLocalPart());
-
}
public void testSOAP11() throws AxisFault {
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -36,14 +36,12 @@
private static SimpleHTTPServer receiver;
public static final int TESTING_PORT = 5555;
public static final String FAILURE_MESSAGE = "Intentional Failure";
- public static ConfigurationContext er ;
public static synchronized void deployService(ServiceDescription service) throws AxisFault {
receiver.getSystemContext().getAxisConfiguration().addService(service);
Utils.resolvePhases(receiver.getSystemContext().getAxisConfiguration(),
service);
ServiceGroupContext serviceGroupContext = service.getParent().getServiceGroupContext(receiver.getSystemContext());
- serviceGroupContext.fillServiceContexts();
}
public static synchronized void unDeployService(QName service) throws AxisFault {
@@ -51,11 +49,11 @@
service.getLocalPart());
}
- public static synchronized ConfigurationContext start() throws Exception {
- return start(org.apache.axis2.Constants.TESTING_REPOSITORY);
+ public static synchronized void start() throws Exception {
+ start(org.apache.axis2.Constants.TESTING_REPOSITORY);
}
- public static synchronized ConfigurationContext start(String repositry) throws Exception {
+ public static synchronized void start(String repositry) throws Exception {
if (count == 0) {
ConfigurationContextFactory erfac = new ConfigurationContextFactory();
File file = new File(repositry);
@@ -64,7 +62,7 @@
"repository directory " + file.getAbsolutePath() +
" does not exists");
}
- er = erfac.buildConfigurationContext(
+ ConfigurationContext er = erfac.buildConfigurationContext(
file.getAbsolutePath());
receiver = new SimpleHTTPServer(er, Constants.TESTING_PORT);
@@ -86,7 +84,6 @@
}
count++;
- return er;
}
public static synchronized void stop() {
@@ -128,10 +125,31 @@
sysContext.getAxisConfiguration().addService(service);
- return service.getParent().getServiceGroupContext(er).getServiceContext(service.getName().getLocalPart());
+ return service.getParent().getServiceGroupContext(sysContext
+ ).getServiceContext(service.getName().getLocalPart());
+ }
+
+ public static ServiceContext createAdressedEnabledClientSide(
+ ServiceDescription service, String clientHome)
+ throws AxisFault {
+ DeploymentEngine deploymentEngine = new DeploymentEngine();
+ File file = new File(
+ org.apache.axis2.Constants.TESTING_REPOSITORY +
+ "/modules/addressing.mar");
+ TestCase.assertTrue(file.exists());
+ ModuleDescription moduleDesc = deploymentEngine.buildModule(file);
+
+ ConfigurationContextFactory efac = new ConfigurationContextFactory();
+ ConfigurationContext sysContext =
+ efac.buildClientConfigurationContext(clientHome);
+ sysContext.getAxisConfiguration().addModule(moduleDesc);
+ //sysContext.getAxisConfiguration().engageModule(moduleDesc.getName());
+ sysContext.getAxisConfiguration().addService(service);
+ return service.getParent().getServiceGroupContext(sysContext
+ ).getServiceContext(service.getName().getLocalPart());
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java?rev=289148&r1=289147&r2=289148&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java Wed Sep 14 21:55:26 2005
@@ -45,7 +45,6 @@
Utils.resolvePhases(configurationContext.getAxisConfiguration(),
service);
ServiceGroupContext serviceGroupContext = service.getParent().getServiceGroupContext(configurationContext);
- serviceGroupContext.fillServiceContexts();
}
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -59,7 +59,6 @@
private OMElement data;
private boolean finish = false;
- private ConfigurationContext config;
public EchoRawMTOMCommonsChunkingTest() {
super(EchoRawMTOMCommonsChunkingTest.class.getName());
@@ -70,11 +69,10 @@
}
protected void setUp() throws Exception {
- config = UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
+ UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext = service.getParent().getServiceGroupContext(config).getServiceContext(service.getName().getLocalPart());
}
protected void tearDown() throws Exception {
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -38,7 +38,6 @@
private ServiceContext serviceContext;
private ServiceDescription service;
- private ConfigurationContext config;
public EchoRawMTOMFileCacheLoadTest() {
super(EchoRawMTOMFileCacheLoadTest.class.getName());
@@ -49,11 +48,10 @@
}
protected void setUp() throws Exception {
- config = UtilServer.start(Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository");
+ UtilServer.start(Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository");
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext = service.getParent().getServiceGroupContext(config).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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -39,8 +39,7 @@
private ServiceDescription service;
- private ConfigurationContext config;
-
+
public EchoRawMTOMFileCacheTest() {
super(EchoRawMTOMFileCacheTest.class.getName());
}
@@ -50,11 +49,10 @@
}
protected void setUp() throws Exception {
- config =UtilServer.start(Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository");
+ UtilServer.start(Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository");
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext = service.getParent().getServiceGroupContext(config).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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -58,7 +58,6 @@
byte[] expectedByteArray;
- private ConfigurationContext config;
public EchoRawMTOMLoadTest() {
super(EchoRawMTOMLoadTest.class.getName());
@@ -69,11 +68,10 @@
}
protected void setUp() throws Exception {
- config = UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
+ UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext = service.getParent().getServiceGroupContext(config).getServiceContext(service.getName().getLocalPart());
}
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -58,7 +58,6 @@
private ServiceContext serviceContext;
private ServiceDescription service;
- private ConfigurationContext config;
private boolean finish = false;
@@ -71,11 +70,9 @@
}
protected void setUp() throws Exception {
- config= UtilServer.start();
+ UtilServer.start();
service = Utils.createSimpleService(serviceName, Echo.class.getName(), operationName);
UtilServer.deployService(service);
- serviceContext =
- service.getParent().getServiceGroupContext(config).getServiceContext(service.getName().getLocalPart());
}
@@ -86,25 +83,26 @@
public void sendMessageWithHeader(SOAPEnvelope envelope) throws AxisFault{
- InOutMEPClient inOutMC;
- ServiceContext serviceContext =
- service.getParent().getServiceGroupContext(config).getServiceContext(service.getName().getLocalPart());
- inOutMC = new InOutMEPClient(serviceContext);
- try{
- MessageContext msgctx = new MessageContext(serviceContext.getEngineContext());
-
- msgctx.setEnvelope(envelope);
-
- inOutMC.setTo(targetEPR);
- inOutMC.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
-
- MessageContext result =
- inOutMC.invokeBlocking(
- serviceContext.getServiceConfig().getOperation(operationName),
- msgctx);
- }finally{
- inOutMC.close();
- }
+// InOutMEPClient inOutMC;
+// ServiceContext serviceContext =
+// service.getParent().getServiceGroupContext(config).getServiceContext(service.getName().getLocalPart());
+// inOutMC = new InOutMEPClient(serviceContext);
+// try{
+// MessageContext msgctx = new MessageContext(serviceContext.getEngineContext());
+//
+// msgctx.setEnvelope(envelope);
+//
+// inOutMC.setTo(targetEPR);
+// inOutMC.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+//
+// MessageContext result =
+// inOutMC.invokeBlocking(
+// serviceContext.getServiceConfig().getOperation(operationName),
+// msgctx);
+// }finally{
+// inOutMC.close();
+// }
+ fail("Fix Me Deepal");
}
//
// public void testSendingMustUnderstandWithNextRole() throws Exception {
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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -66,7 +66,6 @@
private Thread thread;
private final MessageInformation messageInfo = new MessageInformation();
- private ConfigurationContext config;
public RESTBasedEchoRawXMLTest() {
super(RESTBasedEchoRawXMLTest.class.getName());
@@ -77,7 +76,7 @@
}
protected void setUp() throws Exception {
- config = UtilServer.start();
+ UtilServer.start();
Parameter parameter = new ParameterImpl(
Constants.Configuration.ENABLE_REST, "true");
UtilServer.getConfigurationContext()
@@ -87,8 +86,6 @@
Echo.class.getName(),
operationName);
UtilServer.deployService(service);
- serviceContext =
- service.getParent().getServiceGroupContext(config).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=289148&r1=289147&r2=289148&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 21:55:26 2005
@@ -59,7 +59,6 @@
private boolean finish = false;
private OMTextImpl expectedTextData;
- private ConfigurationContext config;
public EchoRawSwATest() {
super(EchoRawSwATest.class.getName());
@@ -70,7 +69,7 @@
}
protected void setUp() throws Exception {
- config = UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
+ UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
service = new ServiceDescription(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(new ParameterImpl(
@@ -81,7 +80,6 @@
axisOp.setStyle(WSDLService.STYLE_DOC);
service.addOperation(axisOp);
UtilServer.deployService(service);
- serviceContext = service.getParent().getServiceGroupContext(config).getServiceContext(service.getName().getLocalPart());
}