You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2005/10/13 07:19:48 UTC
svn commit: r320665 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
receivers/AbstractInOutAsyncMessageReceiver.java
receivers/AbstractInOutSyncMessageReceiver.java util/Utils.java
Author: chinthaka
Date: Wed Oct 12 22:19:32 2005
New Revision: 320665
URL: http://svn.apache.org/viewcvs?rev=320665&view=rev
Log:
Refactoring some repeating code - 2.
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java?rev=320665&r1=320664&r2=320665&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java Wed Oct 12 22:19:32 2005
@@ -17,13 +17,9 @@
package org.apache.axis2.receivers;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.MessageInformationHeaders;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.util.UUIDGenerator;
+import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,63 +32,28 @@
public abstract void invokeBusinessLogic(MessageContext inMessage, MessageContext outMessage, ServerCallback callback)
throws AxisFault;
- public final void receive(final MessageContext messgeCtx) throws AxisFault {
+ public final void receive(final MessageContext messageCtx) throws AxisFault {
final ServerCallback callback = new ServerCallback() {
public void handleResult(MessageContext result) throws AxisFault {
AxisEngine engine =
new AxisEngine(
- messgeCtx.getOperationContext().getServiceContext().getEngineContext());
- engine.send(messgeCtx);
+ messageCtx.getOperationContext().getServiceContext().getEngineContext());
+ engine.send(messageCtx);
}
public void handleFault(AxisFault fault) throws AxisFault {
AxisEngine engine =
new AxisEngine(
- messgeCtx.getOperationContext().getServiceContext().getEngineContext());
- MessageContext faultContext = engine.createFaultMessageContext(messgeCtx, fault);
+ messageCtx.getOperationContext().getServiceContext().getEngineContext());
+ MessageContext faultContext = engine.createFaultMessageContext(messageCtx, fault);
engine.sendFault(faultContext);
}
};
Runnable theadedTask = new Runnable() {
public void run() {
try {
-
- MessageContext newmsgCtx =
- new MessageContext(messgeCtx.getSystemContext(),
- messgeCtx.getSessionContext(),
- messgeCtx.getTransportIn(),
- messgeCtx.getTransportOut());
-
- MessageInformationHeaders oldMessageInfoHeaders =
- messgeCtx.getMessageInformationHeaders();
- MessageInformationHeaders messageInformationHeaders =
- new MessageInformationHeaders();
- messageInformationHeaders.setMessageId(UUIDGenerator.getUUID());
- messageInformationHeaders.setTo(oldMessageInfoHeaders.getReplyTo());
- messageInformationHeaders.setFaultTo(
- oldMessageInfoHeaders.getFaultTo());
- messageInformationHeaders.setFrom(oldMessageInfoHeaders.getTo());
- messageInformationHeaders.setRelatesTo(
- new RelatesTo(oldMessageInfoHeaders.getMessageId(),
- AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
- messageInformationHeaders.setAction(oldMessageInfoHeaders.getAction());
- newmsgCtx.setMessageInformationHeaders(messageInformationHeaders);
- newmsgCtx.setOperationContext(messgeCtx.getOperationContext());
- newmsgCtx.setServiceContext(messgeCtx.getServiceContext());
- newmsgCtx.setProperty(MessageContext.TRANSPORT_OUT,
- messgeCtx.getProperty(MessageContext.TRANSPORT_OUT));
- newmsgCtx.setProperty(HTTPConstants.HTTPOutTransportInfo,
- messgeCtx.getProperty(HTTPConstants.HTTPOutTransportInfo));
-
- //Setting the charater set encoding
- newmsgCtx.setProperty(MessageContext.CHARACTER_SET_ENCODING, messgeCtx
- .getProperty(MessageContext.CHARACTER_SET_ENCODING));
-
- newmsgCtx.setDoingREST(messgeCtx.isDoingREST());
- newmsgCtx.setDoingMTOM(messgeCtx.isDoingMTOM());
- newmsgCtx.setServerSide(messgeCtx.isServerSide());
-
- invokeBusinessLogic(messgeCtx, newmsgCtx, callback);
+ MessageContext newmsgCtx = Utils.createOutMessageContext(messageCtx);
+ invokeBusinessLogic(messageCtx, newmsgCtx, callback);
} catch (AxisFault e) {
log.error(e);
}
@@ -100,5 +61,7 @@
};
(new Thread(theadedTask)).start();
}
+
+
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java?rev=320665&r1=320664&r2=320665&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java Wed Oct 12 22:19:32 2005
@@ -17,13 +17,9 @@
package org.apache.axis2.receivers;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.MessageInformationHeaders;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.util.UUIDGenerator;
+import org.apache.axis2.util.Utils;
/**
* This is the Absract IN-OUT MEP MessageReceiver. The
@@ -35,41 +31,7 @@
throws AxisFault;
public final void receive(MessageContext msgContext) throws AxisFault {
- MessageContext outMsgContext =
- new MessageContext(msgContext.getSystemContext(),
- msgContext.getSessionContext(),
- msgContext.getTransportIn(),
- msgContext.getTransportOut());
-
- MessageInformationHeaders oldMessageInfoHeaders =
- msgContext.getMessageInformationHeaders();
- MessageInformationHeaders messageInformationHeaders =
- new MessageInformationHeaders();
- messageInformationHeaders.setMessageId(UUIDGenerator.getUUID());
- messageInformationHeaders.setTo(oldMessageInfoHeaders.getReplyTo());
- messageInformationHeaders.setFaultTo(
- oldMessageInfoHeaders.getFaultTo());
- messageInformationHeaders.setFrom(oldMessageInfoHeaders.getTo());
- messageInformationHeaders.setRelatesTo(
- new RelatesTo(oldMessageInfoHeaders.getMessageId(),
- AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
- messageInformationHeaders.setAction(oldMessageInfoHeaders.getAction());
- outMsgContext.setMessageInformationHeaders(messageInformationHeaders);
- outMsgContext.setOperationContext(msgContext.getOperationContext());
- outMsgContext.setServiceContext(msgContext.getServiceContext());
- outMsgContext.setServiceGroupContextId(msgContext.getServiceGroupContextId());
- outMsgContext.setProperty(MessageContext.TRANSPORT_OUT,
- msgContext.getProperty(MessageContext.TRANSPORT_OUT));
- outMsgContext.setProperty(HTTPConstants.HTTPOutTransportInfo,
- msgContext.getProperty(HTTPConstants.HTTPOutTransportInfo));
-
- //Setting the charater set encoding
- outMsgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, msgContext
- .getProperty(MessageContext.CHARACTER_SET_ENCODING));
-
- outMsgContext.setDoingREST(msgContext.isDoingREST());
- outMsgContext.setDoingMTOM(msgContext.isDoingMTOM());
- outMsgContext.setServerSide(msgContext.isServerSide());
+ MessageContext outMsgContext = Utils.createOutMessageContext(msgContext);
invokeBusinessLogic(msgContext, outMsgContext);
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=320665&r1=320664&r2=320665&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Wed Oct 12 22:19:32 2005
@@ -18,11 +18,13 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.addressing.MessageInformationHeaders;
+import org.apache.axis2.addressing.miheaders.RelatesTo;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.description.*;
@@ -30,9 +32,9 @@
import org.apache.axis2.engine.Handler;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.phaseresolver.PhaseException;
-import org.apache.axis2.phaseresolver.PhaseResolver;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
@@ -51,37 +53,43 @@
flow.addHandler(handlerDesc);
}
- // public static void addPhasesToServiceFromFlow(
- // ServiceContext serviceContext,
- // String phaseName,
- // Flow flow,
- // int flowtype)
- // throws AxisFault {
- // ArrayList faultchain = new ArrayList();
- // Phase p = new Phase(Constants.PHASE_SERVICE);
- // faultchain.add(p);
- // addHandlers(flow, p);
- // serviceContext.setPhases(faultchain, flowtype);
- // }
+ public static MessageContext createOutMessageContext(MessageContext inMessageContext) throws AxisFault {
+ MessageContext newmsgCtx =
+ new MessageContext(inMessageContext.getSystemContext(),
+ inMessageContext.getSessionContext(),
+ inMessageContext.getTransportIn(),
+ inMessageContext.getTransportOut());
+ MessageInformationHeaders oldMessageInfoHeaders =
+ inMessageContext.getMessageInformationHeaders();
+ MessageInformationHeaders messageInformationHeaders =
+ new MessageInformationHeaders();
+ messageInformationHeaders.setMessageId(UUIDGenerator.getUUID());
+ messageInformationHeaders.setTo(oldMessageInfoHeaders.getReplyTo());
+ messageInformationHeaders.setFaultTo(
+ oldMessageInfoHeaders.getFaultTo());
+ messageInformationHeaders.setFrom(oldMessageInfoHeaders.getTo());
+ messageInformationHeaders.setRelatesTo(
+ new RelatesTo(oldMessageInfoHeaders.getMessageId(),
+ AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
+ messageInformationHeaders.setAction(oldMessageInfoHeaders.getAction());
+ newmsgCtx.setMessageInformationHeaders(messageInformationHeaders);
+ newmsgCtx.setOperationContext(inMessageContext.getOperationContext());
+ newmsgCtx.setServiceContext(inMessageContext.getServiceContext());
+ newmsgCtx.setProperty(MessageContext.TRANSPORT_OUT,
+ inMessageContext.getProperty(MessageContext.TRANSPORT_OUT));
+ newmsgCtx.setProperty(HTTPConstants.HTTPOutTransportInfo,
+ inMessageContext.getProperty(HTTPConstants.HTTPOutTransportInfo));
+
+ //Setting the charater set encoding
+ newmsgCtx.setProperty(MessageContext.CHARACTER_SET_ENCODING, inMessageContext
+ .getProperty(MessageContext.CHARACTER_SET_ENCODING));
+
+ newmsgCtx.setDoingREST(inMessageContext.isDoingREST());
+ newmsgCtx.setDoingMTOM(inMessageContext.isDoingMTOM());
+ newmsgCtx.setServerSide(inMessageContext.isServerSide());
- // public static void createExecutionChains(ServiceContext serviceContext) throws AxisFault {
- // ServiceDescription service = serviceContext.getServiceConfig();
- // addPhasesToServiceFromFlow(
- // serviceContext,
- // Constants.PHASE_SERVICE,
- // service.getInFlow(),
- // AxisConfiguration.INFLOW);
- // addPhasesToServiceFromFlow(
- // serviceContext,
- // Constants.PHASE_SERVICE,
- // service.getOutFlow(),
- // AxisConfiguration.OUTFLOW);
- // addPhasesToServiceFromFlow(
- // serviceContext,
- // Constants.PHASE_SERVICE,
- // service.getFaultInFlow(),
- // AxisConfiguration.FAULT_IN_FLOW);
- // }
+ return newmsgCtx;
+ }
public static ServiceDescription createSimpleService(QName serviceName,
MessageReceiver messageReceiver,
@@ -199,7 +207,7 @@
public static ServiceContext fillContextInformation(OperationDescription operationDesc, ServiceDescription serviceDesc, ConfigurationContext configurationContext) throws AxisFault {
MessageContext msgContext;
// 2. if null, create new opCtxt
- OperationContext operationContext = new OperationContext(operationDesc);
+ OperationContext operationContext = new OperationContext(operationDesc);
// OperationContext operationContext = OperationContextFactory.createOperationContext(operationDesc.getAxisSpecifMEPConstant(), operationDesc);
// fill the service group context and service context info
@@ -209,7 +217,7 @@
private static ServiceContext fillServiceContextAndServiceGroupContext(ServiceDescription serviceDesc, ConfigurationContext configurationContext) throws AxisFault {
String serviceGroupContextId = UUIDGenerator.getUUID();
- ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configurationContext,serviceDesc.getParent());
+ ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configurationContext, serviceDesc.getParent());
serviceGroupContext.setId(serviceGroupContextId);
configurationContext.registerServiceGroupContext(serviceGroupContext);
return new ServiceContext(serviceDesc, serviceGroupContext);