ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r1292544 - in /ant/ivy/core/trunk/src/java/org/apache/ivy/plugins: repository/file/FileRepository.java resolver/RepositoryResolver.java
Date Wed, 22 Feb 2012 22:16:44 GMT
Author: maartenc
Date: Wed Feb 22 22:16:44 2012
New Revision: 1292544

URL: http://svn.apache.org/viewvc?rev=1292544&view=rev
Log:
Normalize the destination to where the artifact was published before logging it.

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java?rev=1292544&r1=1292543&r2=1292544&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java
Wed Feb 22 22:16:44 2012
@@ -135,4 +135,12 @@ public class FileRepository extends Abst
         Checks.checkAbsolute(baseDir, "basedir");
         this.baseDir = baseDir;
     }
+
+    public String standardize(String source) {
+        return FileUtil.normalize(source).getPath();
+    }
+
+    public String getFileSeparator() {
+        return File.separator;
+    }
 }

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java?rev=1292544&r1=1292543&r2=1292544&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java Wed
Feb 22 22:16:44 2012
@@ -214,7 +214,7 @@ public class RepositoryResolver extends 
         String dest = getDestination(destPattern, artifact, mrid);
 
         put(artifact, src, dest, overwrite);
-        Message.info("\tpublished " + artifact.getName() + " to " + hidePassword(dest));
+        Message.info("\tpublished " + artifact.getName() + " to " + hidePassword(repository.standardize(dest)));
     }
 
     protected String getDestination(String pattern, Artifact artifact, ModuleRevisionId mrid)
{



Mime
View raw message