dion 2003/10/08 08:34:40
Modified: src/plugins-build/multiproject/xdocs goals.xml
navigation.xml properties.xml changes.xml
src/plugins-build/multiproject project.xml plugin.jelly
Removed: src/plugins-build/multiproject/xdocs/current properties.xml
index.xml changes.xml goals.xml faq.fml
Log:
Only run sub projects site goal if nav type is aggregate. Otherwise it's not
necessary
Revision Changes Path
1.9 +2 -2 maven/src/plugins-build/multiproject/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/xdocs/goals.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- goals.xml 4 Sep 2003 00:40:10 -0000 1.8
+++ goals.xml 8 Oct 2003 15:34:40 -0000 1.9
@@ -24,14 +24,14 @@
<goal>
<name>multiproject:deploy</name>
<description>
- Run <code>'artifact':deploy</code> goal for all projects.
+ Run <code>'artifact':install-snapshot</code> goal for all projects.
</description>
</goal>
<goal>
<name>multiproject:deploy-snapshot</name>
<description>
- Run <code>'artifact':deploy-snapshot</code> goal for all projects.
+ Run <code>'artifact':install-snapshot</code> goal for all projects.
</description>
</goal>
1.5 +0 -1 maven/src/plugins-build/multiproject/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/xdocs/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 28 Aug 2003 07:30:05 -0000 1.4
+++ navigation.xml 8 Oct 2003 15:34:40 -0000 1.5
@@ -17,7 +17,6 @@
href="http://www.ibiblio.org/maven/maven/plugins/maven-multiproject-plugin-1.0.jar"/>
</menu>
<menu name="Versions">
- <item name="Current" href="current/index.html"/>
<item name="Release 1.0" href="releases/v1.0/index.html"/>
</menu>
</body>
1.6 +47 -0 maven/src/plugins-build/multiproject/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/xdocs/properties.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- properties.xml 21 Jul 2003 01:13:52 -0000 1.5
+++ properties.xml 8 Oct 2003 15:34:40 -0000 1.6
@@ -112,6 +112,53 @@
</p>
</td>
</tr>
+
+ <!-- overview page properties -->
+ <tr>
+ <td>maven.multiproject.overviewPage.create</td>
+ <td>Yes</td>
+ <td>
+ Whether a summary of the projects processed should be created.
+ Defaults to true
+ </td>
+ </tr>
+
+ <tr>
+ <td>maven.multiproject.overviewPage.title</td>
+ <td>Yes</td>
+ <td>
+ Title of the overview page.
+ Defaults to <code>Overview of projects</code>.
+ </td>
+ </tr>
+
+ <tr>
+ <td>maven.multiproject.overviewPage.link</td>
+ <td>Yes</td>
+ <td>
+ Name of the .xml file to be created for the overview page.
+ Defaults to <code>project-overview</code>.
+ </td>
+ </tr>
+
+ <tr>
+ <td>maven.multiproject.overviewPage.linkTitle</td>
+ <td>Yes</td>
+ <td>
+ Title of the link to the overview page.
+ Defaults to <code>Overview of project</code>.
+ </td>
+ </tr>
+
+ <tr>
+ <td>maven.multiproject.overviewPage.text</td>
+ <td>Yes</td>
+ <td>
+ Text to go at the start of the overview page
+ Defaults to blank.
+ </td>
+ </tr>
+
<tr>
<td>maven.multiproject.type</td>
<td>No</td>
1.10 +9 -6 maven/src/plugins-build/multiproject/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/xdocs/changes.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- changes.xml 29 Sep 2003 19:22:56 -0000 1.9
+++ changes.xml 8 Oct 2003 15:34:40 -0000 1.10
@@ -6,16 +6,19 @@
</properties>
<body>
- <release version="1.2" date="In CVS">
- <action dev="evenisse" type="fix">
- Fix MAVEN-866. Fix encoding.
+ <release version="1.2" date="in CVS">
+ <action dev="dion" type="fix">
+ Only run all sub projects 'site' goal on multiproject site if navigation
type is aggregate.
+ Otherwise the info is not needed (i.e. independent).
</action>
</release>
+
<release version="1.1" date="2003-09-29">
- <action dev="evenisse" type="fix" due-to="Andy Jefferson">
- Fix MAVEN-782.
- </action>
+ <action dev="dion" type="update">Update docs on overview page</action>
+ <action dev="dion" type="update">set maven.xdoc.version to 1.0 for the
site</action>
+ <action dev="dion" type="update">update to use
maven.docs.*/maven.gen.docs</action>
</release>
+
<release version="1.0" date="2003-08-28">
<action dev="dion" type="update">
update to velocity 1.4-dev
1.14 +5 -0 maven/src/plugins-build/multiproject/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 29 Sep 2003 19:22:56 -0000 1.13
+++ project.xml 8 Oct 2003 15:34:40 -0000 1.14
@@ -22,6 +22,11 @@
<version>
<id>1.1</id>
<name>1.1</name>
+ <tag>MAVEN_1_0_RC1</tag>
+ </version>
+ <version>
+ <id>1.2</id>
+ <name>1.2</name>
<tag>HEAD</tag>
</version>
</versions>
1.33 +12 -12 maven/src/plugins-build/multiproject/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/plugin.jelly,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plugin.jelly 29 Sep 2003 19:22:56 -0000 1.32
+++ plugin.jelly 8 Oct 2003 15:34:40 -0000 1.33
@@ -56,23 +56,23 @@
<attainGoal name="multiproject:create-nav"/>
<attainGoal name="multiproject:create-overview-page"/>
- <!-- FIXME: This can't use multiproject:goal as it throws away the projects -->
- <!-- generate site docs -->
- <maven:reactor
- basedir="${maven.multiproject.basedir}"
- banner="Generating site for "
- includes="${maven.multiproject.includes}"
- excludes="${maven.multiproject.excludes}"
- postProcessing="true"
- goals="site"
- ignoreFailures="${maven.multiproject.ignoreFailures}"
- />
-
<attainGoal name="site" />
<!-- copy or not? -->
<j:set var="navType" value="${maven.multiproject.navigation}"/>
<j:if test="${navType == 'aggregate'}">
+ <!-- FIXME: This can't use multiproject:goal as it throws away the projects
-->
+ <!-- generate site docs -->
+ <maven:reactor
+ basedir="${maven.multiproject.basedir}"
+ banner="Generating site for "
+ includes="${maven.multiproject.includes}"
+ excludes="${maven.multiproject.excludes}"
+ postProcessing="true"
+ goals="site"
+ ignoreFailures="${maven.multiproject.ignoreFailures}"
+ />
+
<!-- copy each project over into ${maven.docs.dest} -->
<j:forEach var="reactorProject" items="${reactorProjects}">
<!-- note this is the same name as is generated in the
navigation-aggregate.xml -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
