jvanzyl 2003/02/10 05:55:00
Modified: src/java/org/apache/maven MavenUtils.java
src/java/org/apache/maven/util HttpUtils.java
src/java/org/apache/maven/verifier DependencyVerifier.java
Log:
o Removed the 'file' @param from HttpUtils. The only thing is was being used
for was to display error messages. We were also passing in the actual
destinationFile so we can simply getName() to display error messages.
Revision Changes Path
1.88 +2 -1 jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- MavenUtils.java 24 Jan 2003 05:21:36 -0000 1.87
+++ MavenUtils.java 10 Feb 2003 13:55:00 -0000 1.88
@@ -400,6 +400,7 @@
ByteArrayOutputStream projectStream = new ByteArrayOutputStream();
BeanWriter beanWriter = new BeanWriter( projectStream );
beanWriter.setXMLIntrospector( createXMLIntrospector() );
+
beanWriter.setWriteIDs( true );
beanWriter.write( project );
1.21 +1 -7
jakarta-turbine-maven/src/java/org/apache/maven/util/HttpUtils.java
Index: HttpUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/util/HttpUtils.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- HttpUtils.java 8 Feb 2003 11:57:26 -0000 1.20
+++ HttpUtils.java 10 Feb 2003 13:55:00 -0000 1.21
@@ -120,7 +120,6 @@
*
* @param url the of the file to retrieve
* @param destinationFile where to store it
- * @param file <strong>doesn't appear to be used</strong>
* @param ignoreErrors whether to ignore errors during I/O or throw an
* exception when they happen
* @param useTimestamp whether to check the modified timestamp on the
@@ -136,7 +135,6 @@
*/
public static void getFile( String url,
File destinationFile,
- String file,
boolean ignoreErrors,
boolean useTimestamp,
String proxyHost,
@@ -149,7 +147,6 @@
// Get the requested file.
getFile( url,
destinationFile,
- file,
ignoreErrors,
useTimestamp,
proxyHost,
@@ -166,7 +163,6 @@
{
getFile( url + ".md5",
checksumFile,
- file + ".md5",
ignoreErrors,
useTimestamp,
proxyHost,
@@ -188,7 +184,6 @@
*
* @param url the of the file to retrieve
* @param destinationFile where to store it
- * @param file <strong>doesn't appear to be used</strong>
* @param ignoreErrors whether to ignore errors during I/O or throw an
* exception when they happen
* @param useTimestamp whether to check the modified timestamp on the
@@ -202,7 +197,6 @@
*/
public static void getFile( String url,
File destinationFile,
- String file,
boolean ignoreErrors,
boolean useTimestamp,
String proxyHost,
@@ -304,7 +298,7 @@
}
// This will never happen with maven's use of this class.
- throw new Exception( "Can't get " + file + " to " + destinationFile );
+ throw new Exception( "Can't get " + destinationFile.getName() + " to "
+ destinationFile );
}
FileOutputStream fos = new FileOutputStream( destinationFile );
1.20 +1 -2
jakarta-turbine-maven/src/java/org/apache/maven/verifier/DependencyVerifier.java
Index: DependencyVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/verifier/DependencyVerifier.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DependencyVerifier.java 9 Feb 2003 23:37:04 -0000 1.19
+++ DependencyVerifier.java 10 Feb 2003 13:55:00 -0000 1.20
@@ -310,7 +310,6 @@
{
HttpUtils.getFile( url,
artifact.getFile(),
- url,
ignoreErrors,
useTimestamp,
getProject().getContext().getProxyHost(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
