You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/04/15 08:16:16 UTC
cvs commit: maven-plugins/multiproject/xdocs changes.xml
brett 2004/04/14 23:16:16
Modified: multiproject plugin.jelly project.xml
multiproject/xdocs changes.xml
Log:
PR: MPMULTIPROJECT-19
cut memory usage by a large percentage
Revision Changes Path
1.37 +33 -22 maven-plugins/multiproject/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/multiproject/plugin.jelly,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- plugin.jelly 4 Mar 2004 18:36:33 -0000 1.36
+++ plugin.jelly 15 Apr 2004 06:16:16 -0000 1.37
@@ -42,26 +42,29 @@
<!--======================================================================-->
<goal name="multiproject:site-init">
- <!-- FIXME: This can't use multiproject:goal as it throws away the projects -->
- <!-- generate site docs -->
- <maven:reactor
- basedir="${maven.multiproject.basedir}"
- banner="Gathering project list"
- includes="${maven.multiproject.includes}"
- excludes="${maven.multiproject.excludes}"
- postProcessing="true"
- ignoreFailures="${maven.multiproject.ignoreFailures}"
- />
-
- <mkdir dir="${maven.gen.docs}"/>
-
- <j:set var="aggregateDir" value="${maven.multiproject.aggregateDir}"/>
- <j:set var="navType" value="${maven.multiproject.navigation}"/>
- <j:set var="overviewPageCreate" value="${maven.multiproject.overviewPage.create}"/>
- <j:set var="overviewPageTitle" value="${maven.multiproject.overviewPage.title}"/>
- <j:set var="overviewPageLink" value="${maven.multiproject.overviewPage.link}"/>
- <j:set var="overviewPageLinkTitle" value="${maven.multiproject.overviewPage.linkTitle}"/>
- <j:set var="overviewPageText" value="${maven.multiproject.overviewPage.text}"/>
+ <j:if test="${mpsiteInit == null}">
+ <j:set var="mpsiteInit" value="true" />
+ <!-- generate site docs -->
+ <ant:echo>Gathering project list</ant:echo>
+ <maven:reactor
+ basedir="${maven.multiproject.basedir}"
+ banner="Gathering project list"
+ includes="${maven.multiproject.includes}"
+ excludes="${maven.multiproject.excludes}"
+ postProcessing="true"
+ ignoreFailures="${maven.multiproject.ignoreFailures}"
+ />
+
+ <mkdir dir="${maven.gen.docs}"/>
+
+ <j:set var="aggregateDir" value="${maven.multiproject.aggregateDir}"/>
+ <j:set var="navType" value="${maven.multiproject.navigation}"/>
+ <j:set var="overviewPageCreate" value="${maven.multiproject.overviewPage.create}"/>
+ <j:set var="overviewPageTitle" value="${maven.multiproject.overviewPage.title}"/>
+ <j:set var="overviewPageLink" value="${maven.multiproject.overviewPage.link}"/>
+ <j:set var="overviewPageLinkTitle" value="${maven.multiproject.overviewPage.linkTitle}"/>
+ <j:set var="overviewPageText" value="${maven.multiproject.overviewPage.text}"/>
+ </j:if>
</goal>
@@ -69,6 +72,7 @@
<!-- Builds sites for all subprojects -->
<!--==================================================================-->
<goal name="multiproject:site"
+ prereqs="multiproject:site-init"
description="Run the site goal of all subprojects">
<attainGoal name="multiproject:create-nav"/>
@@ -79,17 +83,24 @@
<!-- 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 "
+ projectList="${reactorProjects}"
+ goals="site"
+ ignoreFailures="${maven.multiproject.ignoreFailures}"
+ />
+
+ <!-- TODO: remove <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}">
1.20 +2 -2 maven-plugins/multiproject/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/multiproject/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 10 Apr 2004 00:59:24 -0000 1.19
+++ project.xml 15 Apr 2004 06:16:16 -0000 1.20
@@ -22,8 +22,8 @@
<extend>../project.xml</extend>
<id>maven-multiproject-plugin</id>
<name>Maven Multi-Project Plug-in</name>
- <currentVersion>1.2</currentVersion>
- <description>A plugin to handle the building of multiple projects within maven</description>
+ <currentVersion>1.3-SNAPSHOT</currentVersion>
+ <description>A plugin to handle the building of multiple projects within maven. Requires Maven 1.0 RC3</description>
<shortDescription>Multi-Project Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/multiproject/</url>
<issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10322</issueTrackingUrl>
1.15 +3 -0 maven-plugins/multiproject/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/multiproject/xdocs/changes.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- changes.xml 7 Mar 2004 01:15:59 -0000 1.14
+++ changes.xml 15 Apr 2004 06:16:16 -0000 1.15
@@ -24,6 +24,9 @@
<author email="dion@multitask.com.au">dIon Gillard</author>
</properties>
<body>
+ <release version="1.3-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="add">Utilise new reactor parameter "projectList" to avoid reloading projects</action>
+ </release>
<release version="1.2" date="2004-03-07">
<action dev="evenisse" type="fix">Fix dependency convergence page when project have no dependency.</action>
<action dev="dion" type="fix">Fix for MAVEN-887</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org