You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/10/17 19:46:41 UTC

svn commit: r585598 - /maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java

Author: joakime
Date: Wed Oct 17 10:46:40 2007
New Revision: 585598

URL: http://svn.apache.org/viewvc?rev=585598&view=rev
Log:
Correcting path resolution logic.

Modified:
    maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java

Modified: maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java?rev=585598&r1=585597&r2=585598&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java Wed Oct 17 10:46:40 2007
@@ -26,7 +26,8 @@
 import org.apache.maven.archiva.converter.artifact.ArtifactConversionException;
 import org.apache.maven.archiva.converter.artifact.ArtifactConverter;
 import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
+import org.apache.maven.archiva.repository.ManagedRepositoryContent;
+import org.apache.maven.archiva.repository.content.ManagedDefaultRepositoryContent;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -60,11 +61,8 @@
      */
     private ArtifactFactory artifactFactory;
 
-    /**
-     * @plexus.requirement role-hint="legacy"
-     */
-    private BidirectionalRepositoryLayout bidirectionalLayout;
-
+    private ManagedRepositoryContent managedRepository;
+    
     private ArtifactRepository destinationRepository;
 
     private List includes;
@@ -82,7 +80,8 @@
     public void beginScan( ManagedRepositoryConfiguration repository )
         throws ConsumerException
     {
-
+        this.managedRepository = new ManagedDefaultRepositoryContent();
+        this.managedRepository.setRepository( repository );
     }
 
     public void completeScan()
@@ -105,7 +104,7 @@
     {
         try
         {
-            ArtifactReference reference = bidirectionalLayout.toArtifactReference( path );
+            ArtifactReference reference = managedRepository.toArtifactReference( path );
             Artifact artifact = artifactFactory.createArtifact( reference.getGroupId(), reference.getArtifactId(),
                                                                 reference.getVersion(), reference.getClassifier(),
                                                                 reference.getType() );