Return-Path: Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org Received: (qmail 13371 invoked from network); 17 Oct 2007 17:49:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Oct 2007 17:49:59 -0000 Received: (qmail 53058 invoked by uid 500); 17 Oct 2007 17:47:24 -0000 Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org Received: (qmail 53025 invoked by uid 500); 17 Oct 2007 17:47:24 -0000 Mailing-List: contact archiva-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: archiva-dev@maven.apache.org Delivered-To: mailing list archiva-commits@maven.apache.org Received: (qmail 53012 invoked by uid 99); 17 Oct 2007 17:47:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Oct 2007 10:47:24 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Oct 2007 17:47:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 311621A9832; Wed, 17 Oct 2007 10:46:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r585598 - /maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java Date: Wed, 17 Oct 2007 17:46:41 -0000 To: archiva-commits@maven.apache.org From: joakime@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071017174645.311621A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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() );