Return-Path: Delivered-To: apmail-maven-m2-dev-archive@www.apache.org Received: (qmail 46847 invoked from network); 2 Sep 2004 12:50:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Sep 2004 12:50:48 -0000 Received: (qmail 57485 invoked by uid 500); 2 Sep 2004 12:50:48 -0000 Delivered-To: apmail-maven-m2-dev-archive@maven.apache.org Received: (qmail 57432 invoked by uid 500); 2 Sep 2004 12:50:47 -0000 Mailing-List: contact m2-dev-help@maven.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: List-Id: "Maven 2 Developers List" Reply-To: "Maven 2 Developers List" Delivered-To: mailing list m2-dev@maven.apache.org Received: (qmail 57417 invoked by uid 500); 2 Sep 2004 12:50:47 -0000 Delivered-To: apmail-maven-components-cvs@apache.org Received: (qmail 57414 invoked by uid 99); 2 Sep 2004 12:50:47 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 02 Sep 2004 05:50:47 -0700 Received: (qmail 46832 invoked by uid 1717); 2 Sep 2004 12:50:46 -0000 Date: 2 Sep 2004 12:50:46 -0000 Message-ID: <20040902125046.46831.qmail@minotaur.apache.org> From: brett@apache.org To: maven-components-cvs@apache.org Subject: cvs commit: maven-components/maven-mboot2/src/main/java MBoot.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N brett 2004/09/02 05:50:46 Modified: maven-mboot2/src/main/java MBoot.java Log: actually, you can specify a sys property instead Revision Changes Path 1.22 +16 -6 maven-components/maven-mboot2/src/main/java/MBoot.java Index: MBoot.java =================================================================== RCS file: /home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- MBoot.java 2 Sep 2004 12:34:19 -0000 1.21 +++ MBoot.java 2 Sep 2004 12:50:46 -0000 1.22 @@ -142,13 +142,25 @@ File userPomFile = new File( System.getProperty( "user.home" ), ".m2/pom.xml" ); reader = new ModelReader(); - if ( !reader.parse( userPomFile ) ) + + if ( userPomFile.exists() && !reader.parse( userPomFile ) ) + { + System.err.println( "Error reading user POM file" ); + + System.exit( 1 ); + } + + String mavenRepoLocal = System.getProperty( "maven.repo.local", reader.getLocal().getRepository() ); + + if ( mavenRepoLocal == null ) { System.out.println( "You must have a ~/.m2/pom.xml file and must contain the following entries:" ); - System.out.println( "\n" ); - System.out.println( " /path/to/m2/repository (required)\n" ); - System.out.println( " true (optional)\n" ); + System.out.println( "" ); + System.out.println( " /path/to/m2/repository (required)" ); + System.out.println( " true (optional)" ); System.out.println( "" ); + System.out.println(); + System.out.println( "Alternatively, you can specify -Dmaven.repo.local=/path/to/m2/repository" ); System.exit( 1 ); } @@ -183,8 +195,6 @@ { online = false; } - - String mavenRepoLocal = System.getProperty( "maven.repo.local", reader.getLocal().getRepository() ); downloader = new ArtifactDownloader( mavenRepoLocal, reader.getRemoteRepositories() );