Author: veithen
Date: Thu Apr 21 18:36:08 2016
New Revision: 1740381
URL: http://svn.apache.org/viewvc?rev=1740381&view=rev
Log:
AXIS2-5761: Switch to the HttpClient 4.x based transport in Rampart as well.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/axis2.xml
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1740381&r1=1740380&r2=1740381&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Thu Apr 21 18:36:08 2016
@@ -148,7 +148,7 @@ public class RampartTest extends TestCas
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 @@ public class RampartTest extends TestCas
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 @@ public class RampartTest extends TestCas
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 @@ public class RampartTest extends TestCas
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 @@ public class RampartTest extends TestCas
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);
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml?rev=1740381&r1=1740380&r2=1740381&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
Thu Apr 21 18:36:08 2016
@@ -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>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/axis2.xml?rev=1740381&r1=1740380&r2=1740381&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/axis2.xml
Thu Apr 21 18:36:08 2016
@@ -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>
