Return-Path: Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org Received: (qmail 38720 invoked from network); 4 Nov 2006 04:01:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Nov 2006 04:01:14 -0000 Received: (qmail 55338 invoked by uid 500); 4 Nov 2006 04:01:25 -0000 Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org Received: (qmail 55303 invoked by uid 500); 4 Nov 2006 04:01:25 -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 55292 invoked by uid 99); 4 Nov 2006 04:01:25 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 20:01:25 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Fri, 03 Nov 2006 20:01:13 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id DAEDF1A9846; Fri, 3 Nov 2006 20:00:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r471109 - in /maven/archiva/trunk: ./ archiva-core/src/main/java/org/apache/maven/archiva/conversion/ archiva-core/src/test/java/org/apache/maven/archiva/ maven-meeper/src/bin/m1-m2-conversion/ Date: Sat, 04 Nov 2006 04:00:47 -0000 To: archiva-commits@maven.apache.org From: jvanzyl@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061104040047.DAEDF1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Fri Nov 3 20:00:46 2006 New Revision: 471109 URL: http://svn.apache.org/viewvc?view=rev&rev=471109 Log: o allow for blacklisted patterns Added: maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/ArchivaTest.java (contents, props changed) - copied, changed from r471088, maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java maven/archiva/trunk/maven-meeper/src/bin/m1-m2-conversion/archiva-cli-1.0-SNAPSHOT-cli.jar (with props) Removed: maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/conversion/DefaultLegacyRepositoryConverter.java maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/conversion/LegacyRepositoryConverter.java maven/archiva/trunk/pom.xml Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/conversion/DefaultLegacyRepositoryConverter.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/conversion/DefaultLegacyRepositoryConverter.java?view=diff&rev=471109&r1=471108&r2=471109 ============================================================================== --- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/conversion/DefaultLegacyRepositoryConverter.java (original) +++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/conversion/DefaultLegacyRepositoryConverter.java Fri Nov 3 20:00:46 2006 @@ -63,7 +63,9 @@ */ private ReportGroup reportGroup; - public void convertLegacyRepository( File legacyRepositoryDirectory, File repositoryDirectory, + public void convertLegacyRepository( File legacyRepositoryDirectory, + File repositoryDirectory, + List blacklistedPatterns, boolean includeSnapshots ) throws RepositoryConversionException, DiscovererException { @@ -88,7 +90,7 @@ ArtifactFilter filter = includeSnapshots ? new AcceptAllArtifactFilter() : (ArtifactFilter) new SnapshotArtifactFilter(); - List legacyArtifacts = artifactDiscoverer.discoverArtifacts( legacyRepository, null, filter ); + List legacyArtifacts = artifactDiscoverer.discoverArtifacts( legacyRepository, blacklistedPatterns, filter ); ReportingDatabase reporter; try Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/conversion/LegacyRepositoryConverter.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/conversion/LegacyRepositoryConverter.java?view=diff&rev=471109&r1=471108&r2=471109 ============================================================================== --- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/conversion/LegacyRepositoryConverter.java (original) +++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/conversion/LegacyRepositoryConverter.java Fri Nov 3 20:00:46 2006 @@ -4,6 +4,7 @@ import org.apache.maven.archiva.discoverer.DiscovererException; import java.io.File; +import java.util.List; /** * @author Jason van Zyl @@ -19,7 +20,11 @@ * @param legacyRepositoryDirectory * @param repositoryDirectory * @throws org.apache.maven.archiva.converter.RepositoryConversionException + * */ - void convertLegacyRepository( File legacyRepositoryDirectory, File repositoryDirectory, boolean includeSnapshots ) + void convertLegacyRepository( File legacyRepositoryDirectory, + File repositoryDirectory, + List blacklistedPatterns, + boolean includeSnapshots ) throws RepositoryConversionException, DiscovererException; } Copied: maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/ArchivaTest.java (from r471088, maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java) URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/ArchivaTest.java?view=diff&rev=471109&p1=maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java&r1=471088&p2=maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/ArchivaTest.java&r2=471109 ============================================================================== --- maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java (original) +++ maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/ArchivaTest.java Fri Nov 3 20:00:46 2006 @@ -23,7 +23,7 @@ /** * @author Jason van Zyl */ -public class RepositoryManagerTest +public class ArchivaTest extends PlexusTestCase { public void testLegacyRepositoryConversion() Propchange: maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/ArchivaTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/ArchivaTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/archiva/trunk/maven-meeper/src/bin/m1-m2-conversion/archiva-cli-1.0-SNAPSHOT-cli.jar URL: http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/m1-m2-conversion/archiva-cli-1.0-SNAPSHOT-cli.jar?view=auto&rev=471109 ============================================================================== Binary file - no diff available. Propchange: maven/archiva/trunk/maven-meeper/src/bin/m1-m2-conversion/archiva-cli-1.0-SNAPSHOT-cli.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: maven/archiva/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?view=diff&rev=471109&r1=471108&r2=471109 ============================================================================== --- maven/archiva/trunk/pom.xml (original) +++ maven/archiva/trunk/pom.xml Fri Nov 3 20:00:46 2006 @@ -132,6 +132,7 @@ archiva-plexus-application archiva-plexus-runtime archiva-security + archiva-cli