brett 2004/03/17 21:56:21
Modified: src/java/org/apache/maven/verifier Tag: MAVEN-1_0-BRANCH
DependencyVerifier.java
Log:
PR: MPXDOC-84
fix file URL handling since change introduced in r1.34
should now behave correctly in both situations
Revision Changes Path
No revision
No revision
1.34.4.5 +3 -2 maven/src/java/org/apache/maven/verifier/DependencyVerifier.java
Index: DependencyVerifier.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/verifier/DependencyVerifier.java,v
retrieving revision 1.34.4.4
retrieving revision 1.34.4.5
diff -u -r1.34.4.4 -r1.34.4.5
--- DependencyVerifier.java 2 Mar 2004 11:22:42 -0000 1.34.4.4
+++ DependencyVerifier.java 18 Mar 2004 05:56:21 -0000 1.34.4.5
@@ -297,10 +297,10 @@
// The username and password parameters are not being
// used here. Those are the "" parameters you see below.
String url = remoteRepo + "/" + artifact.getUrlPath();
+ url = StringUtils.replace( url, "//", "/" );
if ( !url.startsWith( "file" ) )
{
- url = StringUtils.replace( url, "//", "/" );
if ( url.startsWith( "https" ) )
{
url = StringUtils.replace( url, "https:/", "https://"; );
@@ -315,6 +315,7 @@
// of the checksum file was successful.
try
{
+ log.debug( "Getting URL: " + url );
HttpUtils.getFile( url,
artifact.getFile(),
ignoreErrors,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
