svn commit: r476729 - in /maven/archiva/trunk/archiva-cli: pom.xml src/main/java/org/apache/maven/archiva/cli/AbstractCli.java src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java src/main/java/org/apache/maven/archiva/cli/Cli.java

[jvanzyl]

Author: jvanzyl
Date: Sat Nov 18 22:30:11 2006
New Revision: 476729

URL: http://svn.apache.org/viewvc?view=rev&rev=476729
Log:
o use new plexus-cli piece

Removed:
    
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/AbstractCli.java
    
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/Cli.java
Modified:
    maven/archiva/trunk/archiva-cli/pom.xml
    
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java

Modified: maven/archiva/trunk/archiva-cli/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-cli/pom.xml?view=diff&rev=476729&r1=476728&r2=476729
==============================================================================
--- maven/archiva/trunk/archiva-cli/pom.xml (original)
+++ maven/archiva/trunk/archiva-cli/pom.xml Sat Nov 18 22:30:11 2006
@@ -12,44 +12,10 @@
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
-      <groupId>classworlds</groupId>
-      <artifactId>classworlds</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
-      <artifactId>archiva-core</artifactId>
+      <artifactId>plexus-cli</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.0</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-lang</artifactId>
-          <groupId>commons-lang</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>ognl</groupId>
-      <artifactId>ognl</artifactId>
-      <version>2.6.7</version>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -59,7 +25,7 @@
           <descriptor>src/main/assembly/archiva-cli-assembly.xml</descriptor>
           <archive>
             <manifest>
-              <mainClass>org.apache.maven.archiva.cli.Cli</mainClass>
+              <mainClass>org.apache.maven.archiva.cli.ArchivaCli</mainClass>
             </manifest>
           </archive>
         </configuration>

Modified: 
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java?view=diff&rev=476729&r1=476728&r2=476729
==============================================================================
--- 
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
 (original)
+++ 
maven/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
 Sat Nov 18 22:30:11 2006
@@ -1,20 +1,22 @@
 package org.apache.maven.archiva.cli;
 
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.util.StringUtils;
-import org.apache.maven.archiva.Archiva;
-import org.apache.maven.archiva.discoverer.DiscovererException;
-import org.apache.maven.archiva.converter.RepositoryConversionException;
 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.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.codehaus.plexus.tools.cli.Cli;
+import org.codehaus.plexus.util.StringUtils;
 
-import java.util.Properties;
-import java.util.List;
-import java.util.Arrays;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
 
 /**
  * @author Jason van Zyl
@@ -34,17 +36,12 @@
     //
     // 
----------------------------------------------------------------------------
 
-    protected static Cli getCli()
-    {
-        return new ArchivaCli();
-    }
-
-    protected String getPomPropertiesPath()
+    public String getPomPropertiesPath()
     {
         return "META-INF/maven/org.apache.maven/maven-core/pom.properties";
     }
 
-    protected Options buildOptions( Options options )
+    public Options buildCliOptions( Options options )
     {
         options.addOption( OptionBuilder.withLongOpt( "convert" 
).hasArg().withDescription(
             "Convert a legacy Maven 1.x repository to a Maven 2.x repository 
using a properties file to describe the conversion." )
@@ -53,7 +50,7 @@
         return options;
     }
 
-    public void processOptions( CommandLine cli,
+    public void invokePlexusComponent( CommandLine cli,
                                        PlexusContainer plexus )
         throws Exception
     {