svn commit: r696107 - /maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java

[df...@apache.org]

Author: dfabulich
Date: Tue Sep 16 16:58:19 2008
New Revision: 696107

URL: http://svn.apache.org/viewvc?rev=696107&view=rev
Log:
resume was broken because continueFromFolder and continueFromArtifact were both @required.  We want them both to be required so they'll be highlighted on the help page, but we don't actually want them both to be required, so we'll set default values for both of them to highlight their importance.

Modified:
    maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java

Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java?rev=696107&r1=696106&r2=696107&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java Tue Sep 16 16:58:19 2008
@@ -60,14 +60,14 @@
     
     /**
      * The artifact from which we'll resume, e.g. "com.mycompany:foo" or just "foo"
-     * @parameter expression="${fromArtifact}"
+     * @parameter expression="${fromArtifact}" default-value="null"
      * @required
      */
     private String continueFromProject;
     
     /**
      * The project folder from which we'll resume
-     * @parameter expression="${from}"
+     * @parameter expression="${from}" default-value="null"
      * @required
      */
     private File continueFromFolder;
@@ -92,6 +92,14 @@
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
+    	if ( "null".equals( continueFromProject ) )
+    	{
+    	    continueFromProject = null;
+    	}
+    	if ( new File( "null" ).equals( continueFromFolder ) )
+    	{
+    	    continueFromFolder = null;
+    	}
         if ( continueFromFolder == null && continueFromProject == null )
         {
             throw new MojoFailureException("You must specify either a folder or a project with -Dfrom=baz/bar or -DfromArtifact=com.mycompany:foo (groupId is optional)");