implemented proxy fix for tomcat6-maven-plugin
git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1612753 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java b/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
index feb7d32..a98ad2b 100644
--- a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
+++ b/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
@@ -199,7 +199,6 @@
String host = url.getHost();
int port = url.getPort() > -1 ? url.getPort() : AuthScope.ANY_PORT;
-
httpClient.getCredentialsProvider().setCredentials( new AuthScope( host, port ), creds );
AuthCache authCache = new BasicAuthCache();
@@ -293,7 +292,6 @@
*/
private void applyProxy() {
if( this.proxy != null ) {
- System.out.println("proxy: " + proxy);
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 ) {
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
index fec33d4..860ddc8 100644
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
+++ b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
@@ -20,9 +20,11 @@
*/
import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.settings.Proxy;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.tomcat.maven.common.deployer.TomcatManager;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
@@ -69,6 +71,12 @@
*/
@Component( role = WagonManager.class )
private WagonManager wagonManager;
+
+ /**
+ * The current build session instance. This is used for plugin manager API calls.
+ */
+ @Component
+ private MavenSession session;
/**
* The full URL of the Tomcat manager instance to use.
@@ -216,6 +224,12 @@
manager = new TomcatManager( url, userName, password, charset, settings.isInteractiveMode() );
manager.setUserAgent( name + "/" + version );
+
+ Proxy proxy = session.getSettings().getActiveProxy();
+ if( proxy != null && proxy.isActive() ) {
+ getLog().debug("proxy: " + proxy.getHost() + ":" + proxy.getPort());
+ manager.setProxy(proxy);
+ }
}
return manager;
