[jboss-svn-commits] JBL Code SVN: r31408 - in labs/jbossesb/branches/JBESB_4_7_CP/product/services: soapui-client/src/main/java/org/jboss/soa/esb/services/soapui and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2010-02-04 14:40:38 -0500 (Thu, 04 Feb 2010)
New Revision: 31408

Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/EsbWsdlLoader.java
Log:
Use separate host configurations: JBESB-3167

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java	2010-02-04 18:56:24 UTC (rev 31407)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java	2010-02-04 19:40:38 UTC (rev 31408)
@@ -38,6 +38,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.PostMethod;
@@ -290,6 +291,7 @@
     private QNameMap responseXStreamQNameMap = new QNameMap();
     private Properties httpClientProps = new Properties();
     private HttpClient httpclient;
+    private HostConfiguration hostconfig;
     private String endpointUrl;
     private MessagePayloadProxy payloadProxy;
     private boolean httpResponseStatusEnabled;
@@ -321,6 +323,9 @@
         // to the HttpClientFacatory...
         extractHttpClientProps(config);
         httpclient = HttpClientFactory.createHttpClient(httpClientProps);
+        // see JBESB-3021 for details of the host configuration changes
+        hostconfig = httpclient.getHostConfiguration();
+        httpclient.setHostConfiguration(new HostConfiguration());
 
         endpointUrl = config.getAttribute("endpointUrl");
         
@@ -496,7 +501,7 @@
         post.setRequestHeader("SOAPAction", "\"" + soapAction + "\"");  /// Customization to add quotes to Soap action
         post.setRequestEntity(new StringRequestEntity(request));
         try {
-            int result = httpclient.executeMethod(post);
+            int result = httpclient.executeMethod(hostconfig, post);
             if(result != HttpStatus.SC_OK) {
                 // TODO: We need to do more here!!
 

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/EsbWsdlLoader.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/EsbWsdlLoader.java	2010-02-04 18:56:24 UTC (rev 31407)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/EsbWsdlLoader.java	2010-02-04 19:40:38 UTC (rev 31408)
@@ -23,9 +23,9 @@
 
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
-import java.net.URI;
 import java.net.URL;
 
+import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.HttpException;
@@ -43,10 +43,14 @@
 
     private boolean isAborted = false;
     private HttpClient httpClient;
+    private HostConfiguration hostconfig;
     
     public EsbWsdlLoader(String url, HttpClient httpClient) {
         super(url);
         this.httpClient = httpClient;
+        // see JBESB-3021 for details of the host configuration changes
+        hostconfig = httpClient.getHostConfiguration();
+        httpClient.setHostConfiguration(new HostConfiguration());
     }
 
     public InputStream load(String url) throws Exception {
@@ -62,7 +66,7 @@
         httpGetMethod.setDoAuthentication(true);
 
         try {
-            int result = httpClient.executeMethod(httpGetMethod);
+            int result = httpClient.executeMethod(hostconfig, httpGetMethod);
 
             if(result != HttpStatus.SC_OK) {
                 if(result < 200 || result > 299) {