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 da...@apache.org on 2006/10/30 16:16:53 UTC
svn commit: r469162 - in /webservices/axis2/trunk/java/modules:
jaxws/src/org/apache/axis2/jaxws/core/util/
kernel/src/org/apache/axis2/engine/ kernel/src/org/apache/axis2/receivers/
kernel/src/org/apache/axis2/transport/http/ kernel/src/org/apache/axi...
Author: davidillsley
Date: Mon Oct 30 07:16:52 2006
New Revision: 469162
URL: http://svn.apache.org/viewvc?view=rev&rev=469162
Log:
Refactoring response Message Context creation to take account of lots of common code.
I'm doing this in stages.
Part 4 - Deprecating old methods, modifying classes in Axis2 to use new methods
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.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/DefaultHttpServiceProcessor.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.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/Utils.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java?view=diff&rev=469162&r1=469161&r2=469162
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java Mon Oct 30 07:16:52 2006
@@ -20,6 +20,7 @@
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.core.MessageContext;
import org.apache.axis2.jaxws.message.MessageException;
+import org.apache.axis2.util.MessageContextBuilder;
import org.apache.axis2.util.Utils;
/**
@@ -45,7 +46,7 @@
// There are a number of things that need to be copied over at the
// Axis2 level.
org.apache.axis2.context.MessageContext newAxisMC =
- Utils.createOutMessageContext(sourceAxisMC);
+ MessageContextBuilder.createOutMessageContext(sourceAxisMC);
MessageContext newMC = new MessageContext(newAxisMC);
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=469162&r1=469161&r2=469162
==============================================================================
--- 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 Mon Oct 30 07:16:52 2006
@@ -17,39 +17,28 @@
package org.apache.axis2.engine;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
+import java.util.ArrayList;
+import java.util.Iterator;
+
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.*;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPConstants;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.AddressingConstants.Final;
-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.description.AxisOperation;
-import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.Handler.InvocationResponse;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.TransportSender;
-import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.MessageContextBuilder;
-import org.apache.axis2.util.UUIDGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-
/**
* There is one engine for the Server and the Client. the send() and receive()
* Methods are the basic operations the Sync, Async messageing are build on top.
@@ -135,6 +124,8 @@
* This method is called to handle any error that occurs at inflow or outflow. But if the
* method is called twice, it implies that sending the error handling has failed, in which case
* the method logs the error and exists.
+ * @deprecated (post 1.1 branch)
+ * @see org.apache.axis2.util.MessageContextBuilder.createFaultMessageContext()
*/
public MessageContext createFaultMessageContext(MessageContext processingContext, Throwable e)
throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java?view=diff&rev=469162&r1=469161&r2=469162
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java Mon Oct 30 07:16:52 2006
@@ -20,7 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.util.Utils;
+import org.apache.axis2.util.MessageContextBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -46,7 +46,7 @@
AxisEngine engine =
new AxisEngine(messageCtx.getOperationContext().getServiceContext()
.getConfigurationContext());
- MessageContext faultContext = engine.createFaultMessageContext(messageCtx, fault);
+ MessageContext faultContext = MessageContextBuilder.createFaultMessageContext(messageCtx, fault);
engine.sendFault(faultContext);
}
@@ -54,7 +54,7 @@
Runnable theadedTask = new Runnable() {
public void run() {
try {
- MessageContext newmsgCtx = Utils.createOutMessageContext(messageCtx);
+ MessageContext newmsgCtx = MessageContextBuilder.createOutMessageContext(messageCtx);
newmsgCtx.getOperationContext().addMessageContext(newmsgCtx);
ThreadContextDescriptor tc = setThreadContext(messageCtx);
try {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java?view=diff&rev=469162&r1=469161&r2=469162
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java Mon Oct 30 07:16:52 2006
@@ -20,7 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.util.Utils;
+import org.apache.axis2.util.MessageContextBuilder;
/**
* This is the Absract IN-OUT MEP MessageReceiver. The
@@ -31,7 +31,7 @@
throws AxisFault;
public final void receive(MessageContext msgContext) throws AxisFault {
- MessageContext outMsgContext = Utils.createOutMessageContext(msgContext);
+ MessageContext outMsgContext = MessageContextBuilder.createOutMessageContext(msgContext);
outMsgContext.getOperationContext().addMessageContext(outMsgContext);
ThreadContextDescriptor tc = setThreadContext(msgContext);
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=469162&r1=469161&r2=469162
==============================================================================
--- 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 Mon Oct 30 07:16:52 2006
@@ -36,6 +36,7 @@
import org.apache.axis2.transport.http.server.HttpUtils;
import org.apache.axis2.transport.http.util.RESTUtil;
import org.apache.axis2.util.JavaUtils;
+import org.apache.axis2.util.MessageContextBuilder;
import org.apache.axis2.util.UUIDGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -287,7 +288,7 @@
msgContext.setProperty(MessageContext.TRANSPORT_OUT, out);
AxisEngine engine = new AxisEngine(configContext);
- MessageContext faultContext = engine.createFaultMessageContext(msgContext, e);
+ MessageContext faultContext = MessageContextBuilder.createFaultMessageContext(msgContext, e);
engine.sendFault(faultContext);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java?view=diff&rev=469162&r1=469161&r2=469162
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java Mon Oct 30 07:16:52 2006
@@ -44,6 +44,7 @@
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisEngine;
+import org.apache.axis2.util.MessageContextBuilder;
import org.apache.axis2.util.UUIDGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -191,7 +192,7 @@
msgContext.setProperty(MessageContext.TRANSPORT_OUT, outbuffer.getOutputStream());
msgContext.setProperty(Constants.OUT_TRANSPORT_INFO, outbuffer);
- MessageContext faultContext = engine.createFaultMessageContext(msgContext, e);
+ MessageContext faultContext = MessageContextBuilder.createFaultMessageContext(msgContext, e);
// If the fault is not going along the back channel we should be 202ing
if (AddressingHelper.isFaultRedirected(msgContext)) {
response.setStatusLine(new StatusLine(ver, 202, "Accepted"));
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.java?view=diff&rev=469162&r1=469161&r2=469162
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.java Mon Oct 30 07:16:52 2006
@@ -17,12 +17,12 @@
package org.apache.axis2.transport.mail;
-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.axis2.util.MessageContextBuilder;
+
+import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
public class MailWorker implements Runnable {
private ConfigurationContext configContext = null;
@@ -59,7 +59,7 @@
try {
if (msgContext != null) {
MessageContext faultContext =
- engine.createFaultMessageContext(msgContext, e);
+ MessageContextBuilder.createFaultMessageContext(msgContext, e);
engine.sendFault(faultContext);
}
} catch (Exception e1) {
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=469162&r1=469161&r2=469162
==============================================================================
--- 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 Mon Oct 30 07:16:52 2006
@@ -24,6 +24,7 @@
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.AxisFault;
import org.apache.axis2.transport.mail.Constants;
+import org.apache.axis2.util.MessageContextBuilder;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
@@ -139,7 +140,7 @@
} catch (Exception e) {
try {
if (msgContext != null) {
- MessageContext faultContext = engine.createFaultMessageContext(msgContext, e);
+ MessageContext faultContext = MessageContextBuilder.createFaultMessageContext(msgContext, e);
engine.sendFault(faultContext);
}
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=469162&r1=469161&r2=469162
==============================================================================
--- 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 Mon Oct 30 07:16:52 2006
@@ -30,6 +30,7 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.util.MessageContextBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -103,7 +104,7 @@
if (msgContext != null) {
msgContext.setProperty(MessageContext.TRANSPORT_OUT, socket.getOutputStream());
- MessageContext faultContext = engine.createFaultMessageContext(msgContext, e);
+ MessageContext faultContext = MessageContextBuilder.createFaultMessageContext(msgContext, e);
engine.sendFault(faultContext);
}
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=469162&r1=469161&r2=469162
==============================================================================
--- 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 Mon Oct 30 07:16:52 2006
@@ -60,7 +60,8 @@
}
/**
- * Replaced by MessageContextBuilder.createOutMessageContext()
+ * @deprecated (post 1.1 branch)
+ * @see org.apache.axis2.util.MessageContextBuilder.createOutMessageContext()
*/
public static MessageContext createOutMessageContext(MessageContext inMessageContext) throws AxisFault {
return MessageContextBuilder.createOutMessageContext(inMessageContext);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org