AXIS2-5761: Switch to the HttpClient 4.x based transport in Rampart as well.
git-svn-id: https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk@1740381 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java b/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
index 2f05cc6..622a627 100644
--- a/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
+++ b/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
@@ -148,7 +148,7 @@
Options options = new Options();
if( i == 13 ) {
- options.setTo(new EndpointReference("https://127.0.0.1:" +
+ options.setTo(new EndpointReference("https://localhost:" +
getHttpsPort() +
"/axis2/services/SecureService" + i));
//Username token created with user/pass from options
@@ -156,7 +156,7 @@
options.setPassword("password");
}
else {
- options.setTo(new EndpointReference("http://127.0.0.1:" +
+ options.setTo(new EndpointReference("http://localhost:" +
getHttpPort() +
"/axis2/services/SecureService" + i));
}
@@ -224,7 +224,7 @@
Options options = new Options();
if (i == 13) {
- options.setTo(new EndpointReference("https://127.0.0.1:" +
+ options.setTo(new EndpointReference("https://localhost:" +
getHttpsPort() +
"/axis2/services/SecureService" + i));
//Username token created with user/pass from options
@@ -232,7 +232,7 @@
options.setPassword("password");
}
else {
- options.setTo(new EndpointReference("http://127.0.0.1:" +
+ options.setTo(new EndpointReference("http://localhost:" +
getHttpPort() +
"/axis2/services/SecureService" + i));
}
@@ -259,10 +259,10 @@
Options options = new Options();
if (i == 3 || i == 6) {
- options.setTo(new EndpointReference("https://127.0.0.1:" + getHttpsPort() + "/axis2/services/SecureServiceSC" + i));
+ options.setTo(new EndpointReference("https://localhost:" + getHttpsPort() + "/axis2/services/SecureServiceSC" + i));
}
else {
- options.setTo(new EndpointReference("http://127.0.0.1:" + getHttpPort() + "/axis2/services/SecureServiceSC" + i));
+ options.setTo(new EndpointReference("http://localhost:" + getHttpPort() + "/axis2/services/SecureServiceSC" + i));
}
System.out.println("Testing WS-SecConv: custom scenario " + i);
diff --git a/modules/rampart-integration/src/test/resources/conf/axis2.xml b/modules/rampart-integration/src/test/resources/conf/axis2.xml
index 4598aa4..12059a9 100755
--- a/modules/rampart-integration/src/test/resources/conf/axis2.xml
+++ b/modules/rampart-integration/src/test/resources/conf/axis2.xml
@@ -139,12 +139,12 @@
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
- class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
<parameter name="Transfer-Encoding" locked="false">chunked</parameter>
</transportSender>
<transportSender name="https"
- class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
<parameter name="Transfer-Encoding" locked="false">chunked</parameter>
</transportSender>
diff --git a/modules/rampart-tests/test-resources/axis2.xml b/modules/rampart-tests/test-resources/axis2.xml
index 2219d74..48eb3b1 100644
--- a/modules/rampart-tests/test-resources/axis2.xml
+++ b/modules/rampart-tests/test-resources/axis2.xml
@@ -20,7 +20,7 @@
<parameter name="passwordCallbackClass" locked="false">
org.apache.axis2.security.PWCallback</parameter>
- <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <transportSender name="http" class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
