diff options
| author | Joakim Erdfelt <joakime@apache.org> | 2007-02-23 19:05:21 +0000 |
|---|---|---|
| committer | Joakim Erdfelt <joakime@apache.org> | 2007-02-23 19:05:21 +0000 |
| commit | dee0d5a300ee0ba0240efc1277428b52cdcec9e0 (patch) | |
| tree | 0f4c8d3b8b8b0468deac3c8851380a68bfa1744e /archiva-cli | |
| parent | 2b50a18d22ef8972d241f54c20a131e05a584ac4 (diff) | |
| download | archiva-dee0d5a300ee0ba0240efc1277428b52cdcec9e0.tar.gz archiva-dee0d5a300ee0ba0240efc1277428b52cdcec9e0.zip | |
Merge from archiva-MRM-239 branch to trunk. r506385:HEAD
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@511053 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-cli')
| -rw-r--r-- | archiva-cli/pom.xml | 2 | ||||
| -rw-r--r-- | archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 9a25de821..17a2b9e59 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -30,7 +30,7 @@ <dependencies> <dependency> <groupId>org.apache.maven.archiva</groupId> - <artifactId>archiva-core</artifactId> + <artifactId>archiva-converter</artifactId> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java index f9ba5cc9e..26ee4db77 100644 --- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java +++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java @@ -23,9 +23,8 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.lang.StringUtils; -import org.apache.maven.archiva.conversion.LegacyRepositoryConverter; import org.apache.maven.archiva.converter.RepositoryConversionException; -import org.apache.maven.archiva.discoverer.DiscovererException; +import org.apache.maven.archiva.converter.legacy.LegacyRepositoryConverter; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.tools.cli.AbstractCli; @@ -103,28 +102,25 @@ public class ArchivaCli System.out.println( "Converting " + oldRepositoryPath + " to " + newRepositoryPath ); - List blacklistedPatterns = null; + List fileExclusionPatterns = null; String s = p.getProperty( BLACKLISTED_PATTERNS ); if ( s != null ) { - blacklistedPatterns = Arrays.asList( StringUtils.split( s, "," ) ); + fileExclusionPatterns = Arrays.asList( StringUtils.split( s, "," ) ); } try { legacyRepositoryConverter.convertLegacyRepository( oldRepositoryPath, newRepositoryPath, - blacklistedPatterns, true ); + fileExclusionPatterns, + true ); } catch ( RepositoryConversionException e ) { showFatalError( "Error converting repository.", e, true ); } - catch ( DiscovererException e ) - { - showFatalError( "Error discovery artifacts to convert.", e, true ); - } } } } |