From d8f6543a416ce39cf3110fab622e4b1c13f3a885 Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 20 Sep 2005 17:06:37 +0000
Subject: [PATCH] MPMULTIPROJECT-49: Use a different variable for running
 multiproject:goal internally so it does not interfer with the command line
 -Dgoal option.

Note that this does not solve MPMULTIPROJECT-60 nor MAVEN-1691.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@290486 13f79535-47bb-0310-9956-ffa450edef68
---
 multiproject/plugin.jelly | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly
index 45eea836..574a945f 100644
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -44,7 +44,6 @@
 
   <!--======================================================================-->
   <!-- Runs reactor and puts variable "multiprojects" into jelly context.   -->
-  <!-- Runs reactor and puts variable "multiprojects" into jelly context.   -->
   <!-- This allows to share the work done by reactor in goals               -->
   <!-- which just need the list of project but don't need to run any goal   -->
   <!--======================================================================-->    
@@ -204,18 +203,29 @@
   <goal name="multiproject:goal" 
         prereqs="multiproject:projects-init"
         description="Run a given goal on all projects">
-        
-      <maven:param-check value="${goal}" fail="true">
+
+      <j:choose>
+        <j:when test="${!empty(internalGoal)}">
+            <j:set var="runGoal" value="${internalGoal}"/>
+        </j:when>
+        <j:otherwise>
+            <maven:param-check value="${goal}" fail="true">
 A goal to run must be specified, e.g.
 maven -Dgoal=clean multiproject:goal</maven:param-check>
+            <j:set var="runGoal" value="${goal}"/>
+        </j:otherwise>
+      </j:choose>
 
       <maven:reactor
         basedir="${maven.multiproject.basedir}"
-        banner="Executing ${goal}"
+        banner="Executing ${runGoal}"
         projectList="${multiprojects}"
-        goals="${goal}"
-        ignoreFailures="${maven.multiproject.ignoreFailures}"
-      />
+        goals="${runGoal}"
+        ignoreFailures="${maven.multiproject.ignoreFailures}"/>
+
+      <j:remove var="internalGoal"/>
+      <j:remove var="runGoal"/>
+
   </goal> 
   
   <!--==================================================================-->
@@ -224,7 +234,7 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
   <goal name="multiproject:artifact"
         description=" Builds all artifacts for all subproject">
 
-    <j:set var="goal" value="multiproject:artifact-callback"/>
+    <j:set var="internalGoal" value="multiproject:artifact-callback"/>
     <attainGoal name="multiproject:goal"/>
 
   </goal>
@@ -242,7 +252,7 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
   <goal name="multiproject:install"
         description="Run 'artifact':install for all subprojects">
 
-    <j:set var="goal" value="multiproject:install-callback"/>
+    <j:set var="internalGoal" value="multiproject:install-callback"/>
     <attainGoal name="multiproject:goal"/>
     
   </goal>
@@ -262,7 +272,7 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
   <goal name="multiproject:install-snapshot"
         description="Run 'artifact':install-snapshot for all subprojects">
 
-    <j:set var="goal" value="multiproject:install-snapshot-callback"/>
+    <j:set var="internalGoal" value="multiproject:install-snapshot-callback"/>
     <attainGoal name="multiproject:goal"/>
   </goal>
   
@@ -281,7 +291,7 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
    <goal name="multiproject:deploy"
          description="Run 'artifact':deploy for all subprojects">
 
-    <j:set var="goal" value="multiproject:deploy-callback"/>
+    <j:set var="internalGoal" value="multiproject:deploy-callback"/>
     <attainGoal name="multiproject:goal"/>
   </goal>
   
@@ -300,7 +310,7 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
   <goal name="multiproject:deploy-snapshot"
         description="Run 'artifact':deploy-snapshot for all subprojects">
 
-    <j:set var="goal" value="multiproject:deploy-snapshot-callback"/>
+    <j:set var="internalGoal" value="multiproject:deploy-snapshot-callback"/>
     <attainGoal name="multiproject:goal"/>
   </goal>
   
@@ -373,7 +383,7 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
   <goal name="multiproject:clean"
     description="Clean all subprojects">
 
-    <j:set var="goal" value="clean:clean"/>
+    <j:set var="internalGoal" value="clean:clean"/>
     <attainGoal name="multiproject:goal"/>
     
   </goal>