Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--features/org.eclipse.osee.framework.server.external.feature/feature.xml705
-rw-r--r--plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java51
3 files changed, 391 insertions, 366 deletions
diff --git a/features/org.eclipse.osee.framework.server.external.feature/feature.xml b/features/org.eclipse.osee.framework.server.external.feature/feature.xml
index 2244b8affd1..a992faedd3a 100644
--- a/features/org.eclipse.osee.framework.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.framework.server.external.feature/feature.xml
@@ -1,349 +1,356 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.osee.framework.server.external.feature"
- label="%featureName"
- version="0.9.7.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import plugin="org.eclipse.equinox.registry" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.osgi" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.equinox.common" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.core.jobs" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.contenttype" version="3.3.0" match="compatible"/>
- <import plugin="org.eclipse.equinox.app" version="1.0.0" match="compatible"/>
- <import plugin="org.eclipse.equinox.preferences" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.equinox.registry" version="3.2.0" match="compatible"/>
- <import plugin="org.apache.jasper"/>
- <import plugin="javax.servlet.jsp"/>
- <import plugin="javax.xml" version="1.3.4" match="compatible"/>
- <import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/>
- <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.3.2" match="greaterOrEqual"/>
- <import plugin="com.google.collect" version="0.8.0" match="compatible"/>
- <import plugin="com.google.inject" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
- <import plugin="org.antlr.runtime" version="3.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.equinox.preferences" version="3.3.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
- <import plugin="org.eclipse.emf.common" version="2.6.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.6.0" match="compatible"/>
- <import plugin="org.eclipse.xtext.util" version="1.0.1" match="greaterOrEqual"/>
- <import plugin="org.h2" version="1.1.0" match="greaterOrEqual"/>
- </requires>
-
- <plugin
- id="javax.servlet"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.codec"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.httpclient"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.app"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.ds"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.http.jetty"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.http.servlet"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.registry"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osgi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osgi.services"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.jobs"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.preferences"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.contenttype"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.mortbay.jetty.server"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.mortbay.jetty.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.lowagie.text"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.derby"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.xml.serializer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.xml"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.xerces"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.xml.resolver"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.xtext.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.antlr.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare.diff"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare.match"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.log4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.collect"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.xmi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.xtext"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.launcher"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.lang"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.inject"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.aopalliance"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.jcraft.jsch"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.h2"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.osee.framework.server.external.feature"
+ label="%featureName"
+ version="0.9.7.qualifier"
+ provider-name="%providerName">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import plugin="org.eclipse.equinox.registry" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.osgi" version="3.5.0" match="compatible"/>
+ <import plugin="org.eclipse.equinox.common" version="3.5.0" match="compatible"/>
+ <import plugin="org.eclipse.core.jobs" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.core.contenttype" version="3.3.0" match="compatible"/>
+ <import plugin="org.eclipse.equinox.app" version="1.0.0" match="compatible"/>
+ <import plugin="org.eclipse.equinox.preferences" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.equinox.registry" version="3.2.0" match="compatible"/>
+ <import plugin="org.apache.jasper"/>
+ <import plugin="javax.servlet.jsp"/>
+ <import plugin="javax.xml" version="1.3.4" match="compatible"/>
+ <import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/>
+ <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.3.2" match="greaterOrEqual"/>
+ <import plugin="com.google.collect" version="0.8.0" match="compatible"/>
+ <import plugin="com.google.inject" version="2.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
+ <import plugin="org.antlr.runtime" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.equinox.preferences" version="3.3.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.common" version="2.6.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.6.0" match="compatible"/>
+ <import plugin="org.eclipse.xtext.util" version="1.0.1" match="greaterOrEqual"/>
+ <import plugin="org.h2" version="1.1.0" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin
+ id="javax.servlet"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.codec"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.httpclient"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.app"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.ds"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.http.jetty"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.http.servlet"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.registry"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi.services"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.runtime"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.jobs"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.preferences"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.contenttype"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.mortbay.jetty.server"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.mortbay.jetty.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.lowagie.text"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.derby"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.xml.serializer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="javax.xml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.xerces"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.xml.resolver"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.xtext.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.ecore"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.antlr.runtime"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.diff"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.match"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.log4j"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.google.collect"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.ecore.xmi"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.xtext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.launcher"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.google.inject"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.aopalliance"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.jcraft.jsch"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.h2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.net"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF
index 38971e84048..40c3441d944 100644
--- a/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Import-Package: com.lowagie.text;version="2.1.7",
org.apache.commons.httpclient,
org.apache.commons.httpclient.methods,
org.apache.commons.httpclient.params,
+ org.eclipse.core.net.proxy,
org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
org.eclipse.osee.framework.jdk.core.type,
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java
index 52ad340b090..4248fad873f 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.core.util;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.HttpURLConnection;
@@ -19,6 +18,7 @@ import java.net.URI;
import java.net.URL;
import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethodBase;
import org.apache.commons.httpclient.HttpStatus;
@@ -28,10 +28,15 @@ import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.eclipse.core.net.proxy.IProxyData;
+import org.eclipse.core.net.proxy.IProxyService;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
+import org.eclipse.osee.framework.core.internal.Activator;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
/**
* @author Roberto E. Escobar
@@ -40,18 +45,30 @@ public class HttpProcessor {
private static final String CONTENT_TYPE = "content-type";
private static final String CONTENT_ENCODING = "content-encoding";
- private static final HttpProcessor instance = new HttpProcessor();
-
- private final MultiThreadedHttpConnectionManager connectionManager;
- private final HttpClient httpClient;
+ private static final MultiThreadedHttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
+ private static IProxyService proxyService;
private HttpProcessor() {
- connectionManager = new MultiThreadedHttpConnectionManager();
- httpClient = new HttpClient(connectionManager);
+ // Static class
+ }
+
+ private static HttpClient getHttpClient(URI uri) {
+ HttpClient client = new HttpClient(connectionManager);
+ HostConfiguration config = client.getHostConfiguration();
+ configureProxyData(uri, config);
+ return client;
}
- private static HttpClient getHttpClient() {
- return instance.httpClient;
+ private static void configureProxyData(URI uri, HostConfiguration config) {
+ if (proxyService == null) {
+ BundleContext context = Activator.getBundleContext();
+ ServiceReference reference = context.getServiceReference(IProxyService.class.getName());
+ proxyService = (IProxyService) context.getService(reference);
+ }
+ IProxyData[] datas = proxyService.select(uri);
+ for (IProxyData data : datas) {
+ config.setProxy(data.getHost(), data.getPort());
+ }
}
public static String acquireString(URL url) throws Exception {
@@ -81,14 +98,14 @@ public class HttpProcessor {
HttpMethodParams params = new HttpMethodParams();
params.setParameter(HttpMethodParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(0, false));
method.setParams(params);
- int responseCode = getHttpClient().executeMethod(method);
+ int responseCode = getHttpClient(url.toURI()).executeMethod(method);
if (responseCode == HttpURLConnection.HTTP_NOT_FOUND) {
result = true;
}
} finally {
method.releaseConnection();
}
- } catch (IOException ex) {
+ } catch (Exception ex) {
// Do Nothing
}
return result;
@@ -112,7 +129,7 @@ public class HttpProcessor {
method.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(3, false));
- statusCode = getHttpClient().executeMethod(method);
+ statusCode = getHttpClient(url.toURI()).executeMethod(method);
responseInputStream = method.getResponseBodyAsStream();
result.setContentType(getContentType(method));
result.setEncoding(method.getResponseCharSet());
@@ -153,7 +170,7 @@ public class HttpProcessor {
method.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(3, false));
- statusCode = getHttpClient().executeMethod(method);
+ statusCode = getHttpClient(url.toURI()).executeMethod(method);
httpInputStream = method.getResponseBodyAsStream();
result.setContentType(getContentType(method));
result.setEncoding(method.getResponseCharSet());
@@ -193,7 +210,7 @@ public class HttpProcessor {
method.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(3, false));
- statusCode = getHttpClient().executeMethod(method);
+ statusCode = getHttpClient(url.toURI()).executeMethod(method);
httpInputStream = method.getResponseBodyAsStream();
result.setContentType(getContentType(method));
result.setEncoding(method.getResponseCharSet());
@@ -231,7 +248,7 @@ public class HttpProcessor {
try {
method.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(3, false));
- statusCode = getHttpClient().executeMethod(method);
+ statusCode = getHttpClient(url.toURI()).executeMethod(method);
responseInputStream = method.getResponseBodyAsStream();
result.setContentType(getContentType(method));
result.setEncoding(method.getResponseCharSet());
@@ -281,7 +298,7 @@ public class HttpProcessor {
try {
method.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(3, false));
- statusCode = getHttpClient().executeMethod(method);
+ statusCode = getHttpClient(url.toURI()).executeMethod(method);
if (statusCode == HttpStatus.SC_OK || statusCode == HttpStatus.SC_ACCEPTED) {
inputStream = method.getResponseBodyAsStream();
result.setEncoding(method.getResponseCharSet());
@@ -313,7 +330,7 @@ public class HttpProcessor {
InputStream responseInputStream = null;
try {
method.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(3, false));
- statusCode = getHttpClient().executeMethod(method);
+ statusCode = getHttpClient(url.toURI()).executeMethod(method);
if (statusCode == HttpStatus.SC_ACCEPTED) {
responseInputStream = method.getResponseBodyAsStream();
response = Lib.inputStreamToString(responseInputStream);

Back to the top