Author: olamy
Date: Wed Sep 10 05:53:01 2014
New Revision: 1623908
URL: http://svn.apache.org/r1623908
Log:
[MTOMCAT-278] Ignoring nonProxyHosts during deployment
Submitted by John Gregg
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1623908&r1=1623907&r2=1623908&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Wed Sep 10 05:53:01 2014
@@ -42,6 +42,8 @@ import org.apache.http.impl.client.Defau
import org.apache.http.impl.conn.PoolingClientConnectionManager;
import org.apache.http.protocol.BasicHttpContext;
import org.apache.maven.settings.Proxy;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.proxy.ProxyUtils;
import java.io.File;
import java.io.FileInputStream;
@@ -294,15 +296,19 @@ public class TomcatManager
*/
private void applyProxy()
{
- if ( this.proxy != null )
- {
- HttpHost proxy = new HttpHost( this.proxy.getHost(),
this.proxy.getPort(), this.proxy.getProtocol() );
- httpClient.getParams().setParameter(
ConnRoutePNames.DEFAULT_PROXY, proxy );
- if ( this.proxy.getUsername() != null )
- {
- httpClient.getCredentialsProvider().setCredentials(
- new AuthScope( this.proxy.getHost(), this.proxy.getPort()
),
- new UsernamePasswordCredentials( this.proxy.getUsername(),
this.proxy.getPassword() ) );
+ if ( this.proxy != null ) {
+
+ ProxyInfo proxyInfo = new ProxyInfo();
+ proxyInfo.setNonProxyHosts(this.proxy.getNonProxyHosts());
+
+ if (!ProxyUtils.validateNonProxyHosts(proxyInfo, url.getHost())) {
+ HttpHost proxy = new HttpHost(this.proxy.getHost(),
this.proxy.getPort(), this.proxy.getProtocol());
+
httpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
+ if (this.proxy.getUsername() != null) {
+ httpClient.getCredentialsProvider().setCredentials(
+ new AuthScope(this.proxy.getHost(),
this.proxy.getPort()),
+ new
UsernamePasswordCredentials(this.proxy.getUsername(),
this.proxy.getPassword()));
+ }
}
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
