Return-Path: Delivered-To: apmail-avalon-cvs-archive@www.apache.org Received: (qmail 99287 invoked from network); 10 Dec 2003 12:15:30 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 10 Dec 2003 12:15:30 -0000 Received: (qmail 22802 invoked by uid 500); 10 Dec 2003 12:15:28 -0000 Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 22763 invoked by uid 500); 10 Dec 2003 12:15:28 -0000 Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list cvs@avalon.apache.org Received: (qmail 22750 invoked from network); 10 Dec 2003 12:15:28 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 10 Dec 2003 12:15:28 -0000 Received: (qmail 99232 invoked by uid 1438); 10 Dec 2003 12:15:29 -0000 Date: 10 Dec 2003 12:15:29 -0000 Message-ID: <20031210121529.99231.qmail@minotaur.apache.org> From: mcconnell@apache.org To: avalon-cvs@apache.org Subject: cvs commit: avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli Main.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mcconnell 2003/12/10 04:15:29 Modified: merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli Main.java Log: No need to do maven resolution inside the CLI context. Revision Changes Path 1.5 +1 -52 avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java Index: Main.java =================================================================== RCS file: /home/cvs/avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Main.java 9 Dec 2003 13:46:32 -0000 1.4 +++ Main.java 10 Dec 2003 12:15:29 -0000 1.5 @@ -623,57 +623,6 @@ } /** - * Return the maven repository directory. - * @return the maven repository directory - */ - private static File getMavenRepositoryDirectory() - { - return new File( getMavenHomeDirectory(), "repository" ); - } - - /** - * Return the maven home directory. - * @return the maven home directory - */ - private static File getMavenHomeDirectory() - { - return new File( getMavenHome() ); - } - - /** - * Return the maven home path. - * @return the maven home directory path - */ - private static String getMavenHome() - { - try - { - String local = - System.getProperty( - "maven.home.local", - Env.getEnvVariable( "MAVEN_HOME_LOCAL" ) ); - if( null != local ) return local; - - String maven = - System.getProperty( - "maven.home", - Env.getEnvVariable( "MAVEN_HOME" ) ); - if( null != maven ) return maven; - - return System.getProperty( "user.home" ) + File.separator + ".maven"; - - } - catch( Throwable e ) - { - final String error = - "Internal error while attempting to access environment."; - final String message = - ExceptionHelper.packException( error, e, true ); - throw new RuntimeException( message ); - } - } - - /** * Return the functional base directory. The implementation looks * for the ${merlin.dir} system property and if not found, looks for * the ${basedir} system property, and as a last resort, returns the --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org For additional commands, e-mail: cvs-help@avalon.apache.org