diff options
| author | Brett Porter <brett@apache.org> | 2006-12-23 06:09:30 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2006-12-23 06:09:30 +0000 |
| commit | 740994f99de3d6129094b96b0628188063f7c74c (patch) | |
| tree | b46f8a1cb1c83353b1bdeea3d5801c58d4d01e77 /archiva-cli | |
| parent | c205446929ef8ac4df32d0697dafa01f796e664f (diff) | |
| download | archiva-740994f99de3d6129094b96b0628188063f7c74c.tar.gz archiva-740994f99de3d6129094b96b0628188063f7c74c.zip | |
Get rid of old Archiva component
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@489857 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-cli')
| -rw-r--r-- | archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java | 13 |
1 files changed, 7 insertions, 6 deletions
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 270658ed0..a3a1c1cb1 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 @@ -3,12 +3,12 @@ package org.apache.maven.archiva.cli; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; -import org.apache.maven.archiva.Archiva; +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.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.tools.cli.AbstractCli; -import org.apache.commons.lang.StringUtils; import java.io.File; import java.io.FileInputStream; @@ -59,11 +59,11 @@ public class ArchivaCli return options; } - public void invokePlexusComponent( CommandLine cli, - PlexusContainer plexus ) + public void invokePlexusComponent( CommandLine cli, PlexusContainer plexus ) throws Exception { - Archiva archiva = (Archiva) plexus.lookup( Archiva.ROLE ); + LegacyRepositoryConverter legacyRepositoryConverter = + (LegacyRepositoryConverter) plexus.lookup( LegacyRepositoryConverter.ROLE ); if ( cli.hasOption( CONVERT ) ) { @@ -95,7 +95,8 @@ public class ArchivaCli try { - archiva.convertLegacyRepository( oldRepositoryPath, newRepositoryPath, blacklistedPatterns, true ); + legacyRepositoryConverter.convertLegacyRepository( oldRepositoryPath, newRepositoryPath, + blacklistedPatterns, true ); } catch ( RepositoryConversionException e ) { |