servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r721441 - in /servicemix/components/bindings/servicemix-http/trunk: pom.xml src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java
Date Fri, 28 Nov 2008 11:53:37 GMT
Author: gertv
Date: Fri Nov 28 03:53:37 2008
New Revision: 721441

URL: http://svn.apache.org/viewvc?rev=721441&view=rev
Log:
SM-1676: Upgrade to Jetty 6.1.12

Modified:
    servicemix/components/bindings/servicemix-http/trunk/pom.xml
    servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java

Modified: servicemix/components/bindings/servicemix-http/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/pom.xml?rev=721441&r1=721440&r2=721441&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-http/trunk/pom.xml Fri Nov 28 03:53:37 2008
@@ -42,7 +42,7 @@
     <previous.releases>3.1.2,3.2,3.2.1</previous.releases>
     <servicemix-version>3.2.1</servicemix-version>
     <servicemix-shared-version>2008.02-SNAPSHOT</servicemix-shared-version>
-    <jetty-version>6.1.12rc1</jetty-version>
+    <jetty-version>6.1.12</jetty-version>
     <activemq-version>5.1.0</activemq-version>
 
     <servicemix.osgi.import>

Modified: servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java?rev=721441&r1=721440&r2=721441&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java
(original)
+++ servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java
Fri Nov 28 03:53:37 2008
@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.InetSocketAddress;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.SecureRandom;
@@ -45,6 +44,7 @@
 import org.apache.servicemix.http.HttpConfiguration;
 import org.apache.servicemix.http.SslParameters;
 import org.apache.servicemix.http.jetty.SmxHttpExchange;
+import org.mortbay.jetty.client.Address;
 import org.mortbay.jetty.client.HttpClient;
 import org.mortbay.jetty.client.security.ProxyAuthorization;
 import org.mortbay.thread.QueuedThreadPool;
@@ -288,7 +288,7 @@
                 jettyClient.setThreadPool(new QueuedThreadPool(getConfiguration().getJettyClientThreadPoolSize()));
                 jettyClient.setConnectorType(HttpClient.CONNECTOR_SELECT_CHANNEL);
                 if (proxyHost != null) {
-                    jettyClient.setProxy(new InetSocketAddress(proxyHost, proxyPort));
+                    jettyClient.setProxy(new Address(proxyHost, proxyPort));
                     if (proxyUsername != null) {
                         jettyClient.setProxyAuthentication(new ProxyAuthorization(proxyUsername,
proxyPassword));
                     }



Mime
View raw message