svn commit: r956713 - in /ant/ivy/core/trunk/src/java/org/apache/ivy: core/cache/DefaultRepositoryCacheManager.java plugins/resolver/BasicResolver.java

[maartenc]

Author: maartenc
Date: Mon Jun 21 21:50:48 2010
New Revision: 956713

URL: http://svn.apache.org/viewvc?rev=956713&view=rev
Log:
Transform everything to the system namespace before saving the internal 
datafile.

Modified:
    
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
    
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java

Modified: 
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java?rev=956713&r1=956712&r2=956713&view=diff
==============================================================================
--- 
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
 (original)
+++ 
ant/ivy/core/trunk/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
 Mon Jun 21 21:50:48 2010
@@ -1049,7 +1049,10 @@ public class DefaultRepositoryCacheManag
                 madr.setDownloadTimeMillis(report.getDownloadTimeMillis());
                 madr.setOriginalLocalFile(report.getLocalFile());
                 madr.setSize(report.getSize());
-                saveArtifactOrigin(md.getMetadataArtifact(), 
report.getArtifactOrigin());
+                
+                Artifact transformedMetadataArtifact = 
NameSpaceHelper.transform(
+                    md.getMetadataArtifact(), 
options.getNamespace().getToSystemTransformer());
+                saveArtifactOrigin(transformedMetadataArtifact, 
report.getArtifactOrigin());
                 
                 return new ResolvedModuleRevision(resolver, resolver, md, 
madr);
             } catch (IOException ex) {

Modified: 
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java?rev=956713&r1=956712&r2=956713&view=diff
==============================================================================
--- 
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java 
(original)
+++ 
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java 
Mon Jun 21 21:50:48 2010
@@ -780,7 +780,7 @@ public abstract class BasicResolver exte
     }
     
     public ArtifactOrigin locate(Artifact artifact) {
-        ArtifactOrigin origin = 
getRepositoryCacheManager().getSavedArtifactOrigin(artifact);
+        ArtifactOrigin origin = 
getRepositoryCacheManager().getSavedArtifactOrigin(toSystem(artifact));
         if (!ArtifactOrigin.isUnknown(origin)) {
             return origin;
         }