svn commit: r745683 - in /maven/mercury/trunk: mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/

[og...@apache.org]

Author: ogusakov
Date: Wed Feb 18 22:54:34 2009
New Revision: 745683

URL: http://svn.apache.org/viewvc?rev=745683&view=rev
Log:
[MNG-3969] added logging, fixed a bug

Modified:
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
    maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?rev=745683&r1=745682&r2=745683&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java Wed Feb 18 22:54:34 2009
@@ -29,6 +29,7 @@
 import org.apache.tools.ant.Project;
 import org.codehaus.plexus.lang.DefaultLanguage;
 import org.codehaus.plexus.lang.Language;
+import org.mortbay.log.Log;
 
 /**
  * @author Oleg Gusakov

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java?rev=745683&r1=745682&r2=745683&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java Wed Feb 18 22:54:34 2009
@@ -27,6 +27,9 @@
 
 import org.apache.maven.mercury.artifact.Artifact;
 import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
+import org.apache.maven.mercury.repository.api.Repository;
 import org.apache.maven.mercury.util.Util;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.FileList;
@@ -44,6 +47,8 @@
 {
     private static final Language LANG = new DefaultLanguage( ResolveTask.class );
 
+    private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( ResolveTask.class );
+
     ArtifactScopeEnum[] SCOPES =
         new ArtifactScopeEnum[] { ArtifactScopeEnum.compile, ArtifactScopeEnum.test, ArtifactScopeEnum.runtime };
 
@@ -155,6 +160,12 @@
         try
         {
             Config config = AbstractAntTask.findConfig( getProject(), _configId );
+            
+if( LOG.isDebugEnabled() )
+{
+    for( Repository r : config.getRepositories() )
+        LOG.debug( "Repository: " + (r.getServer() == null ? r.getClass().getName() : r.getServer().getURL()) );
+}
 
             dep.setTransitive( _transitive );
 

Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=745683&r1=745682&r2=745683&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java Wed Feb 18 22:54:34 2009
@@ -697,7 +697,7 @@
     
     String bmdPath = bmd.getGroupId().replace( '.', '/' )
                     + '/'+bmd.getArtifactId()
-                    + '/'+bmd.getVersion()
+                    + '/'+ ArtifactLocation.calculateVersionDir( bmd.getVersion() )
                     + '/'+bmd.getBaseName(classifier)
                     + '.' + (type == null ? bmd.getType() : type )
                     ;