You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/01/22 21:52:14 UTC
svn commit: r614319 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven:
DefaultMaven.java lifecycle/DefaultLifecycleExecutor.java
Author: jdcasey
Date: Tue Jan 22 12:52:11 2008
New Revision: 614319
URL: http://svn.apache.org/viewvc?rev=614319&view=rev
Log:
Improve diagnosis when no goals are passed in via the request (the goals List is null, not just empty). This can happen when used via the embedder in a non-cli scenario.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=614319&r1=614318&r2=614319&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Tue Jan 22 12:52:11 2008
@@ -181,23 +181,26 @@
reactorManager,
dispatcher );
- for ( Iterator i = request.getGoals().iterator(); i.hasNext(); )
+ if ( request.getGoals() != null )
{
- String goal = (String) i.next();
-
- if ( goal == null )
+ for ( Iterator i = request.getGoals().iterator(); i.hasNext(); )
{
- i.remove();
- continue;
- }
+ String goal = (String) i.next();
- TaskValidationResult tvr = lifecycleExecutor.isTaskValid( goal, session, reactorManager.getTopLevelProject() );
+ if ( goal == null )
+ {
+ i.remove();
+ continue;
+ }
- if ( !tvr.isTaskValid() )
- {
- result.addException( tvr.generateInvalidTaskException() );
+ TaskValidationResult tvr = lifecycleExecutor.isTaskValid( goal, session, reactorManager.getTopLevelProject() );
+
+ if ( !tvr.isTaskValid() )
+ {
+ result.addException( tvr.generateInvalidTaskException() );
- return result;
+ return result;
+ }
}
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=614319&r1=614318&r2=614319&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Tue Jan 22 12:52:11 2008
@@ -109,7 +109,7 @@
List goals = session.getGoals();
- if ( goals.isEmpty() && ( rootProject != null ) )
+ if ( ( ( goals == null ) || goals.isEmpty() ) && ( rootProject != null ) )
{
String goal = rootProject.getDefaultGoal();
@@ -119,7 +119,7 @@
}
}
- if ( goals.isEmpty() )
+ if ( ( goals == null ) || goals.isEmpty() )
{
throw new NoGoalsSpecifiedException( "\n\nYou must specify at least one goal. Try 'install' to build or mvn -? for other options.\n See http://maven.apache.org for more information.\n\n" );
}