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 11:54:53 UTC
svn commit: r1740686 - in /axis/axis2/java/core/trunk: ./
modules/integration/ modules/integration/test/org/apache/axis2/engine/
modules/integration/test/org/apache/axis2/transport/http/
modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/ mo...
Author: veithen
Date: Sun Apr 24 09:54:52 2016
New Revision: 1740686
URL: http://svn.apache.org/viewvc?rev=1740686&view=rev
Log:
AXIS2-5761: Deprecate and move the Commons HttpClient 3.x based transport to a separate module.
Added:
axis/axis2/java/core/trunk/modules/transport/http-hc3/ (with props)
axis/axis2/java/core/trunk/modules/transport/http-hc3/pom.xml (with props)
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
- copied unchanged from r1740676, axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/
- copied from r1735661, axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java
- copied unchanged from r1740676, axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/security/
- copied from r1735661, axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/util/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/util/HTTPProxyConfigurationUtil.java
- copied unchanged from r1735661, axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/util/HTTPProxyConfigurationUtil.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/CommonsHTTPTransportSenderClientSideTest.java
- copied unchanged from r1735661, axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderClientSideTest.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/HTTPClient3SenderTest.java
- copied unchanged from r1735661, axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient3SenderTest.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java
- copied, changed from r1735661, axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/NonProxyHostTest.java
- copied unchanged from r1735661, axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/resources/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/resources/org/
- copied from r1735661, axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/resources/org/apache/axis2/transport/http/axis2.xml
- copied, changed from r1740186, axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/http/axis2.xml
Removed:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/util/HTTPProxyConfigurationUtil.java
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderClientSideTest.java
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient3SenderTest.java
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java
Modified:
axis/axis2/java/core/trunk/modules/integration/pom.xml
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java
axis/axis2/java/core/trunk/modules/json/pom.xml
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java
axis/axis2/java/core/trunk/modules/saaj/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/mock/server/AbstractHTTPServerTest.java
axis/axis2/java/core/trunk/pom.xml
axis/axis2/java/core/trunk/src/site/markdown/release-notes/1.8.0.md
Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Sun Apr 24 09:54:52 2016
@@ -133,6 +133,11 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java Sun Apr 24 09:54:52 2016
@@ -43,7 +43,7 @@ import org.apache.axis2.dispatchers.SOAP
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
-import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
+import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -70,7 +70,7 @@ public class EnginePausingTest extends T
configContext.setServicePath(Constants.DEFAULT_SERVICES_PATH);
configContext.setContextRoot("axis2");
transportOut = new TransportOutDescription("null");
- transportOut.setSender(new CommonsHTTPTransportSender());
+ transportOut.setSender(new HTTPClient4TransportSender());
transportIn = new TransportInDescription("null");
}
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Sun Apr 24 09:54:52 2016
@@ -23,6 +23,7 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
+import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
@@ -34,7 +35,6 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
import javax.xml.namespace.QName;
@@ -59,7 +59,7 @@ public class EngineWithoutPhaseResolving
configContext = new ConfigurationContext(engineRegistry);
TransportOutDescription transport = new TransportOutDescription("null");
- transport.setSender(new CommonsHTTPTransportSender());
+ transport.setSender(new HTTPClient4TransportSender());
TransportInDescription transportIn = new TransportInDescription("null");
AxisOperation axisOp = new InOutAxisOperation(operationName);
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java Sun Apr 24 09:54:52 2016
@@ -46,8 +46,8 @@ import org.apache.axis2.dispatchers.SOAP
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
-import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -179,9 +179,9 @@ public class MessageContextSaveATest ext
TransportOutDescription transportOut = new TransportOutDescription("null");
TransportOutDescription transportOut2 = new TransportOutDescription("happy");
TransportOutDescription transportOut3 = new TransportOutDescription("golucky");
- transportOut.setSender(new CommonsHTTPTransportSender());
- transportOut2.setSender(new CommonsHTTPTransportSender());
- transportOut3.setSender(new CommonsHTTPTransportSender());
+ transportOut.setSender(new HTTPClient4TransportSender());
+ transportOut2.setSender(new HTTPClient4TransportSender());
+ transportOut3.setSender(new HTTPClient4TransportSender());
axisConfiguration.addTransportOut(transportOut3);
axisConfiguration.addTransportOut(transportOut2);
axisConfiguration.addTransportOut(transportOut);
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java Sun Apr 24 09:54:52 2016
@@ -46,8 +46,8 @@ import org.apache.axis2.dispatchers.SOAP
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
-import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -294,9 +294,9 @@ public class MessageContextSaveBTest ext
transportOut = new TransportOutDescription("null");
transportOut2 = new TransportOutDescription("happy");
transportOut3 = new TransportOutDescription("golucky");
- transportOut.setSender(new CommonsHTTPTransportSender());
- transportOut2.setSender(new CommonsHTTPTransportSender());
- transportOut3.setSender(new CommonsHTTPTransportSender());
+ transportOut.setSender(new HTTPClient4TransportSender());
+ transportOut2.setSender(new HTTPClient4TransportSender());
+ transportOut3.setSender(new HTTPClient4TransportSender());
axisConfiguration.addTransportOut(transportOut3);
axisConfiguration.addTransportOut(transportOut2);
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java Sun Apr 24 09:54:52 2016
@@ -45,8 +45,8 @@ import org.apache.axis2.dispatchers.SOAP
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
-import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
import org.apache.axis2.util.MetaDataEntry;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
@@ -260,9 +260,9 @@ public class MessageContextSaveCTest ext
transportOut = new TransportOutDescription("null");
transportOut2 = new TransportOutDescription("happy");
transportOut3 = new TransportOutDescription("golucky");
- transportOut.setSender(new CommonsHTTPTransportSender());
- transportOut2.setSender(new CommonsHTTPTransportSender());
- transportOut3.setSender(new CommonsHTTPTransportSender());
+ transportOut.setSender(new HTTPClient4TransportSender());
+ transportOut2.setSender(new HTTPClient4TransportSender());
+ transportOut3.setSender(new HTTPClient4TransportSender());
saveAxisConfiguration.addTransportOut(transportOut3);
saveAxisConfiguration.addTransportOut(transportOut2);
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java Sun Apr 24 09:54:52 2016
@@ -44,8 +44,8 @@ import org.apache.axis2.dispatchers.SOAP
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
-import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -238,9 +238,9 @@ public class MessageContextSelfManagedDa
transportOut = new TransportOutDescription("null");
transportOut2 = new TransportOutDescription("happy");
transportOut3 = new TransportOutDescription("golucky");
- transportOut.setSender(new CommonsHTTPTransportSender());
- transportOut2.setSender(new CommonsHTTPTransportSender());
- transportOut3.setSender(new CommonsHTTPTransportSender());
+ transportOut.setSender(new HTTPClient4TransportSender());
+ transportOut2.setSender(new HTTPClient4TransportSender());
+ transportOut3.setSender(new HTTPClient4TransportSender());
axisConfiguration.addTransportOut(transportOut3);
axisConfiguration.addTransportOut(transportOut2);
axisConfiguration.addTransportOut(transportOut);
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java Sun Apr 24 09:54:52 2016
@@ -44,7 +44,7 @@ import org.apache.axis2.dispatchers.SOAP
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
-import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
+import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -169,7 +169,7 @@ public class OperationContextSaveTest ex
//-----------------------------------------------------------------
transportOut = new TransportOutDescription("null");
- transportOut.setSender(new CommonsHTTPTransportSender());
+ transportOut.setSender(new HTTPClient4TransportSender());
transportIn = new TransportInDescription("null");
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java Sun Apr 24 09:54:52 2016
@@ -27,8 +27,8 @@ import org.apache.axis2.client.Options;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -97,9 +97,9 @@ public class OptionsSaveTest extends Tes
TransportOutDescription transportOut = new TransportOutDescription("null");
TransportOutDescription transportOut2 = new TransportOutDescription("happy");
TransportOutDescription transportOut3 = new TransportOutDescription("golucky");
- transportOut.setSender(new CommonsHTTPTransportSender());
- transportOut2.setSender(new CommonsHTTPTransportSender());
- transportOut3.setSender(new CommonsHTTPTransportSender());
+ transportOut.setSender(new HTTPClient4TransportSender());
+ transportOut2.setSender(new HTTPClient4TransportSender());
+ transportOut3.setSender(new HTTPClient4TransportSender());
options.setTransportOut(transportOut);
axisConfiguration.addTransportOut(transportOut3);
axisConfiguration.addTransportOut(transportOut2);
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java Sun Apr 24 09:54:52 2016
@@ -49,7 +49,7 @@ import org.apache.axis2.jaxws.util.Const
import org.apache.axis2.jaxws.utility.ClassUtils;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.transport.http.HttpTransportProperties;
-import org.apache.axis2.transport.http.impl.httpclient3.HttpTransportPropertiesImpl;
+import org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl;
import org.apache.axis2.util.ThreadContextMigratorUtil;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
Modified: axis/axis2/java/core/trunk/modules/json/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/pom.xml?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/json/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/json/pom.xml Sun Apr 24 09:54:52 2016
@@ -80,6 +80,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java (original)
+++ axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java Sun Apr 24 09:54:52 2016
@@ -20,18 +20,11 @@
package org.apache.axis2.json.gson;
import org.apache.axis2.testutils.UtilServer;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.io.IOException;
-
-
public class JSONXMLStreamAPITest {
@Before
Modified: axis/axis2/java/core/trunk/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/pom.xml?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/saaj/pom.xml Sun Apr 24 09:54:52 2016
@@ -90,6 +90,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>1.3.2</version>
Propchange: axis/axis2/java/core/trunk/modules/transport/http-hc3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr 24 09:54:52 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: axis/axis2/java/core/trunk/modules/transport/http-hc3/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3/pom.xml?rev=1740686&view=auto
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http-hc3/pom.xml (added)
+++ axis/axis2/java/core/trunk/modules/transport/http-hc3/pom.xml Sun Apr 24 09:54:52 2016
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>axis2-transport-http-hc3</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache Axis2 - Transport - HTTP - Commons HttpClient 3.x</name>
+ <description>The legacy, Apache Commons HttpClient 3.x based HTTP transport sender</description>
+ <url>http://axis.apache.org/axis2/java/core/</url>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/http-hc3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/http-hc3</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-truth</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache.axis2:axis2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: axis/axis2/java/core/trunk/modules/transport/http-hc3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java (from r1735661, axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java?p2=axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java&p1=axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java&r1=1735661&r2=1740686&rev=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java Sun Apr 24 09:54:52 2016
@@ -19,8 +19,12 @@
package org.apache.axis2.transport.http;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.TransportSender;
import org.apache.axis2.transport.http.impl.httpclient3.HTTPClient3TransportSender;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.methods.GetMethod;
public class HTTPClient3TransportSenderTest extends CommonsHTTPTransportSenderTest {
@@ -29,4 +33,15 @@ public class HTTPClient3TransportSenderT
return new HTTPClient3TransportSender();
}
+ public void testCleanup() throws AxisFault {
+ TransportSender sender = getTransportSender();
+ MessageContext msgContext = new MessageContext();
+ HttpMethod httpMethod = new GetMethod();
+ msgContext.setProperty(HTTPConstants.HTTP_METHOD, httpMethod);
+ assertNotNull("HttpMethod can not be null",
+ msgContext.getProperty(HTTPConstants.HTTP_METHOD));
+ sender.cleanup(msgContext);
+ assertNull("HttpMethod should be null", msgContext.getProperty(HTTPConstants.HTTP_METHOD));
+
+ }
}
Copied: axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/resources/org/apache/axis2/transport/http/axis2.xml (from r1740186, axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/http/axis2.xml)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/resources/org/apache/axis2/transport/http/axis2.xml?p2=axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/resources/org/apache/axis2/transport/http/axis2.xml&p1=axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/http/axis2.xml&r1=1740186&r2=1740686&rev=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/http/axis2.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/http-hc3/src/test/resources/org/apache/axis2/transport/http/axis2.xml Sun Apr 24 09:54:52 2016
@@ -50,7 +50,7 @@
class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
</messageBuilders>
- <transportSender name="http" class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender">
+ <transportSender name="http" class="org.apache.axis2.transport.http.impl.httpclient3.HTTPClient3TransportSender">
<parameter name="PROTOCOL">HTTP/1.1</parameter>
<parameter name="Transfer-Encoding">chunked</parameter>
</transportSender>
Modified: axis/axis2/java/core/trunk/modules/transport/http/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/pom.xml?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/pom.xml Sun Apr 24 09:54:52 2016
@@ -61,6 +61,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<resources>
<resource>
@@ -94,10 +104,6 @@
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java Sun Apr 24 09:54:52 2016
@@ -52,7 +52,6 @@ import org.apache.axis2.transport.http.u
import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.MessageContextBuilder;
import org.apache.axis2.util.OnDemandLogger;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -564,7 +563,11 @@ public class AxisServlet extends HttpSer
&& HTTPTransportConstants.HTTP_CLIENT_4_X_VERSION.equals(clientVersion)) {
// TODO - Handle for HTTPClient 4
} else {
- MultiThreadedHttpConnectionManager.shutdownAll();
+ try {
+ Class.forName("org.apache.commons.httpclient.MultiThreadedHttpConnectionManager").getMethod("shutdownAll").invoke(null);
+ } catch (Exception ex) {
+ log.warn("Failed to shut down MultiThreadedHttpConnectionManager", ex);
+ }
}
}
Modified: axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java Sun Apr 24 09:54:52 2016
@@ -25,7 +25,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.mail.MessagingException;
import javax.servlet.http.HttpServletResponse;
import javax.xml.namespace.QName;
@@ -51,8 +50,6 @@ import org.apache.axis2.transport.Transp
import org.apache.axis2.transport.http.mock.MockAxisHttpResponse;
import org.apache.axis2.transport.http.mock.MockHttpServletResponse;
import org.apache.axis2.transport.http.mock.MockHTTPResponse;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.http.ProtocolVersion;
import org.apache.http.RequestLine;
import org.apache.http.message.BasicRequestLine;
@@ -93,18 +90,6 @@ public abstract class CommonsHTTPTranspo
.hasSameContentAs(envelope.toString());
}
- public void testCleanup() throws AxisFault {
- TransportSender sender = getTransportSender();
- MessageContext msgContext = new MessageContext();
- HttpMethod httpMethod = new GetMethod();
- msgContext.setProperty(HTTPConstants.HTTP_METHOD, httpMethod);
- assertNotNull("HttpMethod can not be null",
- msgContext.getProperty(HTTPConstants.HTTP_METHOD));
- sender.cleanup(msgContext);
- assertNull("HttpMethod should be null", msgContext.getProperty(HTTPConstants.HTTP_METHOD));
-
- }
-
public void testInit() throws AxisFault {
ConfigurationContext confContext = ConfigurationContextFactory
.createEmptyConfigurationContext();
@@ -149,7 +134,7 @@ public abstract class CommonsHTTPTranspo
}
- static SOAPEnvelope getEnvelope() throws IOException, MessagingException {
+ static SOAPEnvelope getEnvelope() throws IOException {
SOAPFactory soapFac = OMAbstractFactory.getSOAP11Factory();
OMFactory omFac = OMAbstractFactory.getOMFactory();
SOAPEnvelope enp = soapFac.createSOAPEnvelope();
Modified: axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java Sun Apr 24 09:54:52 2016
@@ -33,7 +33,6 @@ public class HTTPClient4TransportSenderT
return new HTTPClient4TransportSender();
}
- @Override
public void testCleanup() throws AxisFault {
TransportSender sender = getTransportSender();
MessageContext msgContext = new MessageContext();
Modified: axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java Sun Apr 24 09:54:52 2016
@@ -27,7 +27,6 @@ import org.apache.axis2.context.Operatio
import org.apache.axis2.transport.http.mock.server.AbstractHTTPServerTest;
import org.apache.axis2.transport.http.mock.server.BasicHttpServer;
-import javax.mail.MessagingException;
import javax.ws.rs.core.HttpHeaders;
import static com.google.common.truth.Truth.assertAbout;
@@ -58,11 +57,9 @@ public abstract class HTTPSenderTest ext
* the rest
* @throws IOException
* Signals that an I/O exception has occurred.
- * @throws MessagingException
- * the messaging exception
*/
protected void sendViaHTTP(String httpMethod, String soapAction, String address, boolean rest)
- throws IOException, MessagingException {
+ throws IOException {
httpSender = getHTTPSender();
MessageContext msgContext = new MessageContext();
ConfigurationContext configContext = ConfigurationContextFactory
Modified: axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java Sun Apr 24 09:54:52 2016
@@ -22,6 +22,7 @@ package org.apache.axis2.transport.http;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
import org.apache.axis2.transport.testkit.http.HttpTestEnvironment;
import org.apache.axis2.transport.testkit.tests.Setup;
@@ -44,7 +45,7 @@ public class HttpTransportDescriptionFac
public TransportOutDescription createTransportOutDescription() throws Exception {
TransportOutDescription desc = new TransportOutDescription("http");
- desc.setSender(new CommonsHTTPTransportSender());
+ desc.setSender(new HTTPClient4TransportSender());
return desc;
}
}
Modified: axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/mock/server/AbstractHTTPServerTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/mock/server/AbstractHTTPServerTest.java?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/mock/server/AbstractHTTPServerTest.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/mock/server/AbstractHTTPServerTest.java Sun Apr 24 09:54:52 2016
@@ -22,7 +22,6 @@ package org.apache.axis2.transport.http.
import java.io.IOException;
import java.util.Map;
-import javax.mail.MessagingException;
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAbstractFactory;
@@ -144,10 +143,8 @@ public abstract class AbstractHTTPServer
* @return the envelope
* @throws IOException
* Signals that an I/O exception has occurred.
- * @throws MessagingException
- * the messaging exception
*/
- public static SOAPEnvelope getEnvelope() throws IOException, MessagingException {
+ public static SOAPEnvelope getEnvelope() throws IOException {
SOAPFactory soapFac = OMAbstractFactory.getSOAP11Factory();
OMFactory omFac = OMAbstractFactory.getOMFactory();
SOAPEnvelope enp = soapFac.createSOAPEnvelope();
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sun Apr 24 09:54:52 2016
@@ -87,6 +87,7 @@
<module>modules/osgi-tests</module>
<module>modules/transport/local</module>
<module>modules/transport/http</module>
+ <module>modules/transport/http-hc3</module>
<module>modules/transport/base</module>
<module>modules/transport/jms</module>
<module>modules/transport/mail</module>
Modified: axis/axis2/java/core/trunk/src/site/markdown/release-notes/1.8.0.md
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/markdown/release-notes/1.8.0.md?rev=1740686&r1=1740685&r2=1740686&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/src/site/markdown/release-notes/1.8.0.md (original)
+++ axis/axis2/java/core/trunk/src/site/markdown/release-notes/1.8.0.md Sun Apr 24 09:54:52 2016
@@ -2,3 +2,7 @@ Apache Axis2 1.8.0 Release Note
-------------------------------
* The minimum required Java version for Axis2 has been changed to Java 6.
+
+* The Apache Commons HttpClient 3.x based HTTP transport has been deprecated.
+ If you wish to continue using this transport, add `axis2-transport-http-hc3`
+ to your project.