Return-Path: Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org Received: (qmail 35868 invoked from network); 1 Sep 2006 05:52:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Sep 2006 05:52:47 -0000 Received: (qmail 52127 invoked by uid 500); 1 Sep 2006 05:52:47 -0000 Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org Received: (qmail 52086 invoked by uid 500); 1 Sep 2006 05:52:47 -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 52072 invoked by uid 99); 1 Sep 2006 05:52:47 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Aug 2006 22:52:47 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Aug 2006 22:52:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 18DCE1A981A; Thu, 31 Aug 2006 22:52:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r439194 - in /maven/archiva/trunk: archiva-core/src/main/java/org/apache/maven/archiva/ archiva-core/src/main/java/org/apache/maven/archiva/scheduler/ archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/ archiva-discoverer/... Date: Fri, 01 Sep 2006 05:52:22 -0000 To: archiva-commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060901055226.18DCE1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: brett Date: Thu Aug 31 22:52:21 2006 New Revision: 439194 URL: http://svn.apache.org/viewvc?rev=439194&view=rev Log: rename discovery package for consistency Added: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/ - copied from r439166, maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/ - copied from r439166, maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/ Removed: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/ Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/ArtifactDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererException.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererPath.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscovererTest.java maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java?rev=439194&r1=439193&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java (original) +++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java Thu Aug 31 22:52:21 2006 @@ -2,8 +2,8 @@ import org.apache.maven.archiva.converter.RepositoryConversionException; import org.apache.maven.archiva.converter.RepositoryConverter; -import org.apache.maven.archiva.discovery.ArtifactDiscoverer; -import org.apache.maven.archiva.discovery.DiscovererException; +import org.apache.maven.archiva.discoverer.ArtifactDiscoverer; +import org.apache.maven.archiva.discoverer.DiscovererException; import org.apache.maven.archiva.reporting.ArtifactReporter; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java?rev=439194&r1=439193&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java (original) +++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java Thu Aug 31 22:52:21 2006 @@ -1,7 +1,7 @@ package org.apache.maven.archiva; import org.apache.maven.archiva.converter.RepositoryConversionException; -import org.apache.maven.archiva.discovery.DiscovererException; +import org.apache.maven.archiva.discoverer.DiscovererException; import java.io.File; Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java?rev=439194&r1=439193&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java (original) +++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java Thu Aug 31 22:52:21 2006 @@ -21,8 +21,8 @@ import org.apache.maven.archiva.configuration.ConfigurationStoreException; import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory; import org.apache.maven.archiva.configuration.RepositoryConfiguration; -import org.apache.maven.archiva.discovery.ArtifactDiscoverer; -import org.apache.maven.archiva.discovery.DiscovererException; +import org.apache.maven.archiva.discoverer.ArtifactDiscoverer; +import org.apache.maven.archiva.discoverer.DiscovererException; import org.apache.maven.archiva.indexer.RepositoryArtifactIndex; import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory; import org.apache.maven.archiva.indexer.RepositoryIndexException; @@ -65,7 +65,7 @@ private ConfiguredRepositoryFactory repoFactory; /** - * @plexus.requirement role="org.apache.maven.archiva.discovery.ArtifactDiscoverer" + * @plexus.requirement role="org.apache.maven.archiva.discoverer.ArtifactDiscoverer" */ private Map artifactDiscoverers; Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -65,7 +65,7 @@ long comparisonTimestamp = readComparisonTimestamp( repository, operation, dom ); // Note that last checked time is deliberately set to the start of the process so that anything added - // mid-discovery and missed by the scanner will get checked next time. + // mid-discoverer and missed by the scanner will get checked next time. // Due to this, there must be no negative side-effects of discovering something twice. Date newLastCheckedTime = new Date(); @@ -76,7 +76,7 @@ List artifactPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns, comparisonTimestamp ); // Also note that the last check time, while set at the start, is saved at the end, so that if any exceptions - // occur, then the timestamp is not updated so that the discovery is attempted again + // occur, then the timestamp is not updated so that the discoverer is attempted again // TODO: under the list-return behaviour we have now, exceptions might occur later and the timestamp will not be reset - see MRM-83 try { Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/ArtifactDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/ArtifactDiscoverer.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/ArtifactDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/ArtifactDiscoverer.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -29,13 +29,13 @@ * * @author John Casey * @author Brett Porter - * @plexus.component role="org.apache.maven.archiva.discovery.ArtifactDiscoverer" role-hint="default" + * @plexus.component role="org.apache.maven.archiva.discoverer.ArtifactDiscoverer" role-hint="default" */ public class DefaultArtifactDiscoverer extends AbstractArtifactDiscoverer { /** - * @see org.apache.maven.archiva.discovery.ArtifactDiscoverer#buildArtifact(String) + * @see org.apache.maven.archiva.discoverer.ArtifactDiscoverer#buildArtifact(String) */ public Artifact buildArtifact( String path ) throws DiscovererException Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -47,7 +47,7 @@ /** * This class gets all the paths that contain the metadata files. * - * @plexus.component role="org.apache.maven.archiva.discovery.MetadataDiscoverer" role-hint="default" + * @plexus.component role="org.apache.maven.archiva.discoverer.MetadataDiscoverer" role-hint="default" */ public class DefaultMetadataDiscoverer extends AbstractDiscoverer @@ -74,7 +74,7 @@ long comparisonTimestamp = readComparisonTimestamp( repository, operation, dom ); // Note that last checked time is deliberately set to the start of the process so that anything added - // mid-discovery and missed by the scanner will get checked next time. + // mid-discoverer and missed by the scanner will get checked next time. // Due to this, there must be no negative side-effects of discovering something twice. Date newLastCheckedTime = new Date(); @@ -83,7 +83,7 @@ STANDARD_DISCOVERY_INCLUDES, null, comparisonTimestamp ); // Also note that the last check time, while set at the start, is saved at the end, so that if any exceptions - // occur, then the timestamp is not updated so that the discovery is attempted again + // occur, then the timestamp is not updated so that the discoverer is attempted again // TODO: under the list-return behaviour we have now, exceptions might occur later and the timestamp will not be reset - see MRM-83 try { Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; import org.apache.maven.artifact.repository.ArtifactRepository; Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererException.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererException.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererException.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererException.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererPath.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererPath.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererPath.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererPath.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -32,13 +32,13 @@ * * @author John Casey * @author Brett Porter - * @plexus.component role="org.apache.maven.archiva.discovery.ArtifactDiscoverer" role-hint="legacy" + * @plexus.component role="org.apache.maven.archiva.discoverer.ArtifactDiscoverer" role-hint="legacy" */ public class LegacyArtifactDiscoverer extends AbstractArtifactDiscoverer { /** - * @see org.apache.maven.archiva.discovery.ArtifactDiscoverer#buildArtifact(String) + * @see org.apache.maven.archiva.discoverer.ArtifactDiscoverer#buildArtifact(String) */ public Artifact buildArtifact( String path ) throws DiscovererException Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. Modified: maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscovererTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscovererTest.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscovererTest.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscovererTest.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. Modified: maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. Modified: maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. Modified: maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java?rev=439194&r1=439166&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java Thu Aug 31 22:52:21 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. Modified: maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java?rev=439194&r1=439193&r2=439194&view=diff ============================================================================== --- maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java (original) +++ maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java Thu Aug 31 22:52:21 2006 @@ -18,8 +18,8 @@ import org.apache.maven.archiva.digest.DigestUtils; import org.apache.maven.archiva.digest.DigesterException; -import org.apache.maven.archiva.discovery.ArtifactDiscoverer; -import org.apache.maven.archiva.discovery.DiscovererException; +import org.apache.maven.archiva.discoverer.ArtifactDiscoverer; +import org.apache.maven.archiva.discoverer.DiscovererException; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository;