jvanzyl 2002/06/27 16:24:10
Modified: src/templates/build/plugins/core plugin.jelly
src/templates/build/plugins/xdoc plugin.jelly
Added: src/templates/build/plugins/xdoc toolbox.props
Log:
Adding unitTestSources flag to the mix.
Revision Changes Path
1.11 +5 -0
jakarta-turbine-maven/src/templates/build/plugins/core/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 27 Jun 2002 21:42:53 -0000 1.10
+++ plugin.jelly 27 Jun 2002 23:24:09 -0000 1.11
@@ -33,6 +33,11 @@
file="${pom.build.sourceDirectory}"
/>
+ <available
+ property="unitTestSourcesPresent"
+ file="${pom.build.unitTestSourceDirectory}"
+ />
+
<!-- ================================================================== -->
<!-- prepare-filesystem -->
<!-- ================================================================== -->
1.5 +7 -11
jakarta-turbine-maven/src/templates/build/plugins/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/xdoc/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 27 Jun 2002 18:41:52 -0000 1.4
+++ plugin.jelly 27 Jun 2002 23:24:10 -0000 1.5
@@ -3,7 +3,7 @@
<project xmlns:j="jelly:core">
<goal
- name="docs"
+ name="docsx"
prereqs="generate-xdocs, docs:site"
description="Generate html project documentation xdoc sources">
</goal>
@@ -52,7 +52,7 @@
destdir="${maven.docs.dest}/"
extension=".html"
force="true"
- toolboxfile="${maven.home}/stylesheets/toolbox.props"
+ toolboxfile="${maven.home}/plugins/xdoc/toolbox.props"
style="${maven.home}/plugins/xdoc/site.dvsl"
excludes="**/project.xml,**/template.xml"
includes="**/*.xml"
@@ -64,8 +64,8 @@
<tool name="toolbox.string.docSrc" value="${maven.docs.src}"/>
<tool name="toolbox.string.genDoc" value="${maven.gen.docs}"/>
<tool name="toolbox.string.srcDir" value="${maven.src.dir}"/>
- <tool name="toolbox.string.srcPresent" value="${maven.sourcesPresent}"/>
- <tool name="toolbox.string.testSrcPresent"
value="${maven.unitTestSourcesPresent}"/>
+ <tool name="toolbox.string.srcPresent" value="${sourcesPresent}"/>
+ <tool name="toolbox.string.testSrcPresent" value="${unitTestSourcesPresent}"/>
<tool name="toolbox.string.currentYear" value="${maven.current.year}"/>
</dvsl>
@@ -75,23 +75,19 @@
destdir="${maven.docs.dest}/"
extension=".html"
force="true"
- toolboxfile="${maven.home}/stylesheets/toolbox.props"
+ toolboxfile="${maven.home}/plugins/xdoc/toolbox.props"
style="${maven.home}/plugins/xdoc/site.dvsl"
excludes="**/project.xml,**/template.xml"
includes="**/*.xml"
outputencoding="${maven.docs.outputencoding}">
<!-- Need to add the maven jar to load the toolbox -->
-
- <!--
<classpath refid="maven-classpath"/>
- -->
-
<tool name="toolbox.string.basedir" value="${basedir}"/>
<tool name="toolbox.string.docSrc" value="${maven.docs.src}"/>
<tool name="toolbox.string.srcDir" value="${maven.src.dir}"/>
<tool name="toolbox.string.genDoc" value="${maven.gen.docs}"/>
- <tool name="toolbox.string.srcPresent" value="${maven.sourcesPresent}"/>
- <tool name="toolbox.string.testSrcPresent"
value="${maven.unitTestSourcesPresent}"/>
+ <tool name="toolbox.string.srcPresent" value="${sourcesPresent}"/>
+ <tool name="toolbox.string.testSrcPresent" value="${unitTestSourcesPresent}"/>
<tool name="toolbox.string.currentYear" value="${maven.current.year}"/>
</dvsl>
1.1
jakarta-turbine-maven/src/templates/build/plugins/xdoc/toolbox.props
Index: toolbox.props
===================================================================
toolbox.contextname = toolbox
toolbox.tool.htmlescape = org.apache.velocity.anakia.Escape
toolbox.tool.numbers = java.text.DecimalFormat
toolbox.tool.fileutil = org.apache.velocity.texen.util.FileUtil
toolbox.tool.strings = org.apache.commons.lang.Strings
toolbox.tool.formatter = org.apache.maven.DVSLFormatter
toolbox.tool.pathtool = org.apache.maven.DVSLPathTool
toolbox.tool.maven = org.apache.maven.MavenTool
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
