You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/11/29 02:34:19 UTC
svn commit: r349576 - in /maven/sandbox/repoclean: pom.xml
src/main/java/org/apache/maven/tools/repoclean/discover/
src/main/java/org/apache/maven/tools/repoclean/phase/DiscoveryPhase.java
src/main/resources/META-INF/plexus/components.xml
Author: brett
Date: Mon Nov 28 17:34:08 2005
New Revision: 349576
URL: http://svn.apache.org/viewcvs?rev=349576&view=rev
Log:
move discovery to a new component
Removed:
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/
Modified:
maven/sandbox/repoclean/pom.xml
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/DiscoveryPhase.java
maven/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml
Modified: maven/sandbox/repoclean/pom.xml
URL: http://svn.apache.org/viewcvs/maven/sandbox/repoclean/pom.xml?rev=349576&r1=349575&r2=349576&view=diff
==============================================================================
--- maven/sandbox/repoclean/pom.xml (original)
+++ maven/sandbox/repoclean/pom.xml Mon Nov 28 17:34:08 2005
@@ -38,6 +38,11 @@
<version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.repository</groupId>
+ <artifactId>maven-repository-discovery</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/DiscoveryPhase.java
URL: http://svn.apache.org/viewcvs/maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/DiscoveryPhase.java?rev=349576&r1=349575&r2=349576&view=diff
==============================================================================
--- maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/DiscoveryPhase.java (original)
+++ maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/DiscoveryPhase.java Mon Nov 28 17:34:08 2005
@@ -16,10 +16,9 @@
* limitations under the License.
*/
+import org.apache.maven.repository.discovery.ArtifactDiscoverer;
import org.apache.maven.tools.repoclean.RepositoryCleanerConfiguration;
-import org.apache.maven.tools.repoclean.discover.ArtifactDiscoverer;
import org.apache.maven.tools.repoclean.report.PathLister;
-import org.apache.maven.tools.repoclean.report.ReportWriteException;
import org.apache.maven.tools.repoclean.report.Reporter;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
@@ -31,6 +30,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
public class DiscoveryPhase
@@ -63,25 +63,25 @@
logger.debug( "Discovering artifacts." );
}
- try
- {
- File kickoutsList = new File( reportsBase, "kickouts.txt" );
- File excludesList = new File( reportsBase, "excludes.txt" );
+ File kickoutsList = new File( reportsBase, "kickouts.txt" );
+ File excludesList = new File( reportsBase, "excludes.txt" );
- kickoutLister = new PathLister( kickoutsList );
- excludeLister = new PathLister( excludesList );
+ kickoutLister = new PathLister( kickoutsList );
+ excludeLister = new PathLister( excludesList );
- artifacts = artifactDiscoverer.discoverArtifacts( sourceRepositoryBase, repoReporter,
- configuration.getBlacklistedPatterns(), excludeLister,
- kickoutLister, configuration.isConvertSnapshots() );
- }
- catch ( ReportWriteException e )
- {
- repoReporter.error( "Error discovering artifacts in source repository.", e );
+ artifacts = artifactDiscoverer.discoverArtifacts( sourceRepositoryBase,
+ configuration.getBlacklistedPatterns(),
+ configuration.isConvertSnapshots() );
- throw e;
+ for ( Iterator i = artifactDiscoverer.getKickedOutPathsIterator(); i.hasNext(); )
+ {
+ kickoutLister.addPath( (String) i.next() );
}
+ for ( Iterator i = artifactDiscoverer.getExcludedPathsIterator(); i.hasNext(); )
+ {
+ excludeLister.addPath( (String) i.next() );
+ }
}
finally
{
Modified: maven/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml?rev=349576&r1=349575&r2=349576&view=diff
==============================================================================
--- maven/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml Mon Nov 28 17:34:08 2005
@@ -210,51 +210,6 @@
|
-->
<component>
- <role>org.apache.maven.tools.repoclean.discover.ArtifactDiscoverer</role>
- <role-hint>legacy</role-hint>
- <implementation>org.apache.maven.tools.repoclean.discover.LegacyArtifactDiscoverer</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- </requirements>
- </component>
- <!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.tools.repoclean.discover.ArtifactDiscoverer</role>
- <role-hint>default</role-hint>
- <implementation>org.apache.maven.tools.repoclean.discover.DefaultArtifactDiscoverer</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- </requirements>
- </component>
- <!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.tools.repoclean.discover.ArtifactDiscoverer</role>
- <role-hint>alpha-bridging</role-hint>
- <implementation>org.apache.maven.tools.repoclean.discover.DefaultArtifactDiscoverer</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- </requirements>
- </component>
- <!--
- |
- |
- |
- -->
- <component>
<role>org.apache.maven.tools.repoclean.digest.DigestVerifier</role>
<implementation>org.apache.maven.tools.repoclean.digest.DigestVerifier</implementation>
<requirements>