You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/04/24 16:34:21 UTC
svn commit: r1740701 - in /axis/axis2/java/core/branches/1_7: ./
modules/transport/local/src/org/apache/axis2/transport/local/
Author: veithen
Date: Sun Apr 24 14:34:20 2016
New Revision: 1740701
URL: http://svn.apache.org/viewvc?rev=1740701&view=rev
Log:
Merge r1740693 and r1740694 to the 1.7 branch to remove code that shouldn't have gone into the 1.7.0 release in the first place.
Removed:
axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java (contents, props changed)
axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 24 14:34:20 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739815,1739826
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739815,1739826,1740693-1740694
Modified: axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=1740701&r1=1740700&r2=1740701&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java Sun Apr 24 14:34:20 2016
@@ -20,40 +20,32 @@
package org.apache.axis2.transport.local;
-import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.builder.BuilderUtil;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.transport.TransportSender;
import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.stream.XMLStreamException;
-import java.io.*;
-import java.util.Map;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
/**
* LocalResponder
*/
public class LocalResponder extends AbstractHandler implements TransportSender {
protected static final Log log = LogFactory.getLog(LocalResponder.class);
-
+
+
// fixed for Executing LocalTransport in MulthThread.
private OutputStream out;
public LocalResponder(OutputStream response) {
- this.out = response;
+ this.out = response;
}
public void init(ConfigurationContext confContext, TransportOutDescription transportOut)
@@ -95,38 +87,13 @@ public class LocalResponder extends Abst
TransportUtils.writeMessage(msgContext, out);
}
} else {
- if (/*(msgContext != null) &&*/ (msgContext.getOperationContext() != null) &&
- (msgContext.getOperationContext().getMessageContexts() != null)) {
- MessageContext proxyInMessageContext = msgContext.
- getOperationContext().getMessageContext(WSDL2Constants.MESSAGE_LABEL_IN);
-
- if (proxyInMessageContext != null) {
- MessageContext initialMessageContext = (MessageContext) proxyInMessageContext.
- getProperty(LocalTransportReceiver.IN_MESSAGE_CONTEXT);
-
- if (initialMessageContext != null) {
- handleResponse(msgContext, initialMessageContext);
- } else {
- out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT);
-
- if (out != null) {
- TransportUtils.writeMessage(msgContext, out);
- } else {
- throw new AxisFault(
- "Both the TO and Property MessageContext.TRANSPORT_OUT is Null, No where to send");
- }
+ out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT);
- }
- }
+ if (out != null) {
+ TransportUtils.writeMessage(msgContext, out);
} else {
- out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT);
-
- if (out != null) {
- TransportUtils.writeMessage(msgContext, out);
- } else {
- throw new AxisFault(
- "Both the TO and Property MessageContext.TRANSPORT_OUT is Null, No where to send");
- }
+ throw new AxisFault(
+ "Both the TO and Property MessageContext.TRANSPORT_OUT is Null, No where to send");
}
}
} catch (AxisFault axisFault) {
@@ -136,95 +103,7 @@ public class LocalResponder extends Abst
}
TransportUtils.setResponseWritten(msgContext, true);
-
+
return InvocationResponse.CONTINUE;
}
-
- /**
- * Retrieves the properties from the proxyOutMessageContext and sets the values to the
- * inMessageContext.
- *
- * @param proxyOutMessageContext the active message context
- * @param initialMessageContext the initial message context, which was stored as a property
- * in the proxyOutMessageContext
- * @throws AxisFault AxisFault
- */
- private void handleResponse(MessageContext proxyOutMessageContext, MessageContext initialMessageContext) throws AxisFault {
- MessageContext inMessageContext = initialMessageContext.getOperationContext().
- getMessageContext(WSDL2Constants.MESSAGE_LABEL_IN);
-
- // setting the properties
- Map<String, Object> initialPropertyMap = initialMessageContext.getProperties();
- initialMessageContext.setProperties(initialPropertyMap);
-
- inMessageContext.setEnvelope(getEnvelope(proxyOutMessageContext));
- inMessageContext.setAxisServiceGroup(initialMessageContext.getAxisServiceGroup());
- inMessageContext.setAxisService(initialMessageContext.getAxisService());
- inMessageContext.setAxisOperation(initialMessageContext.getAxisOperation());
- inMessageContext.setAxisMessage(initialMessageContext.getAxisOperation().getMessage(
- WSDLConstants.MESSAGE_LABEL_OUT_VALUE));
- inMessageContext.setIncomingTransportName(Constants.TRANSPORT_LOCAL);
- inMessageContext.setServiceContext(initialMessageContext.getServiceContext());
-
- // set properties on response
- inMessageContext.setServerSide(true);
- inMessageContext.setProperty(MessageContext.TRANSPORT_OUT,
- initialMessageContext.getProperty(MessageContext.TRANSPORT_OUT));
- inMessageContext.setProperty(Constants.OUT_TRANSPORT_INFO,
- initialMessageContext.getProperty(Constants.OUT_TRANSPORT_INFO));
- inMessageContext.setTransportIn(initialMessageContext.getTransportIn());
- inMessageContext.setTransportOut(initialMessageContext.getTransportOut());
-
- if (log.isDebugEnabled()) {
- log.debug("Setting AxisServiceGroup - " + initialMessageContext.getAxisServiceGroup());
- log.debug("Setting AxisService - " + initialMessageContext.getAxisService());
- log.debug("Setting AxisOperation - " + initialMessageContext.getAxisOperation());
- log.debug("Setting AxisMessage - " + initialMessageContext.getAxisOperation().
- getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE));
- log.debug("Setting Incoming Transport name - " + Constants.TRANSPORT_LOCAL);
- log.debug("Setting Service Context " + initialMessageContext.getServiceGroupContext().toString());
-
- log.debug("Setting ServerSide to true");
- log.debug("Setting " + MessageContext.TRANSPORT_OUT + " property to " +
- initialMessageContext.getProperty(MessageContext.TRANSPORT_OUT));
- log.debug("Setting " + Constants.OUT_TRANSPORT_INFO + " property to " +
- initialMessageContext.getProperty(Constants.OUT_TRANSPORT_INFO));
- log.debug("Setting TransportIn - " + initialMessageContext.getTransportIn());
- log.debug("Setting TransportOut - " + initialMessageContext.getTransportOut());
-
- log.debug("Setting ReplyTo - " + initialMessageContext.getReplyTo());
- log.debug("Setting FaultTo - " + initialMessageContext.getFaultTo());
- }
-
- // copy the message type property that is used by the out message to the response message
- inMessageContext.setProperty(Constants.Configuration.MESSAGE_TYPE,
- initialMessageContext.getProperty(Constants.Configuration.MESSAGE_TYPE));
-
- if (initialMessageContext.getMessageID() != null) {
- inMessageContext.setRelationships(
- new RelatesTo[]{new RelatesTo(initialMessageContext.getMessageID())});
- }
-
- inMessageContext.setReplyTo(initialMessageContext.getReplyTo());
- inMessageContext.setFaultTo(initialMessageContext.getFaultTo());
-
- AxisEngine.receive(inMessageContext);
- }
-
- private SOAPEnvelope getEnvelope(MessageContext messageContext) throws AxisFault {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- TransportUtils.writeMessage(messageContext, out);
-
- ByteArrayInputStream bs = new ByteArrayInputStream(out.toByteArray());
- InputStreamReader streamReader = new InputStreamReader(bs);
- OMXMLParserWrapper builder;
-
- try {
- builder = BuilderUtil.getBuilder(streamReader);
- } catch (XMLStreamException e) {
- throw AxisFault.makeFault(e);
- }
-
- return (SOAPEnvelope) builder.getDocumentElement();
- }
}
Propchange: axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Apr 24 14:34:20 2016
@@ -0,0 +1,4 @@
+/axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java:1295540
+/axis/axis2/java/core/branches/AXIOM-420/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java:1334386-1336397
+/axis/axis2/java/core/branches/AXIS2-4318/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
+/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java:1726131,1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739815,1739826,1740693
Modified: axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1740701&r1=1740700&r2=1740701&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Sun Apr 24 14:34:20 2016
@@ -28,31 +28,21 @@ import org.apache.axis2.addressing.Endpo
import org.apache.axis2.builder.BuilderUtil;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.SessionContext;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.util.MessageContextBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.xml.stream.XMLStreamException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
-public class LocalTransportReceiver implements TransportListener {
- protected static final Log log = LogFactory.getLog(LocalTransportReceiver.class);
-
+public class LocalTransportReceiver {
public static ConfigurationContext CONFIG_CONTEXT;
private ConfigurationContext confContext;
private MessageContext inMessageContext;
- /** Whether the call is blocking or non-blocking */
- private boolean nonBlocking = false;
- /** If the call is non-blocking the in message context will be stored in this property */
- public static final String IN_MESSAGE_CONTEXT = "IN_MESSAGE_CONTEXT";
public LocalTransportReceiver(ConfigurationContext configContext) {
confContext = configContext;
@@ -62,11 +52,6 @@ public class LocalTransportReceiver impl
this(CONFIG_CONTEXT);
}
- public LocalTransportReceiver(LocalTransportSender sender, boolean nonBlocking) {
- this(CONFIG_CONTEXT);
- this.nonBlocking = nonBlocking;
- }
-
public void processMessage(MessageContext inMessageContext,
InputStream in,
OutputStream response) throws AxisFault {
@@ -94,27 +79,12 @@ public class LocalTransportReceiver impl
OutputStream response)
throws AxisFault {
MessageContext msgCtx = confContext.createMessageContext();
-
- if (this.nonBlocking) {
- if (log.isDebugEnabled()) {
- log.debug("Setting the in-message context as a property(" + IN_MESSAGE_CONTEXT +
- ") to the current message context");
- }
- // Set the in-message context as a property to the current message context.
- msgCtx.setProperty(IN_MESSAGE_CONTEXT, inMessageContext);
- }
-
if (inMessageContext != null) {
- if (log.isDebugEnabled()) {
- log.debug("Setting the property " + HTTPConstants.MC_HTTP_SERVLETREQUEST + " to " +
- inMessageContext.getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST));
- log.debug("Setting the property " + MessageContext.REMOTE_ADDR + " to " +
- inMessageContext.getProperty(MessageContext.REMOTE_ADDR));
- }
msgCtx.setProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST,
inMessageContext.getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST));
msgCtx.setProperty(MessageContext.REMOTE_ADDR,
inMessageContext.getProperty(MessageContext.REMOTE_ADDR));
+
}
TransportInDescription tIn = confContext.getAxisConfiguration().getTransportIn(
@@ -154,15 +124,6 @@ public class LocalTransportReceiver impl
msgCtx.setEnvelope(envelope);
- if (log.isDebugEnabled()) {
- log.debug("Setting incoming Transport name - " + Constants.TRANSPORT_LOCAL);
- log.debug("Setting TransportIn - " + tIn);
- log.debug("Setting TransportOut - " + localTransportResOut);
- log.debug("Setting To address - " + to);
- log.debug("Setting WSAction - " + action);
- log.debug("Setting Envelope - " + envelope.toString());
- }
-
AxisEngine.receive(msgCtx);
} catch (AxisFault e) {
// write the fault back.
@@ -172,10 +133,6 @@ public class LocalTransportReceiver impl
faultContext.setTransportOut(localTransportResOut);
faultContext.setProperty(MessageContext.TRANSPORT_OUT, response);
- if(log.isDebugEnabled()) {
- log.debug("Setting FaultContext's TransportOut - " + localTransportResOut);
- }
-
AxisEngine.sendFault(faultContext);
} catch (AxisFault axisFault) {
// can't handle this, so just throw it
@@ -183,28 +140,4 @@ public class LocalTransportReceiver impl
}
}
}
-
- public void init(ConfigurationContext axisConf, TransportInDescription transprtIn) throws AxisFault {
- }
-
- public void start() throws AxisFault {
- }
-
- public void stop() throws AxisFault {
- }
-
- public EndpointReference getEPRForService(String serviceName, String ip) throws AxisFault {
- return null;
- }
-
- public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault {
- return new EndpointReference[0];
- }
-
- public SessionContext getSessionContext(MessageContext messageContext) {
- return null;
- }
-
- public void destroy() {
- }
}
Modified: axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java?rev=1740701&r1=1740700&r2=1740701&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java Sun Apr 24 14:34:20 2016
@@ -98,7 +98,7 @@ public class LocalTransportSender extend
InputStream in = new ByteArrayInputStream(out.toByteArray());
ByteArrayOutputStream response = new ByteArrayOutputStream();
- LocalTransportReceiver localTransportReceiver = new LocalTransportReceiver(this, isNonBlocking());
+ LocalTransportReceiver localTransportReceiver = new LocalTransportReceiver(this);
localTransportReceiver.processMessage(msgContext, in, response);
in.close();
@@ -111,11 +111,4 @@ public class LocalTransportSender extend
throw AxisFault.makeFault(e);
}
}
-
- protected boolean isNonBlocking() {
- if (log.isDebugEnabled()) {
- log.debug("Local Transport Sender Selected");
- }
- return false;
- }
}