dion 2003/07/20 18:13:52
Modified: src/plugins-build/multiproject/xdocs properties.xml
changes.xml
src/plugins-build/multiproject plugin.properties
plugin.jelly
src/plugins-build/multiproject/src/plugin-resources/templates
navigation-aggregate.xml
Log:
Apply fixes for MAVEN-584 and MAVEN-574.
Thanks Rafal!!
Revision Changes Path
1.5 +18 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- properties.xml 18 Jul 2003 00:39:18 -0000 1.4
+++ properties.xml 21 Jul 2003 01:13:52 -0000 1.5
@@ -14,6 +14,21 @@
<th>Description</th>
</tr>
<tr>
+ <td>maven.multiproject.aggregateDir</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ This property tells the plugin where the aggreagate sites should be
copied to.
+ </p>
+ <p>
+ The value is "multiproject/" by default, but you can change it to
"projects/"
+ or "modules/" if you like. Please notice the required trailing slash.
+ Another option is to set this property to an empty string, which will
tell
+ the plugin to place the sites in the root directory of the
aggregating site.
+ </p>
+ </td>
+ </tr>
+ <tr>
<td>maven.multiproject.basedir</td>
<td>Yes</td>
<td>
@@ -83,8 +98,8 @@
</p>
<p>
If the property is set to <code>aggregate</code> a navigation menu is
generated with each
- project's name linking to
<code>/multiproject/${project.name}/index.html</code>. At the completion of
- the <a href="goals.html">multiproject:site</a> goal, each project's
generated site is copied into
+ project's name linking to
<code>/${maven.multiproject.aggregateDir}${project.name}/index.html</code>.
+ At the completion of the <a href="goals.html">multiproject:site</a>
goal, each project's generated site is copied into
the appropriate directory. e.g. if WebProject1 and JarProject2 are
the names of projects
processed via <code>multiproject:site</code>, the project that is
executing
<code>multiproject:site</code> will have the generated sites from
@@ -123,4 +138,4 @@
</table>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
1.4 +4 -0 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 4 Jul 2003 05:03:34 -0000 1.3
+++ changes.xml 21 Jul 2003 01:13:52 -0000 1.4
@@ -7,6 +7,10 @@
<body>
<release version="1.0" date="in CVS">
+ <action dev="rafal" type="update">
+ Made aggregation directory configurable, use artifactId instead of
+ name for creating site directories / URLs.
+ </action>
<action dev="dion" type="update">
Updated multiproject:site to automate navigation generation for all projects
</action>
1.5 +4 -1 maven/src/plugins-build/multiproject/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 5 Jul 2003 08:40:38 -0000 1.4
+++ plugin.properties 21 Jul 2003 01:13:52 -0000 1.5
@@ -13,4 +13,7 @@
# Valid values are: "aggregate" or "independent".
maven.multiproject.navigation=aggregate
-maven.multiproject.type=jar
\ No newline at end of file
+maven.multiproject.type=jar
+
+# directory under target/docs where aggregated sites are copied to
+maven.multiproject.aggregateDir=multiproject/
1.14 +8 -1 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 18 Jul 2003 01:08:05 -0000 1.13
+++ plugin.jelly 21 Jul 2003 01:13:52 -0000 1.14
@@ -50,7 +50,7 @@
<!-- 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 -->
- <j:set var="directory"
value="${maven.docs.dest}/multiproject/${reactorProject.name}"/>
+ <j:set var="directory"
value="${maven.docs.dest}/${maven.multiproject.aggregateDir}${reactorProject.artifactId}"/>
<mkdir dir="${directory}"/>
<!--
${reactorProject.name} has docs directory
@@ -84,8 +84,15 @@
postProcessing="true"
ignoreFailures="true"
/>
+
+ <j:forEach var="reactorProject" items="${reactorProjects}">
+ <j:if test="${reactorProject.id == pom.id}">
+ <fail message="You must exclude ${pom.id} (the top level project) from the
subproject set"/>
+ </j:if>
+ </j:forEach>
<!-- generate navbar for project based on aggregate or independent -->
+ <j:set var="aggregateDir" value="${maven.multiproject.aggregateDir}"/>
<j:set var="navType" value="${maven.multiproject.navigation}"/>
<j:if test="${navType != ''}">
<echo>Producing ${navType} navigation...</echo>
1.2 +1 -1
maven/src/plugins-build/multiproject/src/plugin-resources/templates/navigation-aggregate.xml
Index: navigation-aggregate.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/multiproject/src/plugin-resources/templates/navigation-aggregate.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation-aggregate.xml 4 Jul 2003 04:42:27 -0000 1.1
+++ navigation-aggregate.xml 21 Jul 2003 01:13:52 -0000 1.2
@@ -7,7 +7,7 @@
<body>
<menu name="Projects">
#foreach ($reactorProject in $reactorProjects)
- <item name="$reactorProject.name"
href="/multiproject/${reactorProject.name}/index.html"/>
+ <item name="$reactorProject.name"
href="/${aggregateDir}${reactorProject.artifactId}/index.html"/>
#end
</menu>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
