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 David Illsley <da...@gmail.com> on 2007/02/13 12:33:28 UTC
Re: svn commit: r506912 [1/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/pr
Deepal,
A couple of comments...
1. if we are going to go down the Factory route, imo we should make
the constructors package access to enforce use of the factory
(otherwise people won't use it)
2. We now have 3 factory classes in org.apache.axis2.context, can we
not slim that down to 1 or 2?
David
On 13/02/07, deepal@apache.org <de...@apache.org> wrote:
> Author: deepal
> Date: Tue Feb 13 00:48:08 2007
> New Revision: 506912
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=506912
> Log:
> - Need to remove service and service group context when we undeploy the services
> - Move context creating code to one Factory class. (As we discussed)
> - http://marc.theaimsgroup.com/?l=axis-dev&m=117130688302851&w=2
>
> Pls review and comment if I have done any thing wrong. Code clean very clean when we move context creating code into one location. I hope our clustering team will be happy now.
>
> Added:
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java
> Modified:
> webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.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/jms/JMSEchoRawXMLTest.java
> webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java
> webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPWorker.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcherTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcherTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcherTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcherTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcherTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java
> webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/util/ThreadContextMigratorTest.java
> webservices/axis2/trunk/java/modules/webapp/viewServiceContext.jsp
>
> Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java (original)
> +++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java Tue Feb 13 00:48:08 2007
> @@ -35,6 +35,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.handlers.util.TestUtil;
>
> import javax.xml.namespace.QName;
> @@ -70,8 +71,8 @@
> SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
> SOAPEnvelope defaultEnvelope = factory.getDefaultEnvelope();
>
> - MessageContext msgCtxt = new MessageContext();
> - msgCtxt.setConfigurationContext(ConfigurationContextFactory.createDefaultConfigurationContext());
> + MessageContext msgCtxt = ContextFactory.createMessageContext(
> + ConfigurationContextFactory.createDefaultConfigurationContext());
> msgCtxt.setProperty(WS_ADDRESSING_VERSION, Submission.WSA_NAMESPACE);
> msgCtxt.setTo(epr);
> msgCtxt.setReplyTo(replyTo);
> @@ -99,8 +100,7 @@
> }
>
> public void testHeaderCreationFromMsgCtxtInformation() throws Exception {
> - msgCtxt = new MessageContext();
> - msgCtxt.setConfigurationContext(ConfigurationContextFactory.createDefaultConfigurationContext());
> + msgCtxt = ContextFactory.createMessageContext(ConfigurationContextFactory.createDefaultConfigurationContext());
>
> EndpointReference epr = new EndpointReference("http://www.from.org/service/");
> epr.addReferenceParameter(new QName("Reference2"),
> @@ -140,8 +140,7 @@
> }
>
> public void testMustUnderstandSupport() throws Exception {
> - msgCtxt = new MessageContext();
> - msgCtxt.setConfigurationContext(ConfigurationContextFactory.createDefaultConfigurationContext());
> + msgCtxt = ContextFactory.createMessageContext(ConfigurationContextFactory.createDefaultConfigurationContext());
>
> msgCtxt.setProperty(AddressingConstants.ADD_MUST_UNDERSTAND_TO_ADDRESSING_HEADERS, Boolean.TRUE);
>
> @@ -188,8 +187,7 @@
> EndpointReference eprOne = new EndpointReference("http://whatever.org");
> EndpointReference duplicateEpr = new EndpointReference("http://whatever.duplicate.org");
> RelatesTo reply = new RelatesTo("urn:id");
> - msgCtxt = new MessageContext();
> - msgCtxt.setConfigurationContext(ConfigurationContextFactory.createDefaultConfigurationContext());
> + msgCtxt = ContextFactory.createMessageContext(ConfigurationContextFactory.createDefaultConfigurationContext());
> SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
> SOAPEnvelope defaultEnvelope = factory.getDefaultEnvelope();
> msgCtxt.setEnvelope(defaultEnvelope);
> @@ -219,8 +217,7 @@
> // this will check whether we can add to epr, if there is one already.
> EndpointReference eprOne = new EndpointReference("http://whatever.org");
> RelatesTo custom = new RelatesTo("urn:id", "customRelationship");
> - msgCtxt = new MessageContext();
> - msgCtxt.setConfigurationContext(ConfigurationContextFactory.createDefaultConfigurationContext());
> + msgCtxt = ContextFactory.createMessageContext(ConfigurationContextFactory.createDefaultConfigurationContext());
> SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
> SOAPEnvelope defaultEnvelope = factory.getDefaultEnvelope();
> OMNamespace addressingNamespace = factory.createOMNamespace(Final.WSA_NAMESPACE, WSA_DEFAULT_PREFIX);
> @@ -257,8 +254,7 @@
> // this will check whether we can add to epr, if there is one already.
> EndpointReference eprOne = new EndpointReference("http://whatever.org");
> RelatesTo custom = new RelatesTo("urn:id", "customRelationship");
> - msgCtxt = new MessageContext();
> - msgCtxt.setConfigurationContext(ConfigurationContextFactory.createDefaultConfigurationContext());
> + msgCtxt = ContextFactory.createMessageContext(ConfigurationContextFactory.createDefaultConfigurationContext());
> SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
> SOAPEnvelope defaultEnvelope = factory.getDefaultEnvelope();
> OMNamespace addressingNamespace = factory.createOMNamespace(Final.WSA_NAMESPACE, WSA_DEFAULT_PREFIX);
>
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Tue Feb 13 00:48:08 2007
> @@ -19,10 +19,7 @@
> import junit.framework.TestCase;
> import org.apache.axis2.AxisFault;
> import org.apache.axis2.Constants;
> -import org.apache.axis2.context.ConfigurationContext;
> -import org.apache.axis2.context.ConfigurationContextFactory;
> -import org.apache.axis2.context.ServiceContext;
> -import org.apache.axis2.context.ServiceGroupContext;
> +import org.apache.axis2.context.*;
> import org.apache.axis2.deployment.DeploymentEngine;
> import org.apache.axis2.description.AxisModule;
> import org.apache.axis2.description.AxisService;
> @@ -185,8 +182,9 @@
>
> configContext.getAxisConfiguration().addService(service);
>
> - return new ServiceGroupContext(configContext, (AxisServiceGroup) service.getParent())
> - .getServiceContext(service);
> +
> + ServiceGroupContext serviceGroupContext = ContextFactory.createServiceGroupContext(configContext, (AxisServiceGroup) service.getParent());
> + return ContextFactory.createServiceContext(serviceGroupContext,service);
> }
>
> static class AddressingFilter implements FilenameFilter {
> @@ -237,9 +235,9 @@
> // sysContext.getAxisConfiguration().engageModule(moduleDesc.getName());
>
> configContext.getAxisConfiguration().addService(service);
> -
> - return new ServiceGroupContext(configContext, (AxisServiceGroup) service.getParent())
> - .getServiceContext(service);
> + ServiceGroupContext serviceGroupContext = ContextFactory.createServiceGroupContext(configContext,
> + (AxisServiceGroup) service.getParent());
> + return ContextFactory.createServiceContext(serviceGroupContext,service);
> }
>
> }
>
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- 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 Tue Feb 13 00:48:08 2007
> @@ -20,6 +20,7 @@
> import org.apache.axis2.context.ConfigurationContext;
> import org.apache.axis2.context.ConfigurationContextFactory;
> import org.apache.axis2.context.ServiceGroupContext;
> +import org.apache.axis2.context.ContextFactory;
> import org.apache.axis2.description.AxisService;
> import org.apache.axis2.description.AxisServiceGroup;
> import org.apache.axis2.engine.ListenerManager;
> @@ -45,8 +46,8 @@
> throws AxisFault {
>
> receiver.getConfigurationContext().getAxisConfiguration().addService(service);
> - ServiceGroupContext serviceGroupContext = new ServiceGroupContext(
> - receiver.getConfigurationContext(), (AxisServiceGroup) service.getParent());
> + ContextFactory.createServiceGroupContext(receiver.getConfigurationContext(),
> + (AxisServiceGroup) service.getParent());
> }
>
> public static synchronized void unDeployService(QName service)
>
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java Tue Feb 13 00:48:08 2007
> @@ -37,6 +37,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.OutInAxisOperation;
> @@ -224,8 +225,7 @@
> SOAPEnvelope envelope = factory.getDefaultEnvelope();
> envelope.getBody().addChild(method);
>
> - MessageContext requestContext = new MessageContext();
> - requestContext.setConfigurationContext(configContext);
> + MessageContext requestContext = ContextFactory.createMessageContext(configContext);
> requestContext.setAxisService(clientService);
> requestContext.setAxisOperation(opdesc);
> requestContext.setEnvelope(envelope);
>
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java Tue Feb 13 00:48:08 2007
> @@ -33,10 +33,7 @@
> import org.apache.axis2.client.OperationClient;
> import org.apache.axis2.client.Options;
> import org.apache.axis2.client.ServiceClient;
> -import org.apache.axis2.context.ConfigurationContext;
> -import org.apache.axis2.context.MessageContext;
> -import org.apache.axis2.context.ServiceContext;
> -import org.apache.axis2.context.ServiceGroupContext;
> +import org.apache.axis2.context.*;
> import org.apache.axis2.description.AxisService;
> import org.apache.axis2.description.AxisServiceGroup;
> import org.apache.axis2.engine.Echo;
> @@ -85,8 +82,7 @@
> .getNewConfigurationContext(Constants.TESTING_REPOSITORY);
> serviceClient = new ServiceClient(configContext, clientService);
>
> - MessageContext msgctx = new MessageContext();
> - msgctx.setConfigurationContext(configContext);
> + MessageContext msgctx = ContextFactory.createMessageContext(configContext);
>
> msgctx.setEnvelope(envelope);
>
>
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java Tue Feb 13 00:48:08 2007
> @@ -41,10 +41,7 @@
> import org.apache.axis2.client.OperationClient;
> import org.apache.axis2.client.Options;
> import org.apache.axis2.client.ServiceClient;
> -import org.apache.axis2.context.ConfigurationContext;
> -import org.apache.axis2.context.ConfigurationContextFactory;
> -import org.apache.axis2.context.MessageContext;
> -import org.apache.axis2.context.ServiceContext;
> +import org.apache.axis2.context.*;
> import org.apache.axis2.databinding.utils.BeanUtil;
> import org.apache.axis2.description.AxisService;
> import org.apache.axis2.engine.AxisConfiguration;
> @@ -126,8 +123,7 @@
> .createConfigurationContextFromFileSystem(null,null);
> RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
> rpcClient.setOptions(options);
> - MessageContext reqMessageContext = new MessageContext();
> - reqMessageContext.setConfigurationContext(configConetxt);
> + MessageContext reqMessageContext = ContextFactory.createMessageContext(configConetxt);
> OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
> opClinet.setOptions(options);
> reqMessageContext.setEnvelope(envelope);
> @@ -179,8 +175,7 @@
> .createConfigurationContextFromFileSystem(null,null);
> RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
> rpcClient.setOptions(options);
> - MessageContext reqMessageContext = new MessageContext();
> - reqMessageContext.setConfigurationContext(configConetxt);
> + MessageContext reqMessageContext = ContextFactory.createMessageContext(configConetxt);
> OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
> opClinet.setOptions(options);
> reqMessageContext.setEnvelope(envelope);
> @@ -227,8 +222,7 @@
> .createConfigurationContextFromFileSystem(null,null);
> RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
> rpcClient.setOptions(options);
> - MessageContext reqMessageContext = new MessageContext();
> - reqMessageContext.setConfigurationContext(configConetxt);
> + MessageContext reqMessageContext = ContextFactory.createMessageContext(configConetxt);
> OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
> opClinet.setOptions(options);
> reqMessageContext.setEnvelope(envelope);
> @@ -279,8 +273,7 @@
> .createConfigurationContextFromFileSystem(null,null);
> RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
> rpcClient.setOptions(options);
> - MessageContext reqMessageContext = new MessageContext();
> - reqMessageContext.setConfigurationContext(configConetxt);
> + MessageContext reqMessageContext = ContextFactory.createMessageContext(configConetxt);
> OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
> opClinet.setOptions(options);
> reqMessageContext.setEnvelope(envelope);
> @@ -340,8 +333,7 @@
> .createConfigurationContextFromFileSystem(null,null);
> RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
> rpcClient.setOptions(options);
> - MessageContext reqMessageContext = new MessageContext();
> - reqMessageContext.setConfigurationContext(configConetxt);
> + MessageContext reqMessageContext = ContextFactory.createMessageContext(configConetxt);
> OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
> opClinet.setOptions(options);
> reqMessageContext.setEnvelope(envelope);
> @@ -400,8 +392,7 @@
> .createConfigurationContextFromFileSystem(null,null);
> RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
> rpcClient.setOptions(options);
> - MessageContext reqMessageContext = new MessageContext();
> - reqMessageContext.setConfigurationContext(configConetxt);
> + MessageContext reqMessageContext =ContextFactory.createMessageContext(configConetxt);
> OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
> opClinet.setOptions(options);
> reqMessageContext.setEnvelope(envelope);
> @@ -461,8 +452,7 @@
> .createConfigurationContextFromFileSystem(null,null);
> RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
> rpcClient.setOptions(options);
> - MessageContext reqMessageContext = new MessageContext();
> - reqMessageContext.setConfigurationContext(configConetxt);
> + MessageContext reqMessageContext =ContextFactory.createMessageContext(configConetxt);
> OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
> opClinet.setOptions(options);
> reqMessageContext.setEnvelope(envelope);
> @@ -536,8 +526,7 @@
> .createConfigurationContextFromFileSystem(null,null);
> RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
> rpcClient.setOptions(options);
> - MessageContext reqMessageContext = new MessageContext();
> - reqMessageContext.setConfigurationContext(configConetxt);
> + MessageContext reqMessageContext = ContextFactory.createMessageContext(configConetxt);
> OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
> opClinet.setOptions(options);
> reqMessageContext.setEnvelope(envelope);
> @@ -603,8 +592,7 @@
> .createConfigurationContextFromFileSystem(null,null);
> RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
> rpcClient.setOptions(options);
> - MessageContext reqMessageContext = new MessageContext();
> - reqMessageContext.setConfigurationContext(configConetxt);
> + MessageContext reqMessageContext = ContextFactory.createMessageContext(configConetxt);
> OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
> opClinet.setOptions(options);
> reqMessageContext.setEnvelope(envelope);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java Tue Feb 13 00:48:08 2007
> @@ -20,10 +20,7 @@
> import org.apache.axis2.AxisFault;
> import org.apache.axis2.addressing.EndpointReference;
> import org.apache.axis2.client.async.Callback;
> -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.*;
> import org.apache.axis2.description.AxisOperation;
> import org.apache.axis2.description.ClientUtils;
> import org.apache.axis2.description.TransportOutDescription;
> @@ -69,8 +66,7 @@
> this.sc = sc;
> this.options = new Options(options);
> this.completed = false;
> - this.oc = new OperationContext(axisOp);
> - this.oc.setParent(this.sc);
> + this.oc = ContextFactory.createOperationContext(axisOp,this.sc);
> }
>
> /**
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java Tue Feb 13 00:48:08 2007
> @@ -129,9 +129,9 @@
> this.axisService.getName()));
> }
> AxisServiceGroup axisServiceGroup = (AxisServiceGroup) this.axisService.getParent();
> - ServiceGroupContext sgc = new ServiceGroupContext(this.configContext,
> + ServiceGroupContext sgc = ContextFactory.createServiceGroupContext(this.configContext,
> axisServiceGroup);
> - this.serviceContext = sgc.getServiceContext(this.axisService);
> + this.serviceContext = ContextFactory.createServiceContext(sgc,this.axisService);
> }
>
>
> @@ -705,8 +705,9 @@
> axisConfig.addService(axisService);
>
> AxisServiceGroup axisServiceGroup = (AxisServiceGroup) axisService.getParent();
> - ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configContext, axisServiceGroup);
> -
> - this.serviceContext = serviceGroupContext.getServiceContext(this.axisService);
> + ServiceGroupContext serviceGroupContext = ContextFactory.createServiceGroupContext(configContext,
> + axisServiceGroup);
> + this.serviceContext = ContextFactory.createServiceContext(
> + serviceGroupContext,this.axisService);
> }
> }
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Tue Feb 13 00:48:08 2007
> @@ -117,12 +117,13 @@
> axisServiceGroup = (AxisServiceGroup) axisService.getParent();
> messageContext.setAxisServiceGroup(axisServiceGroup);
> }
> - serviceGroupContext = new ServiceGroupContext(messageContext.getConfigurationContext(),
> - axisServiceGroup);
> + serviceGroupContext =ContextFactory.createServiceGroupContext(
> + messageContext.getConfigurationContext(),axisServiceGroup);
> applicationSessionServiceGroupContextTable.put(serviceGroupName, serviceGroupContext);
> }
> messageContext.setServiceGroupContext(serviceGroupContext);
> - messageContext.setServiceContext(serviceGroupContext.getServiceContext(axisService));
> + messageContext.setServiceContext(ContextFactory.createServiceContext(
> + serviceGroupContext,axisService));
> } else if (Constants.SCOPE_SOAP_SESSION.equals(scope)) {
> String serviceGroupContextId = messageContext.getServiceGroupContextId();
> if (serviceGroupContextId != null) {
> @@ -134,8 +135,8 @@
> }
> } else {
> AxisServiceGroup axisServiceGroup = (AxisServiceGroup) axisService.getParent();
> - serviceGroupContext = new ServiceGroupContext(this, axisServiceGroup);
> - serviceContext = serviceGroupContext.getServiceContext(axisService);
> + serviceGroupContext = ContextFactory.createServiceGroupContext(this,axisServiceGroup);
> + serviceContext = ContextFactory.createServiceContext(serviceGroupContext,axisService);
> // set the serviceGroupContextID
> serviceGroupContextId = UUIDGenerator.getUUID();
> serviceGroupContext.setId(serviceGroupContextId);
> @@ -143,12 +144,13 @@
> registerServiceGroupContextintoSoapSessionTable(serviceGroupContext);
> }
> messageContext.setServiceGroupContext(serviceGroupContext);
> - messageContext.setServiceContext(serviceGroupContext.getServiceContext(axisService));
> + messageContext.setServiceContext(
> + ContextFactory.createServiceContext(serviceGroupContext,axisService));
> } else if (Constants.SCOPE_REQUEST.equals(scope)) {
> AxisServiceGroup axisServiceGroup = (AxisServiceGroup) axisService.getParent();
> - serviceGroupContext = new ServiceGroupContext(this, axisServiceGroup);
> + serviceGroupContext =ContextFactory.createServiceGroupContext(this,axisServiceGroup);
> messageContext.setServiceGroupContext(serviceGroupContext);
> - serviceContext = serviceGroupContext.getServiceContext(axisService);
> + serviceContext = ContextFactory.createServiceContext(serviceGroupContext,axisService);
> messageContext.setServiceContext(serviceContext);
> messageContext.getOperationContext().setParent(serviceContext);
> }
> @@ -524,5 +526,28 @@
> serviceGroupContextTimoutInterval = serviceGroupContextTimoutIntervalParam.intValue();
> }
> return serviceGroupContextTimoutInterval;
> + }
> +
> + public void removeServiceGroupContext(AxisServiceGroup serviceGroup){
> + if(serviceGroup!=null){
> + Object obj =applicationSessionServiceGroupContextTable.get(
> + serviceGroup.getServiceGroupName());
> + if(obj==null){
> + ArrayList toBeRemovedList = new ArrayList();
> + Iterator serviceGroupContexts = serviceGroupContextMap.values().iterator();
> + while (serviceGroupContexts.hasNext()) {
> + ServiceGroupContext serviceGroupContext =
> + (ServiceGroupContext) serviceGroupContexts.next();
> + if(serviceGroupContext.getDescription().equals(serviceGroup)){
> + toBeRemovedList.add(serviceGroupContext.getId());
> + }
> + }
> + for (int i = 0; i < toBeRemovedList.size(); i++) {
> + String s = (String) toBeRemovedList.get(i);
> + serviceGroupContextMap.remove(s);
> + }
> + }
> +
> + }
> }
> }
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java Tue Feb 13 00:48:08 2007
> @@ -78,7 +78,8 @@
> AxisServiceGroup axisServiceGroup = (AxisServiceGroup) serviceGroups.next();
> String maxScope = SessionUtils.calculateMaxScopeForServiceGroup(axisServiceGroup);
> if (Constants.SCOPE_APPLICATION.equals(maxScope)) {
> - ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configCtx, axisServiceGroup);
> + ServiceGroupContext serviceGroupContext = ContextFactory.createServiceGroupContext(
> + configCtx,axisServiceGroup);
> configCtx.addServiceGroupContextintoApplicatoionScopeTable(serviceGroupContext);
> DependencyManager.initService(serviceGroupContext);
> }
>
> Added: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java?view=auto&rev=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java (added)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java Tue Feb 13 00:48:08 2007
> @@ -0,0 +1,48 @@
> +package org.apache.axis2.context;
> +
> +import org.apache.axis2.AxisFault;
> +import org.apache.axis2.description.AxisService;
> +import org.apache.axis2.description.AxisServiceGroup;
> +import org.apache.axis2.description.AxisOperation;
> +
> +/*
> +* Copyright 2004,2005 The Apache Software Foundation.
> +*
> +* Licensed under the Apache License, Version 2.0 (the "License");
> +* you may not use this file except in compliance with the License.
> +* You may obtain a copy of the License at
> +*
> +* http://www.apache.org/licenses/LICENSE-2.0
> +*
> +* Unless required by applicable law or agreed to in writing, software
> +* distributed under the License is distributed on an "AS IS" BASIS,
> +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +* See the License for the specific language governing permissions and
> +* limitations under the License.
> +*
> +*
> +*/
> +public class ContextFactory {
> +
> + public static MessageContext createMessageContext(
> + ConfigurationContext configurationContext) {
> + MessageContext msgContext = new MessageContext();
> + msgContext.setConfigurationContext(configurationContext);
> + return msgContext;
> + }
> +
> + public static ServiceGroupContext createServiceGroupContext(
> + ConfigurationContext configurationContext,
> + AxisServiceGroup serviceGroup) {
> + return new ServiceGroupContext(configurationContext, serviceGroup);
> + }
> +
> + public static ServiceContext createServiceContext(ServiceGroupContext serviceGroupContext,
> + AxisService service) throws AxisFault {
> + return serviceGroupContext.getServiceContext(service);
> + }
> + public static OperationContext createOperationContext(AxisOperation axisOperation,
> + ServiceContext serviceContext){
> + return new OperationContext(axisOperation,serviceContext);
> + }
> +}
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java Tue Feb 13 00:48:08 2007
> @@ -179,18 +179,6 @@
> this.messageContexts = new HashMap();
> }
>
> -
> -
> -
> - /**
> - * Constructs a new OperationContext associated with the specified AxisOperation
> - */
> - public OperationContext(AxisOperation axisOperation) {
> - super(null);
> - this.messageContexts = new HashMap();
> - this.axisOperation = axisOperation;
> - }
> -
> /**
> * Constructs a new OperationContext.
> *
> @@ -204,6 +192,7 @@
> super(serviceContext);
> this.messageContexts = new HashMap();
> this.axisOperation = axisOperation;
> + this.setParent(serviceContext);
> }
>
> /**
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java Tue Feb 13 00:48:08 2007
> @@ -27,27 +27,6 @@
> */
> public class OperationContextFactory implements WSDLConstants {
>
> - /**
> - * Creates the operation context. When you call this make sure you set the parent later.
> - *
> - * @param mepURI
> - * @param axisOp
> - * @return Returns OperationContext.
> - * @throws AxisFault
> - */
> - public static OperationContext createOperationContext(int mepURI, AxisOperation axisOp)
> - throws AxisFault {
> - if ((WSDLConstants.MEP_CONSTANT_IN_OUT == mepURI) || (WSDLConstants.MEP_CONSTANT_IN_ONLY == mepURI)
> - || (WSDLConstants.MEP_CONSTANT_IN_OPTIONAL_OUT == mepURI)
> - || (WSDLConstants.MEP_CONSTANT_ROBUST_IN_ONLY == mepURI) || (WSDLConstants.MEP_CONSTANT_OUT_ONLY == mepURI)
> - || (WSDLConstants.MEP_CONSTANT_OUT_IN == mepURI) || (WSDLConstants.MEP_CONSTANT_OUT_OPTIONAL_IN == mepURI)
> - || (WSDLConstants.MEP_CONSTANT_ROBUST_OUT_ONLY == mepURI)) {
> - return new OperationContext(axisOp);
> - } else {
> - throw new AxisFault(Messages.getMessage("unSupportedMEP", "ID is " + mepURI));
> - }
> - }
> -
> public static OperationContext createOperationContext(int mepURI, AxisOperation axisOp,
> ServiceContext serviceContext)
> throws AxisFault {
> @@ -56,7 +35,7 @@
> || (WSDLConstants.MEP_CONSTANT_ROBUST_IN_ONLY == mepURI) || (WSDLConstants.MEP_CONSTANT_OUT_ONLY == mepURI)
> || (WSDLConstants.MEP_CONSTANT_OUT_IN == mepURI) || (WSDLConstants.MEP_CONSTANT_OUT_OPTIONAL_IN == mepURI)
> || (WSDLConstants.MEP_CONSTANT_ROBUST_OUT_ONLY == mepURI)) {
> - return new OperationContext(axisOp, serviceContext);
> + return ContextFactory.createOperationContext(axisOp,serviceContext);
> } else {
> throw new AxisFault(Messages.getMessage("unSupportedMEP", "ID is " + mepURI));
> }
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java Tue Feb 13 00:48:08 2007
> @@ -147,7 +147,7 @@
> }
>
> public OperationContext createOperationContext(AxisOperation axisOp) {
> - OperationContext ctx = new OperationContext(axisOp, this);
> + OperationContext ctx = ContextFactory.createOperationContext(axisOp, this);
> if (cachingOperationContext) {
> // Squirrel this away for anyone who wants it later
> lastOperationContext = ctx;
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Tue Feb 13 00:48:08 2007
> @@ -607,7 +607,6 @@
> }
>
> public void unDeploy() {
> - String fileName;
> try {
> if (wsToUnDeploy.size() > 0) {
> for (int i = 0; i < wsToUnDeploy.size(); i++) {
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java Tue Feb 13 00:48:08 2007
> @@ -8,6 +8,7 @@
> import org.apache.axis2.description.AxisService;
> import org.apache.axis2.description.AxisServiceGroup;
> import org.apache.axis2.engine.AxisConfiguration;
> +import org.apache.axis2.engine.DependencyManager;
> import org.apache.axis2.i18n.Messages;
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> @@ -143,7 +144,8 @@
> public void unDeploy(String fileName) {
> try {
> fileName = DeploymentEngine.getAxisServiceName(fileName);
> - axisConfig.removeServiceGroup(fileName);
> + AxisServiceGroup serviceGroup = axisConfig.removeServiceGroup(fileName);
> + configCtx.removeServiceGroupContext(serviceGroup);
> log.info(Messages.getMessage(DeploymentErrorMsgs.SERVICE_REMOVED,
> fileName));
> } catch (AxisFault axisFault) {
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Tue Feb 13 00:48:08 2007
> @@ -19,10 +19,7 @@
> import org.apache.axis2.AxisFault;
> import org.apache.axis2.client.OperationClient;
> import org.apache.axis2.client.Options;
> -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.*;
> import org.apache.axis2.engine.AxisConfiguration;
> import org.apache.axis2.engine.AxisError;
> import org.apache.axis2.engine.MessageReceiver;
> @@ -359,7 +356,7 @@
>
> // Its a new incoming message so get the factory to create a new
> // one
> - operationContext = new OperationContext(this, serviceContext);
> + operationContext = ContextFactory.createOperationContext(this,serviceContext);
> } else {
>
> // So this message is part of an ongoing MEP
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Tue Feb 13 00:48:08 2007
> @@ -25,10 +25,7 @@
> import org.apache.axis2.client.Options;
> import org.apache.axis2.client.async.AsyncResult;
> import org.apache.axis2.client.async.Callback;
> -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.*;
> import org.apache.axis2.engine.AxisEngine;
> import org.apache.axis2.i18n.Messages;
> import org.apache.axis2.transport.TransportUtils;
> @@ -293,7 +290,9 @@
> AxisEngine engine = new AxisEngine(msgctx.getConfigurationContext());
>
> // create the responseMessageContext
> - MessageContext responseMessageContext = new MessageContext();
> +
> + MessageContext responseMessageContext = ContextFactory.createMessageContext(
> + msgctx.getConfigurationContext());
>
> // This is a hack - Needs to change
> responseMessageContext.setOptions(options);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java Tue Feb 13 00:48:08 2007
> @@ -19,10 +19,7 @@
> import org.apache.axis2.client.OperationClient;
> import org.apache.axis2.client.Options;
> import org.apache.axis2.client.async.Callback;
> -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.*;
> import org.apache.axis2.engine.AxisEngine;
> import org.apache.axis2.i18n.Messages;
> import org.apache.axiom.om.util.UUIDGenerator;
> @@ -240,7 +237,7 @@
> // setting message ID if it null
>
> // create the operation context for myself
> - OperationContext oc = new OperationContext(axisOp, sc);
> + OperationContext oc = ContextFactory.createOperationContext(axisOp,sc);
> oc.addMessageContext(mc);
> // ship it out
> AxisEngine engine = new AxisEngine(cc);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java Tue Feb 13 00:48:08 2007
> @@ -23,6 +23,7 @@
> import org.apache.axis2.client.Options;
> import org.apache.axis2.context.MessageContext;
> import org.apache.axis2.context.ServiceContext;
> +import org.apache.axis2.context.ContextFactory;
> import org.apache.axis2.engine.AxisEngine;
> import org.apache.axis2.transport.TransportUtils;
> import org.apache.axis2.util.Utils;
> @@ -61,7 +62,8 @@
> AxisEngine engine = new AxisEngine(msgctx.getConfigurationContext());
>
> // create the responseMessageContext
> - MessageContext responseMessageContext = new MessageContext();
> + MessageContext responseMessageContext = ContextFactory.createMessageContext(
> + msgctx.getConfigurationContext());
>
> // This is a hack - Needs to change
> responseMessageContext.setOptions(options);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Tue Feb 13 00:48:08 2007
> @@ -354,7 +354,7 @@
> addChild(axisServiceGroup);
> }
>
> - public void removeServiceGroup(String serviceGroupName) throws AxisFault {
> + public AxisServiceGroup removeServiceGroup(String serviceGroupName) throws AxisFault {
> AxisServiceGroup axisServiceGroup = (AxisServiceGroup) getChild(serviceGroupName);
> if (axisServiceGroup == null) {
> throw new AxisFault(Messages.getMessage("invalidservicegroupname",
> @@ -370,6 +370,7 @@
> }
> removeChild(serviceGroupName);
> notifyObservers(AxisEvent.SERVICE_REMOVE, axisServiceGroup);
> + return axisServiceGroup;
> }
>
> /**
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java Tue Feb 13 00:48:08 2007
> @@ -521,24 +521,16 @@
> //REVIEW: In the case of the TransportNonBlockingInvocationWorker, does this need to wait until that finishes?
> flowComplete(msgContext, false);
> }
> - else if (pi.equals(InvocationResponse.SUSPEND))
> - {
> - return;
> - }
> - else if (pi.equals(InvocationResponse.ABORT))
> - {
> + else if (pi.equals(InvocationResponse.SUSPEND)){
> + }else if (pi.equals(InvocationResponse.ABORT)){
> flowComplete(msgContext, false);
> - return;
> - }
> - else
> - {
> + }else{
> String errorMsg = "Unrecognized InvocationResponse encountered in AxisEngine.send()";
> log.error(msgContext.getLogIDString()+" "+errorMsg);
> throw new AxisFault(errorMsg);
> }
> }
> - catch (AxisFault e)
> - {
> + catch (AxisFault e){
> flowComplete(msgContext, false);
> throw e;
> }
> @@ -612,23 +604,14 @@
>
> sender.invoke(msgContext);
> flowComplete(msgContext, false);
> - }
> - else if (pi.equals(InvocationResponse.SUSPEND))
> - {
> - return;
> - }
> - else if (pi.equals(InvocationResponse.ABORT))
> - {
> + }else if (pi.equals(InvocationResponse.SUSPEND)){
> + }else if (pi.equals(InvocationResponse.ABORT)){
> flowComplete(msgContext, false);
> - return;
> - }
> - else
> - {
> + }else{
> String errorMsg = "Unrecognized InvocationResponse encountered in AxisEngine.sendFault()";
> log.error(msgContext.getLogIDString()+" "+errorMsg);
> throw new AxisFault(errorMsg);
> }
> -
> }
>
>
> @@ -658,23 +641,23 @@
> try {
> sender.invoke(msgctx);
> } catch (Exception e) {
> - log.info(msgctx.getLogIDString()+" "+e.getMessage());
> - if (msgctx.getProperty(MessageContext.DISABLE_ASYNC_CALLBACK_ON_TRANSPORT_ERROR) == null)
> - {
> - AxisOperation axisOperation = msgctx.getAxisOperation();
> - if (axisOperation != null)
> + log.info(msgctx.getLogIDString()+" "+e.getMessage());
> + if (msgctx.getProperty(MessageContext.DISABLE_ASYNC_CALLBACK_ON_TRANSPORT_ERROR) == null)
> {
> - MessageReceiver msgReceiver = axisOperation.getMessageReceiver();
> - if ((msgReceiver != null) && (msgReceiver instanceof CallbackReceiver))
> - {
> - Callback callback = ((CallbackReceiver)msgReceiver).lookupCallback(msgctx.getMessageID());
> - if (callback != null)
> + AxisOperation axisOperation = msgctx.getAxisOperation();
> + if (axisOperation != null)
> {
> - callback.onError(e);
> + MessageReceiver msgReceiver = axisOperation.getMessageReceiver();
> + if ((msgReceiver != null) && (msgReceiver instanceof CallbackReceiver))
> + {
> + Callback callback = ((CallbackReceiver)msgReceiver).lookupCallback(msgctx.getMessageID());
> + if (callback != null)
> + {
> + callback.onError(e);
> + }
> + }
> }
> - }
> }
> - }
> }
> }
> }
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java Tue Feb 13 00:48:08 2007
> @@ -21,6 +21,7 @@
> import org.apache.axis2.Constants;
> import org.apache.axis2.context.ServiceContext;
> import org.apache.axis2.context.ServiceGroupContext;
> +import org.apache.axis2.context.ContextFactory;
> import org.apache.axis2.description.AxisService;
> import org.apache.axis2.description.AxisServiceGroup;
> import org.apache.axis2.description.Parameter;
> @@ -77,7 +78,8 @@
> Iterator serviceItr = serviceGroup.getServices();
> while (serviceItr.hasNext()) {
> AxisService axisService = (AxisService) serviceItr.next();
> - ServiceContext serviceContext = serviceGroupContext.getServiceContext(axisService);
> + ServiceContext serviceContext = ContextFactory.createServiceContext(
> + serviceGroupContext,axisService);
> AxisService service = serviceContext.getAxisService();
> ClassLoader classLoader = service.getClassLoader();
> Parameter implInfoParam = service.getParameter(Constants.SERVICE_CLASS);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java Tue Feb 13 00:48:08 2007
> @@ -21,11 +21,7 @@
> import org.apache.axiom.soap.SOAPHeader;
> import org.apache.axis2.AxisFault;
> import org.apache.axis2.Constants;
> -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.SessionContext;
> +import org.apache.axis2.context.*;
> import org.apache.axis2.description.AxisOperation;
> import org.apache.axis2.description.AxisService;
> import org.apache.axis2.description.AxisServiceGroup;
> @@ -91,7 +87,7 @@
> msgContext.setServiceGroupContext(serviceGroupContext);
> msgContext.setServiceGroupContextId(serviceGroupContext.getId());
> } else { // 2. if null, create new opCtxt
> - operationContext = new OperationContext(axisOperation);
> + operationContext =ContextFactory.createOperationContext(axisOperation,serviceContext);
>
> axisOperation.registerMessageContext(msgContext, operationContext);
> if (serviceContext != null) {
> @@ -132,7 +128,8 @@
> //setting service group context
> msgContext.setServiceGroupContext(serviceGroupContext);
> // setting Service conetxt
> - msgContext.setServiceContext(serviceGroupContext.getServiceContext(service));
> + msgContext.setServiceContext(
> + ContextFactory.createServiceContext(serviceGroupContext,service));
> } else {
> createAndFillContexts(service, msgContext, sessionContext);
> }
> @@ -149,10 +146,11 @@
> SessionContext sessionContext) throws AxisFault {
> ServiceGroupContext serviceGroupContext;
> AxisServiceGroup axisServiceGroup = (AxisServiceGroup) service.getParent();
> - serviceGroupContext = new ServiceGroupContext(
> + serviceGroupContext = ContextFactory.createServiceGroupContext(
> msgContext.getConfigurationContext(), axisServiceGroup);
> +
> msgContext.setServiceGroupContext(serviceGroupContext);
> - ServiceContext serviceContext = serviceGroupContext.getServiceContext(service);
> + ServiceContext serviceContext =ContextFactory.createServiceContext(serviceGroupContext,service);
> msgContext.setServiceContext(serviceContext);
> if(sessionContext!=null){
> sessionContext.addServiceContext(serviceContext);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java Tue Feb 13 00:48:08 2007
> @@ -27,10 +27,7 @@
> import org.apache.axis2.Constants;
> import org.apache.axis2.addressing.AddressingHelper;
> import org.apache.axis2.addressing.EndpointReference;
> -import org.apache.axis2.context.ConfigurationContext;
> -import org.apache.axis2.context.ConfigurationContextFactory;
> -import org.apache.axis2.context.MessageContext;
> -import org.apache.axis2.context.SessionContext;
> +import org.apache.axis2.context.*;
> import org.apache.axis2.deployment.WarBasedAxisConfigurator;
> import org.apache.axis2.description.AxisBindingMessage;
> import org.apache.axis2.description.AxisBindingOperation;
> @@ -92,8 +89,7 @@
> protected MessageContext
> createAndSetInitialParamsToMsgCtxt(HttpServletResponse resp,
> HttpServletRequest req) throws AxisFault {
> - MessageContext msgContext = new MessageContext();
> - msgContext.setConfigurationContext(configContext);
> + MessageContext msgContext = ContextFactory.createMessageContext(configContext);
> msgContext.setTransportIn(transportIn);
> msgContext.setTransportOut(transportOut);
>
> @@ -625,7 +621,7 @@
>
> protected MessageContext createMessageContext(HttpServletRequest req,
> HttpServletResponse resp) throws IOException {
> - MessageContext msgContext = new MessageContext();
> + MessageContext msgContext = ContextFactory.createMessageContext(configContext);
> String trsPrefix = req.getRequestURL().toString();
> int sepindex = trsPrefix.indexOf(':');
> if (sepindex >= 0) {
> @@ -634,7 +630,6 @@
> } else {
> msgContext.setIncomingTransportName(Constants.TRANSPORT_HTTP);
> }
> - msgContext.setConfigurationContext(configContext);
> msgContext.setTransportIn(configContext.getAxisConfiguration().
> getTransportIn(new QName(Constants.TRANSPORT_HTTP)));
> TransportOutDescription transportOut =
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java Tue Feb 13 00:48:08 2007
> @@ -40,6 +40,7 @@
> import org.apache.axis2.context.ConfigurationContext;
> import org.apache.axis2.context.MessageContext;
> import org.apache.axis2.context.SessionContext;
> +import org.apache.axis2.context.ContextFactory;
> import org.apache.axis2.description.TransportInDescription;
> import org.apache.axis2.description.TransportOutDescription;
> import org.apache.axis2.engine.AxisEngine;
> @@ -100,9 +101,8 @@
> this.sessionManager = sessionManager;
> this.worker = worker;
>
> - this.msgContext = new MessageContext();
> + this.msgContext = ContextFactory.createMessageContext(configurationContext);
> this.msgContext.setIncomingTransportName(Constants.TRANSPORT_HTTP);
> - this.msgContext.setConfigurationContext(configurationContext);
> }
>
> protected void doService(
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java Tue Feb 13 00:48:08 2007
> @@ -32,6 +32,7 @@
> import org.apache.axis2.Constants;
> import org.apache.axis2.context.ConfigurationContext;
> import org.apache.axis2.context.MessageContext;
> +import org.apache.axis2.context.ContextFactory;
> import org.apache.axis2.engine.AxisEngine;
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> @@ -108,7 +109,7 @@
> InputStream in = JMSUtils.getInputStream(message);
>
> try {
> - MessageContext msgContext = new MessageContext();
> + MessageContext msgContext = ContextFactory.createMessageContext(axisConf);
>
> // get destination and create correct EPR
> Destination dest = message.getJMSDestination();
> @@ -140,7 +141,6 @@
> axisConf.getAxisConfiguration().getService(serviceName));
> }
>
> - msgContext.setConfigurationContext(axisConf);
> msgContext.setIncomingTransportName(Constants.TRANSPORT_JMS);
> msgContext.setTransportIn(
> axisConf.getAxisConfiguration().getTransportIn(JMSConstants.JMS_QNAME));
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Tue Feb 13 00:48:08 2007
> @@ -31,6 +31,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.TransportInDescription;
> import org.apache.axis2.description.TransportOutDescription;
> import org.apache.axis2.engine.AxisEngine;
> @@ -59,8 +60,7 @@
>
> tOut.setSender(new LocalResponder(sender));
>
> - MessageContext msgCtx = new MessageContext();
> - msgCtx.setConfigurationContext(confContext);
> + MessageContext msgCtx = ContextFactory.createMessageContext(confContext);
> msgCtx.setTransportIn(tIn);
> msgCtx.setTransportOut(tOut);
>
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java Tue Feb 13 00:48:08 2007
> @@ -46,10 +46,7 @@
> import org.apache.axis2.AxisFault;
> import org.apache.axis2.Constants;
> import org.apache.axis2.addressing.EndpointReference;
> -import org.apache.axis2.context.ConfigurationContext;
> -import org.apache.axis2.context.ConfigurationContextFactory;
> -import org.apache.axis2.context.MessageContext;
> -import org.apache.axis2.context.SessionContext;
> +import org.apache.axis2.context.*;
> import org.apache.axis2.description.Parameter;
> import org.apache.axis2.description.TransportInDescription;
> import org.apache.axis2.description.TransportOutDescription;
> @@ -267,8 +264,7 @@
> new QName(org.apache.axis2.Constants.TRANSPORT_MAIL));
> if ((transportIn != null) && (transportOut != null)) {
> // create Message Context
> - msgContext = new MessageContext();
> - msgContext.setConfigurationContext(configurationContext);
> + msgContext = ContextFactory.createMessageContext(configurationContext);
> msgContext.setTransportIn(transportIn);
> msgContext.setTransportOut(transportOut);
> msgContext.setServerSide(true);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java Tue Feb 13 00:48:08 2007
> @@ -33,6 +33,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.engine.AxisEngine;
> import org.apache.axis2.transport.mail.Constants;
> import org.apache.axis2.util.Builder;
> @@ -75,8 +76,7 @@
>
> // create and initialize a message context
> try {
> - msgContext = new MessageContext();
> - msgContext.setConfigurationContext(confContext);
> + msgContext = ContextFactory.createMessageContext(confContext);
> msgContext.setTransportIn(confContext.getAxisConfiguration().getTransportIn(new QName(org.apache.axis2.Constants.TRANSPORT_MAIL)));
> msgContext.setTransportOut(confContext.getAxisConfiguration().getTransportOut(new QName(org.apache.axis2.Constants.TRANSPORT_MAIL)));
>
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPWorker.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPWorker.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPWorker.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPWorker.java Tue Feb 13 00:48:08 2007
> @@ -31,6 +31,7 @@
> import org.apache.axis2.Constants;
> import org.apache.axis2.context.ConfigurationContext;
> import org.apache.axis2.context.MessageContext;
> +import org.apache.axis2.context.ContextFactory;
> import org.apache.axis2.description.TransportInDescription;
> import org.apache.axis2.description.TransportOutDescription;
> import org.apache.axis2.engine.AxisConfiguration;
> @@ -68,9 +69,8 @@
> if ((transportOut != null) && (transportIn != null)) {
>
> // create the Message Context and fill in the values
> - msgContext = new MessageContext();
> + msgContext = ContextFactory.createMessageContext(configurationContext);
> msgContext.setIncomingTransportName(Constants.TRANSPORT_TCP);
> - msgContext.setConfigurationContext(configurationContext);
> msgContext.setTransportIn(transportIn);
> msgContext.setTransportOut(transportOut);
> msgContext.setServerSide(true);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java Tue Feb 13 00:48:08 2007
> @@ -40,10 +40,7 @@
> import org.apache.axis2.addressing.AddressingHelper;
> import org.apache.axis2.addressing.EndpointReference;
> import org.apache.axis2.addressing.RelatesTo;
> -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.*;
> import org.apache.axis2.description.AxisOperation;
> import org.apache.axis2.description.AxisService;
> import org.apache.axis2.description.Parameter;
> @@ -67,9 +64,9 @@
> * Only deals with properties/fields that are the same for both 'normal' and fault responses.
> */
> private static MessageContext createResponseMessageContext(MessageContext inMessageContext) throws AxisFault {
> - MessageContext newmsgCtx = new MessageContext();
> + MessageContext newmsgCtx = ContextFactory.createMessageContext(
> + inMessageContext.getConfigurationContext());
>
> - newmsgCtx.setConfigurationContext(inMessageContext.getConfigurationContext());
> newmsgCtx.setSessionContext(inMessageContext.getSessionContext());
> newmsgCtx.setTransportIn(inMessageContext.getTransportIn());
> newmsgCtx.setTransportOut(inMessageContext.getTransportOut());
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java Tue Feb 13 00:48:08 2007
> @@ -28,11 +28,7 @@
> import org.apache.axiom.soap.SOAPFault;
> import org.apache.axis2.AxisFault;
> import org.apache.axis2.Constants;
> -import org.apache.axis2.context.ConfigurationContext;
> -import org.apache.axis2.context.ConfigurationContextFactory;
> -import org.apache.axis2.context.MessageContext;
> -import org.apache.axis2.context.ServiceContext;
> -import org.apache.axis2.context.ServiceGroupContext;
> +import org.apache.axis2.context.*;
> import org.apache.axis2.description.AxisModule;
> import org.apache.axis2.description.AxisOperation;
> import org.apache.axis2.description.AxisService;
> @@ -131,7 +127,7 @@
> private static ServiceContext fillServiceContextAndServiceGroupContext(AxisService axisService,
> ConfigurationContext configurationContext) {
> String serviceGroupContextId = UUIDGenerator.getUUID();
> - ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configurationContext,
> + ServiceGroupContext serviceGroupContext = ContextFactory.createServiceGroupContext(configurationContext,
> (AxisServiceGroup) axisService.getParent());
>
> serviceGroupContext.setId(serviceGroupContextId);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java Tue Feb 13 00:48:08 2007
> @@ -49,12 +49,10 @@
> public void testCompleteHiracy() throws AxisFault {
> ConfigurationContext configurationContext = new ConfigurationContext(
> axisConfiguration);
> - ServiceGroupContext serviceGroupContext = new ServiceGroupContext(
> - configurationContext, (AxisServiceGroup) axisService.getParent());
> - ServiceContext serviceContext = serviceGroupContext
> - .getServiceContext(axisService);
> - MessageContext msgctx = new MessageContext();
> - msgctx.setConfigurationContext(configurationContext);
> + ServiceGroupContext serviceGroupContext = ContextFactory.createServiceGroupContext(
> + configurationContext,(AxisServiceGroup) axisService.getParent());
> + ServiceContext serviceContext = ContextFactory.createServiceContext(serviceGroupContext,axisService);
> + MessageContext msgctx = ContextFactory.createMessageContext(configurationContext);
> OperationContext opContext = axisOperation.findOperationContext(msgctx,
> serviceContext);
> axisOperation.registerOperationContext(msgctx,opContext);
> @@ -87,8 +85,7 @@
> ConfigurationContext configurationContext = new ConfigurationContext(
> axisConfiguration);
>
> - MessageContext msgctx = new MessageContext();
> - msgctx.setConfigurationContext(configurationContext);
> + MessageContext msgctx = ContextFactory.createMessageContext(configurationContext);
>
> // test the complete Hierarchy built
> assertEquals(msgctx.getParent(), null);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java Tue Feb 13 00:48:08 2007
> @@ -43,10 +43,9 @@
>
> AxisService axisService = new AxisService("TempSC");
> configContext.getAxisConfiguration().addService(axisService);
> - ServiceGroupContext sgc = new ServiceGroupContext(configContext,
> - (AxisServiceGroup) axisService.getParent());
> -
> - ServiceContext sessionContext = sgc.getServiceContext(axisService);
> + ServiceGroupContext sgc =ContextFactory.createServiceGroupContext(configContext,
> + (AxisServiceGroup) axisService.getParent()) ;
> + ServiceContext sessionContext = ContextFactory.createServiceContext(sgc,axisService);
> MessageContext messageContext1 = this.getBasicMessageContext();
>
> messageContext1.setMessageID(UUIDGenerator.getUUID());
> @@ -66,8 +65,7 @@
> }
>
> public MessageContext getBasicMessageContext() throws AxisFault {
> - MessageContext messageContext = new MessageContext();
> - messageContext.setConfigurationContext(configContext);
> + MessageContext messageContext = ContextFactory.createMessageContext(configContext);
> messageContext.setTransportIn(new TransportInDescription(
> new QName("axis2")));
> messageContext.setTransportOut(new TransportOutDescription(new QName(
>
> Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java Tue Feb 13 00:48:08 2007
> @@ -22,6 +22,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.InOnlyAxisOperation;
> @@ -31,7 +32,7 @@
>
> public void testFindOperation() throws AxisFault{
>
> - MessageContext messageContext = new MessageContext();
> + MessageContext messageContext;
> AxisService as1 = new AxisService("Service1");
> AxisConfiguration ac = new AxisConfiguration();
> ac.addService(as1);
> @@ -42,12 +43,11 @@
> as1.addOperation(operation2);
>
> ConfigurationContext cc = new ConfigurationContext(ac);
> - OperationContext oc1 = new OperationContext(operation1);
> - OperationContext oc2 = new OperationContext(operation2);
> + OperationContext oc1 =ContextFactory.createOperationContext(operation1,null);
> + OperationContext oc2 = ContextFactory.createOperationContext(operation2,null);
> cc.registerOperationContext("urn:org.apache.axis2.dispatchers.messageid:123", oc1);
> cc.registerOperationContext("urn:org.apache.axis2.dispatchers.messageid:456", oc2);
> -
> - messageContext.setConfigurationContext(cc);
> + messageContext = ContextFactory.createMessageContext(cc);
> messageContext.addRelatesTo(new RelatesTo("urn:org.apache.axis2.dispatchers.messageid:456"));
> messageContext.setAxisService(as1);
>
>
> Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcherTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcherTest.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcherTest.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcherTest.java Tue Feb 13 00:48:08 2007
> @@ -19,11 +19,7 @@
>
> import org.apache.axis2.AxisFault;
> import org.apache.axis2.addressing.RelatesTo;
> -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.InOnlyAxisOperation;
> @@ -33,17 +29,17 @@
>
> public void testFindService() throws AxisFault{
>
> - MessageContext messageContext = new MessageContext();
> + MessageContext messageContext;
>
> AxisConfiguration ac = new AxisConfiguration();
> ConfigurationContext cc = new ConfigurationContext(ac);
>
> AxisService as1 = new AxisService("Service1");
> - ServiceContext sc1 = new ServiceContext(as1, new ServiceGroupContext(cc, null));
> -
> + ServiceContext sc1 = new ServiceContext(as1, ContextFactory.createServiceGroupContext(cc,null));
> +
> AxisService as2 = new AxisService("Service2");
>
> - ServiceContext sc2 = new ServiceContext(as2, new ServiceGroupContext(cc, null));
> + ServiceContext sc2 = new ServiceContext(as2, ContextFactory.createServiceGroupContext(cc,null));
>
>
> ac.addService(as1);
> @@ -55,15 +51,12 @@
> as2.addOperation(operation2);
>
>
> - OperationContext oc1 = new OperationContext(operation1);
> - oc1.setParent(sc1);
> - OperationContext oc2 = new OperationContext(operation2);
> - oc2.setParent(sc2);
> -
> + OperationContext oc1 = ContextFactory.createOperationContext(operation1,sc1);
> + OperationContext oc2 = ContextFactory.createOperationContext(operation2,sc2);
> +
> cc.registerOperationContext("urn:org.apache.axis2.dispatchers.messageid:123", oc1);
> cc.registerOperationContext("urn:org.apache.axis2.dispatchers.messageid:456", oc2);
> -
> - messageContext.setConfigurationContext(cc);
> + messageContext = ContextFactory.createMessageContext(cc);
> messageContext.addRelatesTo(new RelatesTo("urn:org.apache.axis2.dispatchers.messageid:456"));
>
> RelatesToBasedServiceDispatcher ruisd = new RelatesToBasedServiceDispatcher();
>
> Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcherTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcherTest.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcherTest.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcherTest.java Tue Feb 13 00:48:08 2007
> @@ -19,6 +19,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;
> @@ -29,7 +30,7 @@
> public class RequestURIBasedOperationDispatcherTest extends TestCase {
>
> public void testFindService() throws AxisFault {
> - MessageContext messageContext = new MessageContext();
> + MessageContext messageContext;
> AxisService as1 = new AxisService("Service1");
>
>
> @@ -41,7 +42,7 @@
> ConfigurationContext cc = ConfigurationContextFactory.createEmptyConfigurationContext();
> AxisConfiguration ac = cc.getAxisConfiguration();
> ac.addService(as1);
> - messageContext.setConfigurationContext(cc);
> + messageContext = ContextFactory.createMessageContext(cc);
>
> messageContext.setTo(new EndpointReference("http://127.0.0.1:8080/axis2/services/Service1/operation2"));
> messageContext.setAxisService(as1);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcherTest.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcherTest.java?view=diff&rev=506912&r1=506911&r2=506912
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcherTest.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcherTest.java Tue Feb 13 00:48:08 2007
> @@ -18,6 +18,7 @@
> 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;
>
> @@ -26,7 +27,7 @@
> public class RequestURIBasedServiceDispatcherTest extends TestCase {
>
> public void testFindService() throws AxisFault{
> - MessageContext messageContext = new MessageContext();
> + MessageContext messageContext ;
> AxisService as1 = new AxisService("Service1");
> AxisService as2 = new AxisService("Service2");
>
> @@ -34,8 +35,8 @@
> AxisConfiguration ac = cc.getAxisConfiguration();
> ac.addService(as1);
> ac.addService(as2);
> - messageContext.setConfigurationContext(cc);
> -
> + messageContext = ContextFactory.createMessageContext(cc);
> +
> messageContext.setTo(new EndpointReference("http://127.0.0.1:8080/axis2/services/Service2"));
>
> RequestURIBasedServiceDispatcher ruisd = new RequestURIBasedServiceDispatcher();
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>
>
--
David Illsley - IBM Web Services Development
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org