From ab0cdac06e1e46b82e555cf9e9c98edd7d114007 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 30 Apr 2004 06:46:41 +0000
Subject: [PATCH] - removed announcement directory as the announcements were
 not up to date and anyway we can generate the same report automatically with
 the announcement plugin - added new maven.multiproject.site.goals property
 containing the goals to execute by multiproject:site

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115087 13f79535-47bb-0310-9956-ffa450edef68
---
 multiproject/announcements/1.0.ann | 24 ------------------------
 multiproject/plugin.jelly          |  4 ++--
 multiproject/plugin.properties     |  8 +++++++-
 multiproject/xdocs/changes.xml     |  6 ++++++
 multiproject/xdocs/properties.xml  | 20 +++++++++++++++++++-
 5 files changed, 34 insertions(+), 28 deletions(-)
 delete mode 100644 multiproject/announcements/1.0.ann

diff --git a/multiproject/announcements/1.0.ann b/multiproject/announcements/1.0.ann
deleted file mode 100644
index bc16330d..00000000
--- a/multiproject/announcements/1.0.ann
+++ /dev/null
@@ -1,24 +0,0 @@
-The Maven team is pleased to announce the Multi-project plugin 1.0 release!
-
-http://maven.apache.org/reference/plugins/multiproject/
-
-The Maven Multi-project plugin is a plugin that helps with building multiple related projects.
-
-Changes in this version:
-o Removed clean from multiproject:site
-o update to velocity 1.4-dev
-o Change from ${basedir}/multiproject/navigation.xml to ${maven.docs.src}/navigation.xml
-  as the nav source for user supplied nav templates
-o Bad j:set tags fixed
-o Made aggregation directory configurable, use artifactId instead of
-  name for creating site directories / URLs.
-o Updated multiproject:site to automate navigation generation for all projects
-o Added multiproject 'install', 'install-snapshot', 'deploy' and 'deploy-snapshot'
-  facility
-o Rename plugin from reactor to multiproject to reduce confusion
-
-You can download the Multi-project plugin here:
-http://www.ibiblio.org/maven/maven/plugins/maven-multiproject-plugin-1.0.jar
-
-Have fun!
-dIon
\ No newline at end of file
diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly
index 21d3c99f..526e9f7e 100644
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +18,6 @@
  */
  -->
 
-
 <project 
   xmlns:j="jelly:core"
   xmlns:maven="jelly:maven"
@@ -95,7 +95,7 @@
         basedir="${maven.multiproject.basedir}"
         banner="Generating site for "
         projectList="${multiprojects}"
-        goals="site"
+        goals="${maven.multiproject.site.goals}"
         ignoreFailures="${maven.multiproject.ignoreFailures}"
       />
       <echo>Now building reactor projects: ${multiprojects}</echo>
diff --git a/multiproject/plugin.properties b/multiproject/plugin.properties
index 62c2df42..a89f40f7 100644
--- a/multiproject/plugin.properties
+++ b/multiproject/plugin.properties
@@ -40,4 +40,10 @@ maven.multiproject.overviewPage.create=true
 maven.multiproject.overviewPage.title=Overview of projects
 maven.multiproject.overviewPage.link=projects-overview
 maven.multiproject.overviewPage.linkTitle=Overview of project
-maven.multiproject.overviewPage.text=
\ No newline at end of file
+maven.multiproject.overviewPage.text=
+
+# Goal to run on each project when executing multiproject:site. This is
+# useful if you need to add additional goals to run. 
+# For example, the dashboard plugin redefined this property to use 
+# "site,dashboard:single-report" instead of the default "site" goal.
+maven.multiproject.site.goals=site
diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml
index d7150c93..5ff83621 100644
--- a/multiproject/xdocs/changes.xml
+++ b/multiproject/xdocs/changes.xml
@@ -22,9 +22,15 @@
   <properties>
     <title>Changes</title>
     <author email="dion@multitask.com.au">dIon Gillard</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
     <release version="1.3-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="add">
+        Added new <code>maven.multiproject.site.goals</code> property which
+        defines the list of goals to be executed by the
+        <code>multiproject:site</code> goal.
+      </action>
       <action dev="brett" type="add">Utilise new reactor parameter "projectList" to avoid reloading projects</action>
     </release>
     <release version="1.2" date="2004-03-07">
diff --git a/multiproject/xdocs/properties.xml b/multiproject/xdocs/properties.xml
index 2466feb6..07287d08 100644
--- a/multiproject/xdocs/properties.xml
+++ b/multiproject/xdocs/properties.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,11 +18,11 @@
  */
  -->
 
-
 <document>
   <properties>
     <title>Maven Multi-Project Plug-in Properties</title>
     <author email="dion@apache.org">dIon Gillard</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
     <section name="Maven Multi-Project Plug-in Settings">
@@ -200,6 +201,23 @@
             </p>
           </td>
         </tr>
+
+        <tr>
+          <td>maven.multiproject.site.goals</td>
+          <td>No</td>
+          <td>
+            <p>
+              Defines the list of goals that should be executed when
+              running <code>multiproject:site</code>. This is useful
+              if you need to run additional goals than <code>site</code> 
+              when generating the site.
+            </p>
+            <p>
+              Default value is <code>site</code>.
+            </p>
+          </td>
+        </tr>
+
       </table>
     </section>
   </body>