dion 2003/07/20 20:28:46
Modified: src/plugins-build/multiproject plugin.jelly
Log:
Fix j:set bug
Use ${maven.docs.src}/navigation.xml instead of
${basedir}/multiproject/navigation.xml
for user provided nav
Revision Changes Path
1.16 +12 -8 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 21 Jul 2003 01:18:16 -0000 1.15
+++ plugin.jelly 21 Jul 2003 03:28:46 -0000 1.16
@@ -102,14 +102,18 @@
template="navigation-${navType}.xml"/>
</j:if>
- <!-- FIXME - this should just use the default in maven.docs.src -->
- <util:file var="userNavTemplate" name="${basedir}/multiproject/navigation.xml"/>
+ <j:set var="maven.docs.src"
+
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}/navigation.xml"
/>
+ <j:set var="userNav" value="${maven.docs.src}/navigation.xml" />
+
+ <!-- FIXME: Will the xdoc stuff screw this up?? -->
+ <util:file var="userNavTemplate" name="${userNav}"/>
<j:if test="${userNavTemplate.exists()}">
<echo>Producing user supplied navigation...</echo>
<velocity:merge
name="${maven.gen.docs}/navigation.xml"
- basedir="${basedir}/multiproject"
+ basedir="${maven.docs.src}"
template="navigation.xml"/>
</j:if>
@@ -140,7 +144,7 @@
<goal name="multiproject:artifact"
description=" Builds all artifacts for all subproject">
- <j:set var="goal" name="multiproject:artifact-callback"/>
+ <j:set var="goal" value="multiproject:artifact-callback"/>
<attainGoal name="multiproject:goal"/>
</goal>
@@ -156,7 +160,7 @@
<goal name="multiproject:install"
description="Run 'artifact':install for all subprojects">
- <j:set var="goal" name="multiproject:install-callback"/>
+ <j:set var="goal" value="multiproject:install-callback"/>
<attainGoal name="multiproject:goal"/>
</goal>
@@ -170,7 +174,7 @@
<goal name="multiproject:install-snapshot"
description="Run 'artifact':install-snapshot for all subprojects">
- <j:set var="goal" name="multiproject:install-snapshot-callback"/>
+ <j:set var="goal" value="multiproject:install-snapshot-callback"/>
<attainGoal name="multiproject:goal"/>
</goal>
@@ -184,7 +188,7 @@
<goal name="multiproject:deploy"
description="Run 'artifact':deploy for all subprojects">
- <j:set var="goal" name="multiproject:deploy-callback"/>
+ <j:set var="goal" value="multiproject:deploy-callback"/>
<attainGoal name="multiproject:goal"/>
</goal>
@@ -198,7 +202,7 @@
<goal name="multiproject:deploy-snapshot"
description="Run 'artifact':deploy-snapshot for all subprojects">
- <j:set var="goal" name="multiproject:deploy-snapshot-callback"/>
+ <j:set var="goal" value="multiproject:deploy-snapshot-callback"/>
<attainGoal name="multiproject:goal"/>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
