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 2007/02/13 09:48:13 UTC
svn commit: r506912 [2/2] - in /webservices/axis2/trunk/java/modules:
addressing/test/org/apache/axis2/handlers/addressing/
integration/test/org/apache/axis2/integration/
integration/test/org/apache/axis2/jms/
integration/test/org/apache/axis2/processi...
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcherTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcherTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcherTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcherTest.java Tue Feb 13 00:48:08 2007
@@ -21,6 +21,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOnlyAxisOperation;
@@ -31,7 +32,7 @@
public class SOAPMessageBodyBasedOperationDispatcherTest extends TestCase {
public void testFindOperation() throws AxisFault {
- MessageContext messageContext = new MessageContext();
+ MessageContext messageContext;
AxisService as1 = new AxisService("Service1");
@@ -43,7 +44,7 @@
ConfigurationContext cc = ConfigurationContextFactory.createEmptyConfigurationContext();
AxisConfiguration ac = cc.getAxisConfiguration();
ac.addService(as1);
- messageContext.setConfigurationContext(cc);
+ messageContext = ContextFactory.createMessageContext(cc);
messageContext.setAxisService(as1);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcherTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcherTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcherTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcherTest.java Tue Feb 13 00:48:08 2007
@@ -22,21 +22,22 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.AxisConfiguration;
public class SOAPMessageBodyBasedServiceDispatcherTest extends TestCase {
public void testFindService() throws AxisFault{
- MessageContext messageContext = new MessageContext();
+ MessageContext messageContext ;
AxisService as1 = new AxisService("Service1");
AxisService as2 = new AxisService("Service2");
ConfigurationContext cc = ConfigurationContextFactory.createEmptyConfigurationContext();
AxisConfiguration ac = cc.getAxisConfiguration();
ac.addService(as1);
ac.addService(as2);
- messageContext.setConfigurationContext(cc);
-
+ messageContext = ContextFactory.createMessageContext(cc);
+
SOAPEnvelope se = OMAbstractFactory.getSOAP11Factory().createSOAPEnvelope();
SOAPBody sb = OMAbstractFactory.getSOAP11Factory().createSOAPBody(se);
sb.addChild(OMAbstractFactory.getSOAP11Factory().createOMElement("operation2", "http://127.0.0.1:8080/axis2/services/Service2", "pfx"));
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java Tue Feb 13 00:48:08 2007
@@ -24,6 +24,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.*;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
@@ -117,8 +118,7 @@
service.mapActionToOperation(operationName.getLocalPart(), axisOp);
- mc = new MessageContext();
- mc.setConfigurationContext(configConetxt);
+ mc = ContextFactory.createMessageContext(configConetxt);
mc.setTransportIn(transportIn);
mc.setTransportOut(transportOut);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Tue Feb 13 00:48:08 2007
@@ -23,6 +23,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOutAxisOperation;
@@ -71,12 +72,11 @@
engineRegistry.addService(service);
service.addOperation(axisOp);
- mc = new MessageContext();
- mc.setConfigurationContext(configContext);
+ mc= ContextFactory.createMessageContext(configContext);
mc.setTransportIn(transportIn);
mc.setTransportOut(transport);
- OperationContext opCOntext = new OperationContext(axisOp);
+ OperationContext opCOntext = ContextFactory.createOperationContext(axisOp,null);
mc.setOperationContext(opCOntext);
mc.setTransportOut(transport);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java Tue Feb 13 00:48:08 2007
@@ -21,11 +21,7 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.ConfigurationContext;
-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.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -180,10 +176,11 @@
//-----------------------------------------------------------------
- serviceGroupContext = new ServiceGroupContext(configurationContext, (AxisServiceGroup) axisService.getParent());
+ serviceGroupContext =ContextFactory.createServiceGroupContext(configurationContext,
+ (AxisServiceGroup) axisService.getParent());
serviceGroupContext.setId("ServiceGroupContextTest");
- serviceContext = serviceGroupContext.getServiceContext(axisService);
+ serviceContext = ContextFactory.createServiceContext(serviceGroupContext,axisService);
operationContext = serviceContext.createOperationContext(operationName);
@@ -211,8 +208,7 @@
//-----------------------------------------------------------------
- mc = new MessageContext();
- mc.setConfigurationContext(configurationContext);
+ mc = ContextFactory.createMessageContext(configurationContext);
mc.setTransportIn(transportIn);
mc.setTransportOut(transportOut);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java Tue Feb 13 00:48:08 2007
@@ -21,11 +21,7 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.ConfigurationContext;
-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.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -481,29 +477,30 @@
//-----------------------------------------------------------------
// setup the context objects
//-----------------------------------------------------------------
- srvGrpCtx_ABC = new ServiceGroupContext(configurationContext, axisSrvGrp_ABC);
+ srvGrpCtx_ABC =ContextFactory.createServiceGroupContext(configurationContext,
+ axisSrvGrp_ABC);
srvGrpCtx_ABC.setId(serviceGroupName_ABC);
- srvGrpCtx_123 = new ServiceGroupContext(configurationContext, axisSrvGrp_123);
+ srvGrpCtx_123 =ContextFactory.createServiceGroupContext(configurationContext, axisSrvGrp_123);
srvGrpCtx_123.setId(serviceGroupName_ABC);
- srvGrpCtx_DAY = new ServiceGroupContext(configurationContext, axisSrvGrp_DAY);
+ srvGrpCtx_DAY = ContextFactory.createServiceGroupContext(configurationContext, axisSrvGrp_DAY);
srvGrpCtx_DAY.setId(serviceGroupName_DAY);
- srvCtx_A = srvGrpCtx_ABC.getServiceContext(axisSrv_A);
- srvCtx_B = srvGrpCtx_ABC.getServiceContext(axisSrv_B);
- srvCtx_C = srvGrpCtx_ABC.getServiceContext(axisSrv_C);
-
- srvCtx_1 = srvGrpCtx_123.getServiceContext(axisSrv_1);
- srvCtx_2 = srvGrpCtx_123.getServiceContext(axisSrv_2);
- srvCtx_3 = srvGrpCtx_123.getServiceContext(axisSrv_3);
- srvCtx_4 = srvGrpCtx_123.getServiceContext(axisSrv_4);
-
- srvCtx_Mon = srvGrpCtx_DAY.getServiceContext(axisSrv_Mon);
- srvCtx_Tue = srvGrpCtx_DAY.getServiceContext(axisSrv_Tue);
- srvCtx_Wed = srvGrpCtx_DAY.getServiceContext(axisSrv_Wed);
- srvCtx_Thu = srvGrpCtx_DAY.getServiceContext(axisSrv_Thu);
- srvCtx_Fri = srvGrpCtx_DAY.getServiceContext(axisSrv_Fri);
+ srvCtx_A = ContextFactory.createServiceContext(srvGrpCtx_ABC,axisSrv_A);
+ srvCtx_B = ContextFactory.createServiceContext(srvGrpCtx_ABC,axisSrv_B);
+ srvCtx_C = ContextFactory.createServiceContext(srvGrpCtx_ABC,axisSrv_C);
+
+ srvCtx_1 = ContextFactory.createServiceContext(srvGrpCtx_123,axisSrv_1);
+ srvCtx_2 =ContextFactory.createServiceContext(srvGrpCtx_123,axisSrv_2);
+ srvCtx_3 =ContextFactory.createServiceContext(srvGrpCtx_123,axisSrv_3);
+ srvCtx_4 =ContextFactory.createServiceContext(srvGrpCtx_123,axisSrv_4) ;
+
+ srvCtx_Mon = ContextFactory.createServiceContext(srvGrpCtx_DAY,axisSrv_Mon);
+ srvCtx_Tue =ContextFactory.createServiceContext(srvGrpCtx_DAY,axisSrv_Tue) ;
+ srvCtx_Wed =ContextFactory.createServiceContext(srvGrpCtx_DAY,axisSrv_Wed);
+ srvCtx_Thu = ContextFactory.createServiceContext(srvGrpCtx_DAY,axisSrv_Thu) ;
+ srvCtx_Fri =ContextFactory.createServiceContext(srvGrpCtx_DAY,axisSrv_Fri);
opCtx_A1 = srvCtx_A.createOperationContext(operation_QName_A1);
opCtx_A2 = srvCtx_A.createOperationContext(operation_QName_A2);
@@ -535,9 +532,7 @@
private MessageContext createMessageContext(OperationContext oc) throws Exception
{
- MessageContext mc = new MessageContext();
-
- mc.setConfigurationContext(configurationContext);
+ MessageContext mc = ContextFactory.createMessageContext(configurationContext);
mc.setTransportIn(transportIn);
mc.setTransportOut(transportOut);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java Tue Feb 13 00:48:08 2007
@@ -21,11 +21,7 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.ConfigurationContext;
-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.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -472,24 +468,25 @@
//-----------------------------------------------------------------
// setup the context objects
//-----------------------------------------------------------------
- srvGrpCtx_ABC_save = new ServiceGroupContext(saveConfigurationContext, axisSrvGrp_ABC_save);
+ srvGrpCtx_ABC_save = ContextFactory.createServiceGroupContext(saveConfigurationContext, axisSrvGrp_ABC_save);
srvGrpCtx_ABC_save.setId(serviceGroupName_ABC);
- srvCtx_A_save = srvGrpCtx_ABC_save.getServiceContext(axisSrv_A_save);
- srvCtx_B_save = srvGrpCtx_ABC_save.getServiceContext(axisSrv_B_save);
- srvCtx_C_save = srvGrpCtx_ABC_save.getServiceContext(axisSrv_C_save);
+ srvCtx_A_save =ContextFactory.createServiceContext(srvGrpCtx_ABC_save,axisSrv_A_save);
+ srvCtx_B_save = ContextFactory.createServiceContext(srvGrpCtx_ABC_save,axisSrv_B_save);
+ srvCtx_C_save = ContextFactory.createServiceContext(srvGrpCtx_ABC_save,axisSrv_C_save);
opCtx_A1_save = srvCtx_A_save.createOperationContext(operation_QName_A1);
opCtx_A2_save = srvCtx_A_save.createOperationContext(operation_QName_A2);
//----------------------------------------
- srvGrpCtx_ABC_equiv = new ServiceGroupContext(equivConfigurationContext, axisSrvGrp_ABC_equiv);
+ srvGrpCtx_ABC_equiv =ContextFactory.createServiceGroupContext(
+ equivConfigurationContext, axisSrvGrp_ABC_equiv);
srvGrpCtx_ABC_equiv.setId(serviceGroupName_ABC);
- srvCtx_A_equiv = srvGrpCtx_ABC_equiv.getServiceContext(axisSrv_A_equiv);
- srvCtx_B_equiv = srvGrpCtx_ABC_equiv.getServiceContext(axisSrv_B_equiv);
- srvCtx_C_equiv = srvGrpCtx_ABC_equiv.getServiceContext(axisSrv_C_equiv);
+ srvCtx_A_equiv =ContextFactory.createServiceContext(srvGrpCtx_ABC_equiv,axisSrv_A_equiv);
+ srvCtx_B_equiv = ContextFactory.createServiceContext(srvGrpCtx_ABC_equiv,axisSrv_B_equiv);
+ srvCtx_C_equiv =ContextFactory.createServiceContext(srvGrpCtx_ABC_equiv,axisSrv_C_equiv);
opCtx_A1_equiv = srvCtx_A_equiv.createOperationContext(operation_QName_A1);
opCtx_A2_equiv = srvCtx_A_equiv.createOperationContext(operation_QName_A2);
@@ -515,10 +512,9 @@
private MessageContext createMessageContext(OperationContext oc, ConfigurationContext cc, int flowType) throws Exception
{
- MessageContext mc = new MessageContext();
+ MessageContext mc = ContextFactory.createMessageContext(cc);
mc.setFLOW(flowType);
- mc.setConfigurationContext(cc);
mc.setTransportIn(transportIn);
mc.setTransportOut(transportOut);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java Tue Feb 13 00:48:08 2007
@@ -35,12 +35,7 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.SelfManagedDataManager;
-import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.ServiceGroupContext;
+import org.apache.axis2.context.*;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
@@ -232,10 +227,10 @@
//-----------------------------------------------------------------
- serviceGroupContext = new ServiceGroupContext(cfgContext, (AxisServiceGroup) axisService.getParent());
+ serviceGroupContext = ContextFactory.createServiceGroupContext(cfgContext, (AxisServiceGroup) axisService.getParent());
serviceGroupContext.setId("ServiceGroupContextTest");
- serviceContext = serviceGroupContext.getServiceContext(axisService);
+ serviceContext = ContextFactory.createServiceContext(serviceGroupContext,axisService);
operationContext = serviceContext.createOperationContext(operationName);
@@ -280,9 +275,7 @@
invokecallcount = 0;
- mc = new MessageContext();
-
- mc.setConfigurationContext(cfgContext);
+ mc = ContextFactory.createMessageContext(cfgContext);
mc.setTransportIn(transportIn);
mc.setTransportOut(transportOut);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextTest.java Tue Feb 13 00:48:08 2007
@@ -23,6 +23,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.AxisService;
public class MessageContextTest extends AbstractTestCase {
@@ -39,8 +40,7 @@
ConfigurationContext engineContext = new ConfigurationContext(er);
- MessageContext msgctx = new MessageContext();
- msgctx.setConfigurationContext(engineContext);
+ MessageContext msgctx = ContextFactory.createMessageContext(engineContext);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java Tue Feb 13 00:48:08 2007
@@ -22,11 +22,7 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.ConfigurationContext;
-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.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
@@ -159,10 +155,10 @@
//-----------------------------------------------------------------
- serviceGroupContext = new ServiceGroupContext(configurationContext, (AxisServiceGroup) axisService.getParent());
+ serviceGroupContext = ContextFactory.createServiceGroupContext(configurationContext, (AxisServiceGroup) axisService.getParent());
serviceGroupContext.setId("ServiceGroupContextTest");
- serviceContext = serviceGroupContext.getServiceContext(axisService);
+ serviceContext = ContextFactory.createServiceContext(serviceGroupContext,axisService);
operationContext = serviceContext.createOperationContext(operationName);
@@ -175,8 +171,7 @@
//-----------------------------------------------------------------
- mc = new MessageContext();
- mc.setConfigurationContext(configurationContext);
+ mc = ContextFactory.createMessageContext(configurationContext);
mc.setTransportIn(transportIn);
mc.setTransportOut(transportOut);
mc.setTransportOut(transportOut);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeTest.java Tue Feb 13 00:48:08 2007
@@ -20,6 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.PhaseRule;
import org.apache.axis2.engine.AxisConfiguration;
@@ -39,8 +40,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext();
- msg.setConfigurationContext(new ConfigurationContext(new AxisConfiguration()));
+ MessageContext msg = ContextFactory.createMessageContext(
+ new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java Tue Feb 13 00:48:08 2007
@@ -20,6 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.PhaseRule;
import org.apache.axis2.engine.AxisConfiguration;
@@ -38,10 +39,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext();
- msg.setConfigurationContext(
+ MessageContext msg = ContextFactory.createMessageContext(
new ConfigurationContext(new AxisConfiguration()));
-
PhaseHolder ph = new PhaseHolder(phases);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java Tue Feb 13 00:48:08 2007
@@ -20,6 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.PhaseRule;
import org.apache.axis2.engine.AxisConfiguration;
@@ -40,9 +41,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext();
- msg.setConfigurationContext(
- new ConfigurationContext(new AxisConfiguration()));
+ MessageContext msg = ContextFactory.createMessageContext(
+ new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java Tue Feb 13 00:48:08 2007
@@ -20,6 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.PhaseRule;
import org.apache.axis2.engine.AxisConfiguration;
@@ -40,9 +41,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext();
- msg.setConfigurationContext(
- new ConfigurationContext(new AxisConfiguration()));
+ MessageContext msg = ContextFactory.createMessageContext(
+ new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java Tue Feb 13 00:48:08 2007
@@ -20,6 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.PhaseRule;
import org.apache.axis2.engine.AxisConfiguration;
@@ -40,9 +41,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext();
- msg.setConfigurationContext(
- new ConfigurationContext(new AxisConfiguration()));
+ MessageContext msg = ContextFactory.createMessageContext(
+ new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java Tue Feb 13 00:48:08 2007
@@ -20,6 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.PhaseRule;
import org.apache.axis2.engine.AxisConfiguration;
@@ -40,9 +41,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext();
- msg.setConfigurationContext(
- new ConfigurationContext(new AxisConfiguration()));
+ MessageContext msg = ContextFactory.createMessageContext(
+ new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java Tue Feb 13 00:48:08 2007
@@ -20,6 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.PhaseRule;
import org.apache.axis2.engine.AxisConfiguration;
@@ -40,9 +41,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext();
- msg.setConfigurationContext(
- new ConfigurationContext(new AxisConfiguration()));
+ MessageContext msg = ContextFactory.createMessageContext(
+ new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/util/ThreadContextMigratorTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/util/ThreadContextMigratorTest.java?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/util/ThreadContextMigratorTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/util/ThreadContextMigratorTest.java Tue Feb 13 00:48:08 2007
@@ -19,6 +19,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
@@ -33,8 +34,8 @@
public void setUp()
{
- messageContext = new MessageContext();
- messageContext.setConfigurationContext(new ConfigurationContext(new AxisConfiguration()));
+ messageContext = ContextFactory.createMessageContext(
+ new ConfigurationContext(new AxisConfiguration()));
}
public void testEmptyMigratorStructure()
Modified: webservices/axis2/trunk/java/modules/webapp/viewServiceContext.jsp
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/viewServiceContext.jsp?view=diff&rev=506912&r1=506911&r2=506912
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/viewServiceContext.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/viewServiceContext.jsp Tue Feb 13 00:48:08 2007
@@ -6,6 +6,7 @@
<%@ page import="java.util.Hashtable" %>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.Map" %>
+<%@ page import="org.apache.axis2.context.ContextFactory" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%
/*
@@ -36,7 +37,7 @@
String ID = request.getParameter("ID");
ServiceGroupContext sgContext = (ServiceGroupContext) serviceGroupContextsMap.get(sgID);
AxisService service = sgContext.getDescription().getService(ID);
- ServiceContext serviceContext = sgContext.getServiceContext(service);
+ ServiceContext serviceContext = ContextFactory.createServiceContext(sgContext,service);
if (sgID != null && serviceContext != null) {
if (type != null) {
if ("VIEW".equals(type)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org