You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/08/19 08:47:16 UTC
svn commit: r233442 - in /maven/maven-1/plugins/trunk/artifact:
src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
xdocs/changes.xml
Author: brett
Date: Thu Aug 18 23:47:11 2005
New Revision: 233442
URL: http://svn.apache.org/viewcvs?rev=233442&view=rev
Log:
PR: MPARTIFACT-58
add leading / on directory if it is missing
Modified:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java?rev=233442&r1=233441&r2=233442&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java (original)
+++ maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java Thu Aug 18 23:47:11 2005
@@ -50,8 +50,13 @@
Repository repository = new Repository( id, url );
String dir = (String) project.getContext().getVariable( "maven.repo." + id + ".directory" );
- if ( repository.getBasedir() != null )
+ if ( repository.getBasedir() != null && dir != null )
{
+ dir = dir.replace( '\\', '/' );
+ if ( !repository.getBasedir().endsWith( "/" ) && !dir.startsWith( "/" ) )
+ {
+ dir = "/" + dir;
+ }
dir = repository.getBasedir() + dir;
}
Modified: maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml?rev=233442&r1=233441&r2=233442&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml Thu Aug 18 23:47:11 2005
@@ -24,6 +24,9 @@
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
+ <release version="1.6.1-SNAPSHOT" date="in SVN">
+ <action dev="brett" type="fix" issue="MPARTIFACT-58">Correct handling of directory without a leading /</action>
+ </release>
<release version="1.6" date="2005-07-30">
<action dev="brett" type="fix" issue="MPARTIFACT-55">Correct basedir for file:// URLs</action>
<action dev="brett" type="fix" issue="MPARTIFACT-54">Fix handling of dependencies with properties</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org