Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 359B49D33 for ; Thu, 13 Oct 2011 16:01:54 +0000 (UTC) Received: (qmail 86652 invoked by uid 500); 13 Oct 2011 16:01:54 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 86625 invoked by uid 500); 13 Oct 2011 16:01:54 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 86617 invoked by uid 99); 13 Oct 2011 16:01:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 16:01:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 16:01:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 59294238888F for ; Thu, 13 Oct 2011 16:01:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1182931 - in /activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http: HttpClientTransport.java HttpTransportFactory.java HttpTransportSupport.java HttpTunnelServlet.java Date: Thu, 13 Oct 2011 16:01:29 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111013160129.59294238888F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Thu Oct 13 16:01:28 2011 New Revision: 1182931 URL: http://svn.apache.org/viewvc?rev=1182931&view=rev Log: https://issues.apache.org/jira/browse/AMQ-1514 Adds support of HTTP proxy auth using HttpClient 4.1.2 APIs Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java?rev=1182931&r1=1182930&r2=1182931&view=diff ============================================================================== --- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java (original) +++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java Thu Oct 13 16:01:28 2011 @@ -30,6 +30,8 @@ import org.apache.activemq.util.ServiceS import org.apache.http.HttpHost; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; import org.apache.http.client.ResponseHandler; import org.apache.http.client.methods.HttpGet; @@ -222,10 +224,16 @@ public class HttpClientTransport extends } protected HttpClient createHttpClient() { - HttpClient client = new DefaultHttpClient(); + DefaultHttpClient client = new DefaultHttpClient(); if (getProxyHost() != null) { HttpHost proxy = new HttpHost(getProxyHost(), getProxyPort()); client.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy); + + if(getProxyUser() != null && getProxyPassword() != null) { + client.getCredentialsProvider().setCredentials( + new AuthScope(getProxyHost(), getProxyPort()), + new UsernamePasswordCredentials(getProxyUser(), getProxyPassword())); + } } return client; } Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java?rev=1182931&r1=1182930&r2=1182931&view=diff ============================================================================== --- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java (original) +++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java Thu Oct 13 16:01:28 2011 @@ -23,8 +23,6 @@ import java.util.HashMap; import java.util.Map; import org.apache.activemq.transport.InactivityMonitor; -import org.apache.activemq.transport.MutexTransport; -import org.apache.activemq.transport.ThreadNameFilter; import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.TransportFactory; import org.apache.activemq.transport.TransportLoggerFactory; @@ -40,10 +38,9 @@ import org.slf4j.LoggerFactory; /** * @author David Martin Clavo david(dot)martin(dot)clavo(at)gmail.com (logging improvement modifications) - * */ public class HttpTransportFactory extends TransportFactory { - + private static final Logger LOG = LoggerFactory.getLogger(HttpTransportFactory.class); public TransportServer doBind(URI location) throws IOException { @@ -75,10 +72,12 @@ public class HttpTransportFactory extend return new HttpClientTransport(textWireFormat, location); } + @SuppressWarnings("rawtypes") public Transport serverConfigure(Transport transport, WireFormat format, HashMap options) throws Exception { return compositeConfigure(transport, format, options); } + @SuppressWarnings("rawtypes") public Transport compositeConfigure(Transport transport, WireFormat format, Map options) { transport = super.compositeConfigure(transport, format, options); HttpClientTransport httpTransport = (HttpClientTransport)transport.narrow(HttpClientTransport.class); Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java?rev=1182931&r1=1182930&r2=1182931&view=diff ============================================================================== --- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java (original) +++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java Thu Oct 13 16:01:28 2011 @@ -23,14 +23,16 @@ import org.apache.activemq.transport.uti /** * A useful base class for HTTP Transport implementations. - * - * + * + * */ public abstract class HttpTransportSupport extends TransportThreadSupport { private TextWireFormat textWireFormat; private URI remoteUrl; private String proxyHost; private int proxyPort = 8080; + private String proxyUser; + private String proxyPassword; public HttpTransportSupport(TextWireFormat textWireFormat, URI remoteUrl) { this.textWireFormat = textWireFormat; @@ -74,4 +76,20 @@ public abstract class HttpTransportSuppo public void setProxyPort(int proxyPort) { this.proxyPort = proxyPort; } + + public String getProxyUser() { + return proxyUser; + } + + public void setProxyUser(String proxyUser) { + this.proxyUser = proxyUser; + } + + public String getProxyPassword() { + return proxyPassword; + } + + public void setProxyPassword(String proxyPassword) { + this.proxyPassword = proxyPassword; + } } Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java?rev=1182931&r1=1182930&r2=1182931&view=diff ============================================================================== --- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java (original) +++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java Thu Oct 13 16:01:28 2011 @@ -46,8 +46,6 @@ import org.slf4j.LoggerFactory; * A servlet which handles server side HTTP transport, delegating to the * ActiveMQ broker. This servlet is designed for being embedded inside an * ActiveMQ Broker using an embedded Jetty or Tomcat instance. - * - * */ public class HttpTunnelServlet extends HttpServlet { private static final long serialVersionUID = -3826714430767484333L; @@ -58,8 +56,9 @@ public class HttpTunnelServlet extends H private TextWireFormat wireFormat; private ConcurrentMap clients = new ConcurrentHashMap(); private final long requestTimeout = 30000L; - private HashMap transportOptions; + private HashMap transportOptions; + @SuppressWarnings("unchecked") @Override public void init() throws ServletException { super.init(); @@ -71,7 +70,7 @@ public class HttpTunnelServlet extends H if (transportFactory == null) { throw new ServletException("No such attribute 'transportFactory' available in the ServletContext"); } - transportOptions = (HashMap)getServletContext().getAttribute("transportOptions"); + transportOptions = (HashMap)getServletContext().getAttribute("transportOptions"); wireFormat = (TextWireFormat)getServletContext().getAttribute("wireFormat"); if (wireFormat == null) { wireFormat = createWireFormat(); @@ -210,7 +209,7 @@ public class HttpTunnelServlet extends H Transport transport = answer; try { // Preserve the transportOptions for future use by making a copy before applying (they are removed when applied). - HashMap options = new HashMap(transportOptions); + HashMap options = new HashMap(transportOptions); transport = transportFactory.serverConfigure(answer, null, options); } catch (Exception e) { throw IOExceptionSupport.create(e);