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 2017/01/22 19:57:53 UTC
svn commit: r1779853 - in /axis/axis2/java/core/trunk/modules/transport:
http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/
http/src/org/apache/axis2/transport/http/
http/src/org/apache/axis2/transport/http/impl/httpclient4/
Author: veithen
Date: Sun Jan 22 19:57:53 2017
New Revision: 1779853
URL: http://svn.apache.org/viewvc?rev=1779853&view=rev
Log:
Merge AbstractHTTPSender and HTTPSender into a single class.
Removed:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java
Modified: axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java?rev=1779853&r1=1779852&r2=1779853&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java Sun Jan 22 19:57:53 2017
@@ -22,9 +22,9 @@ package org.apache.axis2.transport.http.
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.AbstractHTTPSender;
import org.apache.axis2.transport.http.AbstractHTTPTransportSender;
import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.transport.http.HTTPSender;
import org.apache.axis2.transport.http.HTTPTransportConstants;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.logging.Log;
@@ -55,7 +55,7 @@ public class HTTPClient3TransportSender
}
@Override
- protected AbstractHTTPSender createHTTPSender() {
+ protected HTTPSender createHTTPSender() {
return new HTTPSenderImpl();
}
Modified: axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java?rev=1779853&r1=1779852&r2=1779853&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java Sun Jan 22 19:57:53 2017
@@ -356,7 +356,7 @@ public abstract class AbstractHTTPTransp
URL url = new URL(toEPR.getAddress());
// select the Message Sender depending on the REST status
- AbstractHTTPSender sender = createHTTPSender();
+ HTTPSender sender = createHTTPSender();
String httpVersion;
if (messageContext.getProperty(HTTPConstants.HTTP_PROTOCOL_VERSION) != null) {
@@ -392,7 +392,7 @@ public abstract class AbstractHTTPTransp
}
}
- protected abstract AbstractHTTPSender createHTTPSender();
+ protected abstract HTTPSender createHTTPSender();
/**
* @param actionString
Modified: axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java?rev=1779853&r1=1779852&r2=1779853&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java Sun Jan 22 19:57:53 2017
@@ -24,10 +24,12 @@ import org.apache.axiom.mime.ContentType
import org.apache.axiom.mime.Header;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMOutputFormat;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.NamedValue;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.transport.MessageFormatter;
import org.apache.axis2.util.MessageProcessorSelector;
import org.apache.axis2.wsdl.WSDLConstants;
@@ -50,10 +52,39 @@ import java.util.Set;
import javax.xml.namespace.QName;
//TODO - It better if we can define these method in a interface move these into AbstractHTTPSender and get rid of this class.
-public abstract class HTTPSender extends AbstractHTTPSender {
+public abstract class HTTPSender {
private static final Log log = LogFactory.getLog(HTTPSender.class);
+ protected boolean chunked = false;
+ protected String httpVersion = HTTPConstants.HEADER_PROTOCOL_11;
+ protected TransportOutDescription proxyOutSetting = null;
+ protected OMOutputFormat format = new OMOutputFormat();
+
+ public void setChunked(boolean chunked) {
+ this.chunked = chunked;
+ }
+
+ public void setHttpVersion(String version) throws AxisFault {
+ if (version != null) {
+ if (HTTPConstants.HEADER_PROTOCOL_11.equals(version)) {
+ this.httpVersion = HTTPConstants.HEADER_PROTOCOL_11;
+ } else if (HTTPConstants.HEADER_PROTOCOL_10.equals(version)) {
+ this.httpVersion = HTTPConstants.HEADER_PROTOCOL_10;
+ // chunked is not possible with HTTP/1.0
+ this.chunked = false;
+ } else {
+ throw new AxisFault(
+ "Parameter " + HTTPConstants.PROTOCOL_VERSION
+ + " Can have values only HTTP/1.0 or HTTP/1.1");
+ }
+ }
+ }
+
+ public void setFormat(OMOutputFormat format) {
+ this.format = format;
+ }
+
/**
* Start a new HTTP request.
*
Modified: axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java?rev=1779853&r1=1779852&r2=1779853&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java Sun Jan 22 19:57:53 2017
@@ -26,9 +26,9 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.transport.http.AbstractHTTPSender;
import org.apache.axis2.transport.http.AbstractHTTPTransportSender;
import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.transport.http.HTTPSender;
import org.apache.axis2.transport.http.HTTPTransportConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -68,7 +68,7 @@ public class HTTPClient4TransportSender
@Override
- protected AbstractHTTPSender createHTTPSender() {
+ protected HTTPSender createHTTPSender() {
return new HTTPSenderImpl();
}