jvanzyl 2002/07/11 15:19:43
Modified: . build-bootstrap.xml
src/java/org/apache/maven ProjectVerifier.java
UpdateMavenCheck.java
src/java/org/apache/maven/ant GetList.java
src/java/org/apache/maven/app Maven.java
xdocs/ref build-file.xml properties.xml
Log:
o Applying Emmanuel's patches that utilize the new HttpUtils
API. Thanks Emmanuel! You'll make those proxy users happy!
Revision Changes Path
1.127 +3 -0 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- build-bootstrap.xml 11 Jul 2002 20:50:01 -0000 1.126
+++ build-bootstrap.xml 11 Jul 2002 22:19:42 -0000 1.127
@@ -139,6 +139,7 @@
failonerror="true">
<arg line="clean"/>
<arg line="java:jar"/>
+ <env key="MAVEN_HOME" value="${maven.home}"/>
</exec>
</target>
@@ -211,6 +212,8 @@
dest="${maven.repo.local}"
baseUrl="${maven.get.jars.baseUrl}/"
proxyHost="${maven.proxy.host}"
+ proxyUserName="${maven.proxy.username}"
+ proxyPassword="${maven.proxy.password}"
proxyPort="${maven.proxy.port}"
/>
</target>
1.15 +43 -7
jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java
Index: ProjectVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ProjectVerifier.java 11 Jul 2002 14:43:51 -0000 1.14
+++ ProjectVerifier.java 11 Jul 2002 22:19:42 -0000 1.15
@@ -128,6 +128,26 @@
* List of failed deps.
*/
private List failedDependencies;
+
+ /**
+ * Proxy host
+ */
+ private String proxyHost;
+
+ /**
+ * Proxy port
+ */
+ private String proxyPort;
+
+ /**
+ * Proxy userName
+ */
+ private String proxyUserName;
+
+ /**
+ * Proxy password
+ */
+ private String proxyPassword;
/**
* Name of the file in the maven.remoteRepo that enumerates the
@@ -150,8 +170,7 @@
*/
public void setProxyHost(String proxyHost)
{
- System.getProperties().put("proxySet", "true");
- System.getProperties().put("proxyHost", proxyHost);
+ this.proxyHost = proxyHost;
}
/**
@@ -160,8 +179,25 @@
*/
public void setProxyPort(String proxyPort)
{
- System.getProperties().put("proxySet", "true");
- System.getProperties().put("proxyPort", proxyPort);
+ this.proxyPort = proxyPort;
+ }
+
+ /**
+ * Sets the proxyUserName attribute.
+ * @param proxyUserName the value to set
+ */
+ public void setProxyUserName(String proxyUserName)
+ {
+ this.proxyUserName = proxyUserName;
+ }
+
+ /**
+ * Sets the proxyPassword attribute.
+ * @param proxyPassword the value to set
+ */
+ public void setProxyPassword(String proxyPassword)
+ {
+ this.proxyPassword = proxyPassword;
}
/**
@@ -367,8 +403,8 @@
{
gotFile = HttpUtils.getFile(new URL(remoteRepo + remoteFile),
localFile, remoteFile, verbose,
- ignoreErrors, useTimestamp,
- "", "");
+ ignoreErrors, useTimestamp, "", "",
+ proxyHost, proxyPort, proxyUserName,
proxyPassword);
}
catch (MalformedURLException mue)
{
1.10 +6 -2
jakarta-turbine-maven/src/java/org/apache/maven/UpdateMavenCheck.java
Index: UpdateMavenCheck.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/UpdateMavenCheck.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UpdateMavenCheck.java 27 May 2002 12:19:51 -0000 1.9
+++ UpdateMavenCheck.java 11 Jul 2002 22:19:43 -0000 1.10
@@ -98,7 +98,11 @@
// the user isn't connected. Hopefully httpclient has all
// this stuff built in.
HttpUtils.getFile(mavenVersionUrl, mavenVersionFile,
- MAVEN_VERSION_FILE, false, true, false, null, null);
+ MAVEN_VERSION_FILE, false, true, false, null, null,
+ getProject().getProperty("maven.proxy.host"),
+ getProject().getProperty("maven.proxy.port"),
+ getProject().getProperty("maven.proxy.username"),
+ getProject().getProperty("maven.proxy.password"));
BufferedReader in = new BufferedReader(new FileReader(
mavenVersionFile));
1.7 +31 -5 jakarta-turbine-maven/src/java/org/apache/maven/ant/GetList.java
Index: GetList.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/GetList.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetList.java 9 Jul 2002 13:27:43 -0000 1.6
+++ GetList.java 11 Jul 2002 22:19:43 -0000 1.7
@@ -86,6 +86,14 @@
private String pword = null;
/** A URL that the files are relative to */
private String baseUrl;
+ /** Proxy host */
+ private String proxyHost;
+ /** Proxy port */
+ private String proxyPort;
+ /** Proxy userName */
+ private String proxyUserName;
+ /** Proxy password */
+ private String proxyPassword;
/**
* This is the directory where all the requested
@@ -113,8 +121,7 @@
*/
public void setProxyHost(String proxyHost)
{
- System.getProperties().put("proxySet", "true");
- System.getProperties().put("proxyHost", proxyHost);
+ this.proxyHost = proxyHost;
}
/**
@@ -124,8 +131,26 @@
*/
public void setProxyPort(String proxyPort)
{
- System.getProperties().put("proxySet", "true");
- System.getProperties().put("proxyPort", proxyPort);
+ this.proxyPort = proxyPort;
+ }
+
+ /**
+ * Sets the proxyUserName attribute of the Get object
+ * @param proxyUserName the login used to access the proxy
+ */
+ public void setProxyUserName(String proxyUserName)
+ {
+ this.proxyUserName = proxyUserName;
+ }
+
+ /**
+ * Sets the proxyPassword attribute of the Get object
+ * @param proxyPassword the password used to access the proxy, e.g.
+ * <code>8080</code>
+ */
+ public void setProxyPassword(String proxyPassword)
+ {
+ this.proxyPassword = proxyPassword;
}
/**
@@ -169,7 +194,8 @@
URL source = new URL(baseUrl + file);
HttpUtils.getFile(source, destinationFile, file, verbose,
- ignoreErrors, useTimestamp, uname, pword);
+ ignoreErrors, useTimestamp, uname, pword,
+ proxyHost, proxyPort, proxyUserName,
proxyPassword);
}
catch (Exception e)
{
1.61 +2 -0 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Maven.java 11 Jul 2002 12:38:25 -0000 1.60
+++ Maven.java 11 Jul 2002 22:19:43 -0000 1.61
@@ -1346,6 +1346,8 @@
{
verifier.setProxyHost(proxyHost);
verifier.setProxyPort(getProperty("maven.proxy.port"));
+ verifier.setProxyUserName(getProperty("maven.proxy.username"));
+ verifier.setProxyPassword(getProperty("maven.proxy.password"));
}
verifier.doExecute();
}
1.21 +2 -1 jakarta-turbine-maven/xdocs/ref/build-file.xml
Index: build-file.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/build-file.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build-file.xml 18 Jun 2002 15:26:06 -0000 1.20
+++ build-file.xml 11 Jul 2002 22:19:43 -0000 1.21
@@ -230,7 +230,8 @@
</p>
<p>
Users behind a firewall can optionally set the
- <code>proxy.host</code> and <code>proxy.port</code>
+ <code>proxy.host</code>, <code>proxy.port</code>,
+ <code>proxy.username</code> and <code>proxy.password</code>
properties. If these properties are set, Maven will use the
specified host and port when downloading jar files from the
Internet.
1.23 +18 -0 jakarta-turbine-maven/xdocs/ref/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/properties.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- properties.xml 22 Jun 2002 16:12:09 -0000 1.22
+++ properties.xml 11 Jul 2002 22:19:43 -0000 1.23
@@ -171,6 +171,24 @@
target.
</td>
</tr>
+ <tr>
+ <td>maven.proxy.username</td>
+ <td>Yes</td>
+ <td>
+ Specifies a proxy username for proxy authentication. Used
+ by the <a
href="build-file.html#maven:verify-project">maven:verify-project</a>
+ target.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.proxy.password</td>
+ <td>Yes</td>
+ <td>
+ Specifies a proxy password for proxy authentication. Used
+ by the <a
href="build-file.html#maven:verify-project">maven:verify-project</a>
+ target.
+ </td>
+ </tr>
</table>
</section>
<section name="Directory Layout Settings">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
