werken 2002/06/27 16:24:05
Modified: src/java/org/apache/maven/app Maven.java
Log:
* Better error handling if maven.repo.local unset
* Prettier output from --goals.
Revision Changes Path
1.31 +25 -30 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Maven.java 27 Jun 2002 18:34:54 -0000 1.30
+++ Maven.java 27 Jun 2002 23:24:05 -0000 1.31
@@ -57,6 +57,7 @@
*/
import org.apache.maven.ProjectVerifier;
+import org.apache.maven.MavenException;
import org.apache.maven.build.DescriptorException;
import org.apache.maven.build.ProjectDescriptor;
import org.apache.maven.build.RepositoryManager;
@@ -516,7 +517,6 @@
loadProperties();
initializeProjectDescriptor();
- initializeRepositories();
initializeJelly();
initializeAnt();
@@ -537,33 +537,6 @@
{
this.projectDescriptor = new ProjectDescriptor(getProjectFile());
}
-
- /** Initialize local and remote repositories.
- *
- * @throws MalformedURLException If the local or remote repository
- * URLs are malformed.
- */
- private void initializeRepositories() throws MalformedURLException
- {
- File libRepo = new File(getProperty("maven.repo.local"));
- this.repositoryManager.setLocalRepository(libRepo.toURL().toExternalForm());
-
- String remoteList = getProperty("maven.repo.remote");
-
- if (remoteList != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(remoteList,
- ",");
-
- String eachRepo = null;
-
- while (tokenizer.hasMoreTokens())
- {
- eachRepo = tokenizer.nextToken().trim();
- getRepositoryManager().addRemoteRepository(eachRepo);
- }
- }
- }
/** Initialize Jelly.
*
@@ -1173,8 +1146,21 @@
{
ProjectVerifier verifier = new ProjectVerifier();
- verifier.setMavenRemoteRepo( getProperty( "maven.repo.remote" ) );
- verifier.setMavenLocalRepo( getProperty( "maven.repo.local" ) );
+ String localRepoProp = getProperty( "maven.repo.local" );
+ String remoteRepoProp = getProperty( "maven.repo.remote" );
+
+ if ( localRepoProp == null )
+ {
+ throw new RepoConfigException( "maven.repo.local not set" );
+ }
+
+ if ( remoteRepoProp == null )
+ {
+ throw new RepoConfigException( "maven.repo.remote not set" );
+ }
+
+ verifier.setMavenRemoteRepo( remoteRepoProp );
+ verifier.setMavenLocalRepo( localRepoProp );
verifier.setMavenProject( getProjectDescriptor().getProject() );
verifier.setProject( getAntProject() );
verifier.doExecute();
@@ -1255,6 +1241,8 @@
if (this.cli.hasOption('g'))
{
displayGoals();
+ System.out.println( "" );
+ return;
}
else
{
@@ -1268,6 +1256,13 @@
System.err.println("BUILD FAILED");
System.err.println("Goal \"" + e.getGoalName()
+ "\" does not exist in this project.");
+ }
+ catch (RepoConfigException e)
+ {
+ failed = true;
+ System.err.println( e.getLocalizedMessage() );
+ System.out.println( "" );
+ return;
}
catch (UnattainableGoalException e)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
