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 2006/01/05 12:03:15 UTC
svn commit: r366159 - in /webservices/axis2/trunk/java/modules:
addressing/test/org/apache/axis2/handlers/addressing/
codegen/test/org/apache/axis2/rpc/ core/src/org/apache/axis2/client/
core/src/org/apache/axis2/context/ core/src/org/apache/axis2/desc...
Author: deepal
Date: Thu Jan 5 03:01:47 2006
New Revision: 366159
URL: http://svn.apache.org/viewcvs?rev=366159&view=rev
Log:
- removed un necessary constructors from message context and make them as setter method , having multiple constructors its confusing
Modified:
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/rpc/SimpleTest.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Stub.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.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/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java
webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java
webservices/axis2/trunk/java/modules/tool/ideaplugin/plugin/org/apache/ideaplugin/frames/Axi2PluginPage.java
Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- 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 Thu Jan 5 03:01:47 2006
@@ -67,7 +67,7 @@
defaultEnvelope.getHeader().declareNamespace(Submission.WSA_NAMESPACE,
"wsa");
- MessageContext msgCtxt = new MessageContext(null);
+ MessageContext msgCtxt = new MessageContext();
msgCtxt.setTo(epr);
msgCtxt.setReplyTo(replyTo);
msgCtxt.setEnvelope(defaultEnvelope);
@@ -81,7 +81,7 @@
}
public void testHeaderCreationFromMsgCtxtInformation() throws Exception {
- msgCtxt = new MessageContext(null);
+ msgCtxt = new MessageContext();
EndpointReference epr = new EndpointReference("http://www.from.org/service/");
epr.addReferenceParameter(new QName("Reference2"),
@@ -129,7 +129,7 @@
// this will check whether we can add to epr, if there is one already.
EndpointReference eprOne = new EndpointReference("http://whatever.org");
EndpointReference duplicateEpr = new EndpointReference("http://whatever.duplicate.org");
- msgCtxt = new MessageContext(null);
+ msgCtxt = new MessageContext();
SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope defaultEnvelope = factory.getDefaultEnvelope();
msgCtxt.setEnvelope(defaultEnvelope);
Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/rpc/SimpleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/rpc/SimpleTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/rpc/SimpleTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/rpc/SimpleTest.java Thu Jan 5 03:01:47 2006
@@ -197,7 +197,8 @@
client.setOptions(options);
OperationClient opClient = client.createClient(ServiceClient.ANON_OUT_IN_OP);
opClient.setOptions(options);
- MessageContext msgConetxt = new MessageContext(configcontext);
+ MessageContext msgConetxt = new MessageContext();
+ msgConetxt.setConfigurationContext(configcontext);
options.setTo(new EndpointReference("local://services/testService"));
msgConetxt.setEnvelope(env);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java Thu Jan 5 03:01:47 2006
@@ -153,7 +153,8 @@
opDesc = createOpDescAndFillInFlowInformation(opDesc, axisop,
WSDLConstants.MEP_CONSTANT_OUT_IN);
- MessageContext msgctx = new MessageContext(serviceContext.getConfigurationContext());
+ MessageContext msgctx = new MessageContext();
+ msgctx.setConfigurationContext(serviceContext.getConfigurationContext());
if ((envelope == null) || (envelope.getBody() == null)) {
throw new AxisFault("SOAP envelope or SOAP Body can not be null");
@@ -201,7 +202,8 @@
opDesc = createOpDescAndFillInFlowInformation(opDesc, axisop,
WSDLConstants.MEP_CONSTANT_OUT_IN);
- MessageContext msgctx = new MessageContext(serviceContext.getConfigurationContext());
+ MessageContext msgctx = new MessageContext();
+ msgctx.setConfigurationContext(serviceContext.getConfigurationContext());
if ((envelope == null) || (envelope.getBody() == null)) {
throw new AxisFault("SOAP envelope or SOAP Body can not be null");
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java Thu Jan 5 03:01:47 2006
@@ -216,8 +216,8 @@
// process the resule of the invocation
if (callback.envelope != null) {
- MessageContext resMsgctx =
- new MessageContext(serviceContext.getConfigurationContext());
+ MessageContext resMsgctx =new MessageContext();
+ resMsgctx.setConfigurationContext(serviceContext.getConfigurationContext());
resMsgctx.setEnvelope(callback.envelope);
@@ -372,9 +372,11 @@
engine.send(msgctx);
// create the responseMessageContext
- MessageContext responseMessageContext = new MessageContext(msgctx.getConfigurationContext(),
- msgctx.getSessionContext(), msgctx.getTransportIn(),
- msgctx.getTransportOut());
+ MessageContext responseMessageContext = new MessageContext();
+ responseMessageContext.setConfigurationContext(msgctx.getConfigurationContext());
+ responseMessageContext.setSessionContext(msgctx.getSessionContext());
+ responseMessageContext.setTransportIn(msgctx.getTransportIn());
+ responseMessageContext.setTransportOut(msgctx.getTransportOut());
responseMessageContext.setProperty(MessageContext.TRANSPORT_IN,
msgctx.getProperty(MessageContext.TRANSPORT_IN));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java Thu Jan 5 03:01:47 2006
@@ -347,7 +347,8 @@
* @throws AxisFault
*/
protected MessageContext prepareTheSOAPEnvelope(OMElement toSend) throws AxisFault {
- MessageContext msgctx = new MessageContext(serviceContext.getConfigurationContext());
+ MessageContext msgctx = new MessageContext();
+ msgctx.setConfigurationContext(serviceContext.getConfigurationContext());
SOAPEnvelope envelope = createDefaultSOAPEnvelope();
if (toSend != null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java Thu Jan 5 03:01:47 2006
@@ -122,7 +122,8 @@
serviceContext.getAxisService().addOperation(axisOp);
}
- MessageContext msgctx = new MessageContext(serviceContext.getConfigurationContext());
+ MessageContext msgctx = new MessageContext();
+ msgctx.setConfigurationContext(serviceContext.getConfigurationContext());
msgctx.setEnvelope(soapEnvelope);
super.send(axisOp, msgctx);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java Thu Jan 5 03:01:47 2006
@@ -380,7 +380,8 @@
}
// process the resule of the invocation
if (callback.envelope != null) {
- MessageContext resMsgctx = new MessageContext(serviceContext
+ MessageContext resMsgctx = new MessageContext();
+ resMsgctx.setConfigurationContext(serviceContext
.getConfigurationContext());
resMsgctx.setEnvelope(callback.envelope);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Stub.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Stub.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Stub.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Stub.java Thu Jan 5 03:01:47 2006
@@ -26,12 +26,7 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.axis2.om.impl.llom.factory.OMXMLBuilderFactory;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAP12Constants;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPProcessingException;
+import org.apache.axis2.soap.*;
import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
@@ -171,6 +166,8 @@
* Gets the message context.
*/
protected MessageContext getMessageContext() throws AxisFault {
- return new MessageContext(_configurationContext);
+ MessageContext messageContext = new MessageContext();
+ messageContext.setConfigurationContext(_configurationContext);
+ return messageContext;
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Thu Jan 5 03:01:47 2006
@@ -20,15 +20,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
import org.apache.axis2.client.Options;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.ModuleConfiguration;
-import org.apache.axis2.description.ModuleDescription;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.soap.SOAP12Constants;
@@ -182,52 +174,13 @@
/**
* Field sessionContext
*/
- private final SessionContext sessionContext;
+ private SessionContext sessionContext;
private transient TransportOutDescription transportOut;
public MessageContext() {
- this(null, null, null, null);
- }
-
- public MessageContext(ConfigurationContext configContext) {
- this(configContext, null, null, null);
- }
-
- public MessageContext(ConfigurationContext configContext,
- TransportInDescription transportIn,
- TransportOutDescription transportOut) {
- this(configContext, null, transportIn, transportOut);
- this.options.setTransportIn(transportIn);
- this.transportOutname = transportOut.getName();
- }
-
- /**
- * @param sessionContext
- * @param transportIn
- * @param transportOut
- */
- public MessageContext(ConfigurationContext configContext,
- SessionContext sessionContext, TransportInDescription transportIn,
- TransportOutDescription transportOut) {
super(null);
-
options = new Options();
-
- if (sessionContext == null) {
- this.sessionContext = new SessionContext(null);
- } else {
- this.sessionContext = sessionContext;
- }
-
- setTransportIn(transportIn);
- this.transportOut = transportOut;
- this.configurationContext = configContext;
-
- if (transportOut != null) {
- this.transportOutname = transportOut.getName();
- }
-
}
/**
@@ -312,17 +265,16 @@
* <p/> and the way of specifing module configuration is as follows
* <moduleConfig name="addressing"> <parameter name="addressingPara"
* locked="false">N/A</parameter> </moduleConfig>
- *
- * @param key :
- * Parameter Name
+ *
+ * @param key :
+ * Parameter Name
* @param moduleName :
- * Name of the module
- * @param handler
- * <code>HandlerDescription</code>
+ * Name of the module
+ * @param handler <code>HandlerDescription</code>
* @return Parameter <code>Parameter</code>
*/
public Parameter getModuleParameter(String key, String moduleName,
- HandlerDescription handler) {
+ HandlerDescription handler) {
Parameter param;
ModuleConfiguration moduleConfig;
@@ -435,7 +387,7 @@
* <li> If parameter is not found or if axisService is null, search in
* AxisConfiguration </li>
* </ol>
- *
+ *
* @param key
* @return Parameter <code>Parameter</code>
*/
@@ -485,10 +437,8 @@
/**
* Set a property for this message context.
*
- * @param name
- * name of the property
- * @param value
- * the value to set
+ * @param name name of the property
+ * @param value the value to set
*/
public void setProperty(String name, Object value) {
// we override this method here to make sure the properties are set on
@@ -502,8 +452,7 @@
* that the entire hierarchy is not present, I will start at whatever level
* has been set and start there.
*
- * @param name
- * name of the property to search for
+ * @param name name of the property to search for
* @return the value of the property, or null if the property is not found
*/
public Object getProperty(String name) {
@@ -575,6 +524,11 @@
return sessionContext;
}
+ public void setSessionContext(SessionContext sessionContext) {
+ this.sessionContext = sessionContext;
+ }
+
+
/**
* @return Returns soap action.
*/
@@ -747,7 +701,7 @@
* causes the current handler/phase indexes to reset to 0, since we have new
* Handlers to execute (this usually only happens at initialization and when
* a fault occurs).
- *
+ *
* @param executionChain
*/
public void setExecutionChain(ArrayList executionChain) {
@@ -866,7 +820,7 @@
/**
* Sets the service context id.
- *
+ *
* @param serviceContextID
*/
public void setServiceContextID(String serviceContextID) {
@@ -947,9 +901,8 @@
* parent so that that becomes the default. That allows the user to override
* specific options on a given message context and not affect the overall
* options.
- *
- * @param options
- * the options to set
+ *
+ * @param options the options to set
*/
public void setOptions(Options options) {
this.options.setParent(options);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java Thu Jan 5 03:01:47 2006
@@ -137,6 +137,7 @@
public void addMessageContext(MessageContext mc) throws AxisFault {
axisOp.registerOperationContext(mc, oc);
mc.setServiceContext(sc);
+ mc.setConfigurationContext(sc.getConfigurationContext());
}
/**
@@ -291,9 +292,12 @@
engine.send(msgctx);
// create the responseMessageContext
- MessageContext responseMessageContext = new MessageContext(msgctx
- .getConfigurationContext(), msgctx.getSessionContext(), msgctx
- .getTransportIn(), msgctx.getTransportOut());
+ MessageContext responseMessageContext = new MessageContext();
+
+ responseMessageContext.setConfigurationContext(msgctx.getConfigurationContext());
+ responseMessageContext.setSessionContext(msgctx.getSessionContext());
+ responseMessageContext.setTransportIn(msgctx.getTransportIn());
+ responseMessageContext.setTransportOut(msgctx.getTransportOut());
responseMessageContext.setProperty(MessageContext.TRANSPORT_IN, msgctx
.getProperty(MessageContext.TRANSPORT_IN));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Thu Jan 5 03:01:47 2006
@@ -26,15 +26,7 @@
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAP12Constants;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFault;
-import org.apache.axis2.soap.SOAPFaultCode;
-import org.apache.axis2.soap.SOAPFaultDetail;
-import org.apache.axis2.soap.SOAPFaultReason;
-import org.apache.axis2.soap.SOAPHeaderBlock;
-import org.apache.axis2.soap.SOAPProcessingException;
+import org.apache.axis2.soap.*;
import org.apache.axis2.transport.TransportSender;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -130,10 +122,11 @@
throw new AxisFault(Messages.getMessage("errorwhileProcessingFault"));
}
- MessageContext faultContext = new MessageContext(engineContext,
- processingContext.getSessionContext(),
- processingContext.getTransportIn(),
- processingContext.getTransportOut());
+ MessageContext faultContext = new MessageContext();
+ faultContext.setConfigurationContext(engineContext);
+ faultContext.setSessionContext(processingContext.getSessionContext());
+ faultContext.setTransportIn(processingContext.getTransportIn());
+ faultContext.setTransportOut(processingContext.getTransportOut());
faultContext.setProcessingFault(true);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Thu Jan 5 03:01:47 2006
@@ -23,6 +23,7 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.SessionContext;
+import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEngine;
import javax.servlet.ServletConfig;
@@ -46,18 +47,20 @@
private static final String CONFIGURATION_CONTEXT = "CONFIGURATION_CONTEXT";
public static final String SESSION_ID = "SessionId";
private ConfigurationContext configContext;
+ private AxisConfiguration axisConfiguration;
private ListingAgent lister;
private MessageContext createAndSetInitialParamsToMsgCtxt(Object sessionContext,
MessageContext msgContext, HttpServletResponse httpServletResponse,
HttpServletRequest httpServletRequest)
throws AxisFault {
- msgContext =
- new MessageContext(configContext, (SessionContext) sessionContext,
- configContext.getAxisConfiguration()
- .getTransportIn(new QName(Constants
- .TRANSPORT_HTTP)), configContext.getAxisConfiguration()
- .getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
+ msgContext = new MessageContext();
+ msgContext.setConfigurationContext(configContext);
+ msgContext.setSessionContext((SessionContext) sessionContext);
+ msgContext.setTransportIn(axisConfiguration.getTransportIn(new QName(Constants
+ .TRANSPORT_HTTP)));
+ msgContext.setTransportOut(axisConfiguration.getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
+
msgContext.setProperty(Constants.OUT_TRANSPORT_INFO,
new ServletBasedOutTransportInfo(httpServletResponse));
msgContext.setProperty(MessageContext.TRANSPORT_HEADERS,
@@ -185,6 +188,7 @@
try {
configContext = initConfigContext(config);
lister = new ListingAgent(configContext);
+ axisConfiguration = configContext.getAxisConfiguration();
config.getServletContext().setAttribute(CONFIGURATION_CONTEXT, configContext);
} catch (Exception e) {
throw new ServletException(e);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java Thu Jan 5 03:01:47 2006
@@ -45,11 +45,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.SocketException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
public class HTTPWorker implements HttpRequestHandler {
@@ -80,9 +76,13 @@
String cookieID = request.getCookieID();
SessionContext sessionContext = getSessionContext(cookieID);
- msgContext = new MessageContext(configurationContext, sessionContext,
- configurationContext.getAxisConfiguration().getTransportIn(
- new QName(Constants.TRANSPORT_HTTP)), transportOut);
+ msgContext = new MessageContext();
+
+ msgContext.setConfigurationContext(configurationContext);
+ msgContext.setSessionContext(sessionContext);
+ msgContext.setTransportIn(configurationContext.getAxisConfiguration().getTransportIn(
+ new QName(Constants.TRANSPORT_HTTP)));
+ msgContext.setTransportOut(transportOut);
msgContext.setServerSide(true);
HttpVersion ver = request.getRequestLine().getHttpVersion();
@@ -125,34 +125,34 @@
if (HTTPConstants.HEADER_GET.equals(request.getRequestLine().getMethod())) {
String uri = request.getRequestLine().getUri();
log.debug("HTTP GET:" + uri);
- if(uri.equals("/favicon.ico")) {
+ if (uri.equals("/favicon.ico")) {
response.setStatusLine(request.getRequestLine().getHttpVersion(), 301, "Redirect");
response.addHeader(new Header("Location", "http://ws.apache.org/favicon.ico"));
conn.writeResponse(response);
- return true;
+ return true;
}
- if(!uri.startsWith("/axis2/services/")) {
+ if (!uri.startsWith("/axis2/services/")) {
response.setStatusLine(request.getRequestLine().getHttpVersion(), 301, "Redirect");
response.addHeader(new Header("Location", "/axis2/services/"));
conn.writeResponse(response);
- return true;
+ return true;
}
-
- if(uri.endsWith("?wsdl")){
- String serviceName = uri.substring(uri.lastIndexOf("/") + 1, uri.length()-5);
+
+ if (uri.endsWith("?wsdl")) {
+ String serviceName = uri.substring(uri.lastIndexOf("/") + 1, uri.length() - 5);
HashMap services = configurationContext.getAxisConfiguration().getServices();
AxisService service = (AxisService) services.get(serviceName);
- if(service != null){
+ if (service != null) {
response.addHeader(new Header("Content-Type", "text/xml"));
- String url = conn.getURL(uri.substring(1,uri.length()-5));
- service.printWSDL(baos,url);
+ String url = conn.getURL(uri.substring(1, uri.length() - 5));
+ service.printWSDL(baos, url);
byte[] buf = baos.toByteArray();
response.setBody(new ByteArrayInputStream(buf));
conn.writeResponse(response);
return true;
}
}
-
+
// It is GET handle the Get request
boolean processed = HTTPTransportUtils.processHTTPGetRequest(
msgContext, inStream, baos, request.getContentType(),
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java Thu Jan 5 03:01:47 2006
@@ -45,12 +45,7 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
/**
* SimpleJMSWorker is a worker thread that processes messages that are
@@ -241,7 +236,10 @@
configurationContext.getAxisConfiguration().getTransportOut(
new QName(Constants.TRANSPORT_JMS));
- msgContext = new MessageContext(configurationContext, transportIn, transportOut);
+ msgContext = new MessageContext();
+ msgContext.setConfigurationContext(configurationContext);
+ msgContext.setTransportIn(transportIn);
+ msgContext.setTransportOut(transportOut);
msgContext.setProperty(Constants.OUT_TRANSPORT_INFO,
new JMSOutTransportInfo(message.getJMSReplyTo(),
listener.getProperties()));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Thu Jan 5 03:01:47 2006
@@ -61,7 +61,10 @@
tOut.setSender(new LocalResponder(sender));
- MessageContext msgCtx = new MessageContext(confContext, tIn, tOut);
+ MessageContext msgCtx = new MessageContext();
+ msgCtx.setConfigurationContext(confContext);
+ msgCtx.setTransportIn(tIn);
+ msgCtx.setTransportOut(tOut);
msgCtx.setTo(to);
msgCtx.setServerSide(true);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java Thu Jan 5 03:01:47 2006
@@ -48,7 +48,7 @@
public class MailWorker implements Runnable {
protected static Log log = LogFactory.getLog(MailWorker.class.getName());
private String contentType = "text/xml";
- private ConfigurationContext reg = null;
+ private ConfigurationContext configContext = null;
private Properties prop = new Properties();
private Session session = Session.getDefaultInstance(prop, null);
private MimeMessage mimeMessage;
@@ -61,27 +61,30 @@
*/
public MailWorker(MimeMessage mimeMessage, ConfigurationContext reg) {
this.mimeMessage = mimeMessage;
- this.reg = reg;
+ this.configContext = reg;
}
/**
* The main workhorse method.
*/
public void run() {
- AxisEngine engine = new AxisEngine(reg);
+ AxisEngine engine = new AxisEngine(configContext);
MessageContext msgContext = null;
// create and initialize a message context
try {
TransportInDescription transportIn =
- reg.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_MAIL));
+ configContext.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_MAIL));
TransportOutDescription transportOut =
- reg.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_MAIL));
+ configContext.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_MAIL));
if ((transportIn != null) && (transportOut != null)) {
// create Message Context
- msgContext = new MessageContext(reg, transportIn, transportOut);
+ msgContext = new MessageContext();
+ msgContext.setConfigurationContext(configContext);
+ msgContext.setTransportIn(transportIn);
+ msgContext.setTransportOut(transportOut);
msgContext.setServerSide(true);
msgContext.setProperty(MailSrvConstants.CONTENT_TYPE, mimeMessage.getContentType());
msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java Thu Jan 5 03:01:47 2006
@@ -59,13 +59,15 @@
// create and initialize a message context
try {
- msgContext =
- new MessageContext(confContext,
- confContext.getAxisConfiguration()
- .getTransportIn(new QName(Constants
- .TRANSPORT_MAIL)), confContext.getAxisConfiguration()
- .getTransportOut(new QName(Constants
- .TRANSPORT_MAIL)));
+ msgContext = new MessageContext();
+ msgContext.setConfigurationContext(confContext);
+ msgContext.setTransportIn(confContext.getAxisConfiguration()
+ .getTransportIn(new QName(Constants
+ .TRANSPORT_MAIL)));
+ msgContext.setTransportOut(confContext.getAxisConfiguration()
+ .getTransportOut(new QName(Constants
+ .TRANSPORT_MAIL)));
+
msgContext.setServerSide(true);
msgContext.setProperty(MailSrvConstants.CONTENT_TYPE, mimeMessage.getContentType());
msgContext.setWSAAction(getMailHeader(MailSrvConstants.HEADER_SOAP_ACTION,
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java Thu Jan 5 03:01:47 2006
@@ -68,7 +68,10 @@
if ((transportOut != null) && (transportIn != null)) {
// create the Message Context and fill in the values
- msgContext = new MessageContext(configurationContext, transportIn, transportOut);
+ msgContext = new MessageContext();
+ msgContext.setConfigurationContext(configurationContext);
+ msgContext.setTransportIn(transportIn);
+ msgContext.setTransportOut(transportOut);
msgContext.setServerSide(true);
OutputStream out = socket.getOutputStream();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Thu Jan 5 03:01:47 2006
@@ -22,22 +22,8 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.RelatesTo;
import org.apache.axis2.client.Options;
-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.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.Flow;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.ModuleDescription;
-import org.apache.axis2.description.OutInAxisOperation;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.PhaseRule;
+import org.apache.axis2.context.*;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
import org.apache.axis2.engine.MessageReceiver;
@@ -63,10 +49,13 @@
}
public static MessageContext createOutMessageContext(MessageContext inMessageContext) {
- MessageContext newmsgCtx = new MessageContext(inMessageContext.getConfigurationContext(),
- inMessageContext.getSessionContext(),
- inMessageContext.getTransportIn(),
- inMessageContext.getTransportOut());
+ MessageContext newmsgCtx = new MessageContext();
+
+ newmsgCtx.setConfigurationContext(inMessageContext.getConfigurationContext());
+ newmsgCtx.setSessionContext(inMessageContext.getSessionContext());
+ newmsgCtx.setTransportIn(inMessageContext.getTransportIn());
+ newmsgCtx.setTransportOut(inMessageContext.getTransportOut());
+
Options oldOptions =
inMessageContext.getOptions();
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java Thu Jan 5 03:01:47 2006
@@ -52,7 +52,8 @@
configurationContext, axisService.getParent());
ServiceContext serviceContext = serviceGroupContext
.getServiceContext(axisService);
- MessageContext msgctx = new MessageContext(configurationContext);
+ MessageContext msgctx = new MessageContext();
+ msgctx.setConfigurationContext(configurationContext);
OperationContext opContext = axisOperation.findOperationContext(msgctx,
serviceContext);
msgctx.setServiceContext(serviceContext);
@@ -84,7 +85,8 @@
ConfigurationContext configurationContext = new ConfigurationContext(
axisConfiguration);
- MessageContext msgctx = new MessageContext(configurationContext);
+ MessageContext msgctx = new MessageContext();
+ msgctx.setConfigurationContext(configurationContext);
// test the complete Hierarchy built
assertEquals(msgctx.getParent(), null);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java Thu Jan 5 03:01:47 2006
@@ -19,11 +19,7 @@
import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.util.UUIDGenerator;
@@ -63,10 +59,14 @@
}
public MessageContext getBasicMessageContext() throws AxisFault {
-
- return new MessageContext(configContext, new TransportInDescription(
- new QName("axis")), new TransportOutDescription(new QName(
+ MessageContext messageContext = new MessageContext();
+ messageContext.setConfigurationContext(configContext);
+ messageContext.setTransportIn(new TransportInDescription(
+ new QName("axis")));
+ messageContext.setTransportOut(new TransportOutDescription(new QName(
"axis")));
+
+ return messageContext;
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java Thu Jan 5 03:01:47 2006
@@ -39,7 +39,7 @@
private QName serviceName = new QName("NullService");
private QName operationName = new QName("DummyOp");
- private ConfigurationContext engineContext;
+ private ConfigurationContext configConetxt;
private TransportOutDescription transportOut;
private TransportInDescription transportIn;
@@ -50,7 +50,7 @@
super(arg0);
executedHandlers = new ArrayList();
AxisConfiguration engineRegistry = new AxisConfiguration();
- engineContext = new ConfigurationContext(engineRegistry);
+ configConetxt = new ConfigurationContext(engineRegistry);
transportOut = new TransportOutDescription(new QName("null"));
transportOut.setSender(new CommonsHTTPTransportSender());
transportIn = new TransportInDescription(new QName("null"));
@@ -60,7 +60,7 @@
protected void setUp() throws Exception {
AxisService service = new AxisService(serviceName.getLocalPart());
- engineContext.getAxisConfiguration().addService(service);
+ configConetxt.getAxisConfiguration().addService(service);
AxisOperation axisOp = new InOutAxisOperation(operationName);
axisOp.setMessageReceiver(new MessageReceiver() {
@@ -71,7 +71,10 @@
service.addOperation(axisOp);
service.mapActionToOperation(operationName.getLocalPart(), axisOp);
- mc = new MessageContext(engineContext, transportIn, transportOut);
+ mc = new MessageContext();
+ mc.setConfigurationContext(configConetxt);
+ mc.setTransportIn(transportIn);
+ mc.setTransportOut(transportOut);
mc.setTransportOut(transportOut);
mc.setServerSide(true);
@@ -127,7 +130,7 @@
mc.setTo(
new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(engineContext);
+ AxisEngine engine = new AxisEngine(configConetxt);
engine.receive(mc);
assertEquals(14, executedHandlers.size());
for (int i = 0; i < 14; i++) {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Thu Jan 5 03:01:47 2006
@@ -38,7 +38,7 @@
private QName serviceName = new QName("axis/services/NullService");
private QName operationName = new QName("NullOperation");
private AxisService service;
- private ConfigurationContext engineContext;
+ private ConfigurationContext configContext;
private AxisOperation axisOp;
public EngineWithoutPhaseResolvingTest() {
@@ -51,7 +51,7 @@
protected void setUp() throws Exception {
engineRegistry = new AxisConfiguration();
- engineContext = new ConfigurationContext(engineRegistry);
+ configContext = new ConfigurationContext(engineRegistry);
TransportOutDescription transport = new TransportOutDescription(
new QName("null"));
@@ -71,10 +71,10 @@
engineRegistry.addService(service);
service.addOperation(axisOp);
- mc =
- new MessageContext(engineContext,
- transportIn,
- transport);
+ mc = new MessageContext();
+ mc.setConfigurationContext(configContext);
+ mc.setTransportIn(transportIn);
+ mc.setTransportOut(transport);
OperationContext opCOntext = new OperationContext(axisOp);
@@ -94,7 +94,7 @@
public void testServerReceive() throws Exception {
mc.setTo(
new EndpointReference("axis/services/NullService"));
- AxisEngine engine = new AxisEngine(engineContext);
+ AxisEngine engine = new AxisEngine(configContext);
mc.setServerSide(true);
engine.receive(mc);
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java Thu Jan 5 03:01:47 2006
@@ -39,7 +39,8 @@
ConfigurationContext engineContext = new ConfigurationContext(er);
- MessageContext msgctx = new MessageContext(engineContext);
+ MessageContext msgctx = new MessageContext();
+ msgctx.setConfigurationContext(engineContext);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java Thu Jan 5 03:01:47 2006
@@ -39,8 +39,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(
- new ConfigurationContext(new AxisConfiguration()));
+ MessageContext msg = new MessageContext();
+ msg.setConfigurationContext(new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java Thu Jan 5 03:01:47 2006
@@ -38,7 +38,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(
+ MessageContext msg = new MessageContext();
+ msg.setConfigurationContext(
new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java Thu Jan 5 03:01:47 2006
@@ -40,7 +40,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(
+ MessageContext msg = new MessageContext();
+ msg.setConfigurationContext(
new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java Thu Jan 5 03:01:47 2006
@@ -40,7 +40,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(
+ MessageContext msg = new MessageContext();
+ msg.setConfigurationContext(
new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java Thu Jan 5 03:01:47 2006
@@ -40,7 +40,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(
+ MessageContext msg = new MessageContext();
+ msg.setConfigurationContext(
new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java Thu Jan 5 03:01:47 2006
@@ -40,7 +40,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(
+ MessageContext msg = new MessageContext();
+ msg.setConfigurationContext(
new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java Thu Jan 5 03:01:47 2006
@@ -40,7 +40,8 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(
+ MessageContext msg = new MessageContext();
+ msg.setConfigurationContext(
new ConfigurationContext(new AxisConfiguration()));
PhaseHolder ph = new PhaseHolder(phases);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java Thu Jan 5 03:01:47 2006
@@ -63,7 +63,8 @@
AxisConfiguration axisConfig = new AxisConfiguration();
ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
- MessageContext msgCtx = new MessageContext(configCtx);
+ MessageContext msgCtx = new MessageContext();
+ msgCtx.setConfigurationContext(configCtx);
msgCtx.setEnvelope(reqEnv);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java Thu Jan 5 03:01:47 2006
@@ -48,7 +48,8 @@
AxisConfiguration axisConfig = new AxisConfiguration();
ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
- MessageContext msgCtx = new MessageContext(configCtx);
+ MessageContext msgCtx = new MessageContext();
+ msgCtx.setConfigurationContext(configCtx);
SOAPEnvelope requestEnvilope = util.getEchoSoapEnvelope();
msgCtx.setEnvelope(requestEnvilope);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java Thu Jan 5 03:01:47 2006
@@ -48,7 +48,8 @@
AxisConfiguration axisConfig = new AxisConfiguration();
ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
- MessageContext msgCtx = new MessageContext(configCtx);
+ MessageContext msgCtx = new MessageContext();
+ msgCtx.setConfigurationContext(configCtx);
SOAPEnvelope requestEnvilope = util.getEchoSoapEnvelope();
msgCtx.setEnvelope(requestEnvilope);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java Thu Jan 5 03:01:47 2006
@@ -74,7 +74,8 @@
}
protected MessageContext getMessageContext(SOAPEnvelope envelope) throws AxisFault {
- MessageContext msgctx = new MessageContext(getServiceContext().getConfigurationContext());
+ MessageContext msgctx = new MessageContext();
+ msgctx.setConfigurationContext(getServiceContext().getConfigurationContext());
msgctx.setEnvelope(envelope);
return msgctx;
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java Thu Jan 5 03:01:47 2006
@@ -85,7 +85,8 @@
.getServiceContext(clientService);
serviceClient = new ServiceClient(configContext, clientService);
- MessageContext msgctx = new MessageContext(serviceContext .getConfigurationContext());
+ MessageContext msgctx = new MessageContext();
+ msgctx.setConfigurationContext(serviceContext.getConfigurationContext());
msgctx.setEnvelope(envelope);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java Thu Jan 5 03:01:47 2006
@@ -131,7 +131,8 @@
.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
rpcClient.setOptions(options);
- MessageContext reqMessageContext = new MessageContext(configConetxt);
+ MessageContext reqMessageContext = new MessageContext();
+ reqMessageContext.setConfigurationContext(configConetxt);
OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
opClinet.setOptions(options);
reqMessageContext.setEnvelope(envelope);
@@ -183,7 +184,8 @@
.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
rpcClient.setOptions(options);
- MessageContext reqMessageContext = new MessageContext(configConetxt);
+ MessageContext reqMessageContext = new MessageContext();
+ reqMessageContext.setConfigurationContext(configConetxt);
OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
opClinet.setOptions(options);
reqMessageContext.setEnvelope(envelope);
@@ -230,7 +232,8 @@
.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
rpcClient.setOptions(options);
- MessageContext reqMessageContext = new MessageContext(configConetxt);
+ MessageContext reqMessageContext = new MessageContext();
+ reqMessageContext.setConfigurationContext(configConetxt);
OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
opClinet.setOptions(options);
reqMessageContext.setEnvelope(envelope);
@@ -281,7 +284,8 @@
.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
rpcClient.setOptions(options);
- MessageContext reqMessageContext = new MessageContext(configConetxt);
+ MessageContext reqMessageContext = new MessageContext();
+ reqMessageContext.setConfigurationContext(configConetxt);
OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
opClinet.setOptions(options);
reqMessageContext.setEnvelope(envelope);
@@ -340,7 +344,8 @@
.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
rpcClient.setOptions(options);
- MessageContext reqMessageContext = new MessageContext(configConetxt);
+ MessageContext reqMessageContext = new MessageContext();
+ reqMessageContext.setConfigurationContext(configConetxt);
OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
opClinet.setOptions(options);
reqMessageContext.setEnvelope(envelope);
@@ -400,7 +405,8 @@
.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
rpcClient.setOptions(options);
- MessageContext reqMessageContext = new MessageContext(configConetxt);
+ MessageContext reqMessageContext = new MessageContext();
+ reqMessageContext.setConfigurationContext(configConetxt);
OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
opClinet.setOptions(options);
reqMessageContext.setEnvelope(envelope);
@@ -461,7 +467,8 @@
.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
rpcClient.setOptions(options);
- MessageContext reqMessageContext = new MessageContext(configConetxt);
+ MessageContext reqMessageContext = new MessageContext();
+ reqMessageContext.setConfigurationContext(configConetxt);
OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
opClinet.setOptions(options);
reqMessageContext.setEnvelope(envelope);
@@ -536,7 +543,8 @@
.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
rpcClient.setOptions(options);
- MessageContext reqMessageContext = new MessageContext(configConetxt);
+ MessageContext reqMessageContext = new MessageContext();
+ reqMessageContext.setConfigurationContext(configConetxt);
OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
opClinet.setOptions(options);
reqMessageContext.setEnvelope(envelope);
@@ -602,7 +610,8 @@
.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
RPCServiceClient rpcClient = new RPCServiceClient(configConetxt, null);
rpcClient.setOptions(options);
- MessageContext reqMessageContext = new MessageContext(configConetxt);
+ MessageContext reqMessageContext = new MessageContext();
+ reqMessageContext.setConfigurationContext(configConetxt);
OperationClient opClinet = rpcClient.createClient(ServiceClient.ANON_OUT_IN_OP);
opClinet.setOptions(options);
reqMessageContext.setEnvelope(envelope);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Thu Jan 5 03:01:47 2006
@@ -208,7 +208,8 @@
SOAPEnvelope envelope = factory.getDefaultEnvelope();
envelope.getBody().addChild(method);
- MessageContext requestContext = new MessageContext(configContext);
+ MessageContext requestContext = new MessageContext();
+ requestContext.setConfigurationContext(configContext);
requestContext.setAxisService(clientService);
requestContext.setAxisOperation(opdesc);
requestContext.setEnvelope(envelope);
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java Thu Jan 5 03:01:47 2006
@@ -122,7 +122,8 @@
} catch (DeploymentException e) {
e.printStackTrace();
}
- msgContext = new MessageContext(configContext);
+ msgContext = new MessageContext();
+ msgContext.setConfigurationContext(configContext);
msgContext.setEnvelope(reqEnv);
return msgContext;
}
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java Thu Jan 5 03:01:47 2006
@@ -119,7 +119,8 @@
ConfigurationContextFactory fac = new ConfigurationContextFactory();
ConfigurationContext configContext = fac.createConfigurationContextFromFileSystem(
"doGoogleSearch");
- msgContext = new MessageContext(configContext);
+ msgContext = new MessageContext();
+ msgContext.setConfigurationContext(configContext);
msgContext.setEnvelope(envelope);
return msgContext;
}
Modified: webservices/axis2/trunk/java/modules/tool/ideaplugin/plugin/org/apache/ideaplugin/frames/Axi2PluginPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/ideaplugin/plugin/org/apache/ideaplugin/frames/Axi2PluginPage.java?rev=366159&r1=366158&r2=366159&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/ideaplugin/plugin/org/apache/ideaplugin/frames/Axi2PluginPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/ideaplugin/plugin/org/apache/ideaplugin/frames/Axi2PluginPage.java Thu Jan 5 03:01:47 2006
@@ -77,9 +77,6 @@
imglbl = new LogoPage();
getContentPane().add(imglbl);
setVisible(true);
-// setBackground(Color.white);
-// getContentPane().setBackground(Color.white);
- // setSize(getPreferredSize());
}
@@ -90,9 +87,6 @@
public static void main(String args[]) {
Axi2PluginPage window = new Axi2PluginPage();
window.showUI();
-// window.setTitle("Axi2PluginPage");
-// window.pack();
-// window.show();
}
public void actionPerformed(ActionEvent e) {