Author: brett
Date: Sun May 1 18:14:21 2005
New Revision: 165573
URL: http://svn.apache.org/viewcvs?rev=165573&view=rev
Log:
PR: MAVEN-1600
Submitted by: Arnaud Heritier
add proxy details to the bootstrap
Modified:
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/ArtifactDownloader.java
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/BootstrapTask.java
Modified:
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/ArtifactDownloader.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/ArtifactDownloader.java?rev=165573&r1=165572&r2=165573&view=diff
==============================================================================
---
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/ArtifactDownloader.java
(original)
+++
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/ArtifactDownloader.java
Sun May 1 18:14:21 2005
@@ -240,4 +240,84 @@
{
System.out.println( message );
}
+
+ /**
+ * Returns the proxyHost.
+ *
+ * @return Returns the proxyHost.
+ */
+ protected String getProxyHost()
+ {
+ return this.proxyHost;
+ }
+
+ /**
+ * Sets the proxyHost.
+ *
+ * @param proxyHost The proxyHost to set.
+ */
+ protected void setProxyHost(String proxyHost)
+ {
+ this.proxyHost = proxyHost;
+ }
+
+ /**
+ * Returns the proxyPassword.
+ *
+ * @return Returns the proxyPassword.
+ */
+ protected String getProxyPassword()
+ {
+ return this.proxyPassword;
+ }
+
+ /**
+ * Sets the proxyPassword.
+ *
+ * @param proxyPassword The proxyPassword to set.
+ */
+ protected void setProxyPassword(String proxyPassword)
+ {
+ this.proxyPassword = proxyPassword;
+ }
+
+ /**
+ * Returns the proxyPort.
+ *
+ * @return Returns the proxyPort.
+ */
+ protected String getProxyPort()
+ {
+ return this.proxyPort;
+ }
+
+ /**
+ * Sets the proxyPort.
+ *
+ * @param proxyPort The proxyPort to set.
+ */
+ protected void setProxyPort(String proxyPort)
+ {
+ this.proxyPort = proxyPort;
+ }
+
+ /**
+ * Returns the proxyUserName.
+ *
+ * @return Returns the proxyUserName.
+ */
+ protected String getProxyUserName()
+ {
+ return this.proxyUserName;
+ }
+
+ /**
+ * Sets the proxyUserName.
+ *
+ * @param proxyUserName The proxyUserName to set.
+ */
+ protected void setProxyUserName(String proxyUserName)
+ {
+ this.proxyUserName = proxyUserName;
+ }
}
Modified:
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/BootstrapTask.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/BootstrapTask.java?rev=165573&r1=165572&r2=165573&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/BootstrapTask.java
(original)
+++ maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/BootstrapTask.java
Sun May 1 18:14:21 2005
@@ -18,9 +18,6 @@
*/
import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -354,7 +351,10 @@
try
{
ArtifactDownloader downloader = new ArtifactDownloader(
mavenRepoLocal.getAbsolutePath(), repositoryUrls );
-
+ downloader.setProxyHost(proxyHost);
+ downloader.setProxyPort(proxyPort);
+ downloader.setProxyUserName(proxyUserName);
+ downloader.setProxyPassword(proxyPassword);
downloader.downloadDependencies( getFiles() );
}
catch ( Exception e )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
