You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ka...@apache.org on 2003/01/25 18:25:25 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/tasklist plugin.jelly
kaz 2003/01/25 09:25:24
Modified: src/plugins-build/changelog plugin.jelly
src/plugins-build/developer-activity plugin.jelly
src/plugins-build/docbook plugin.jelly
src/plugins-build/file-activity plugin.jelly
src/plugins-build/javadoc plugin.jelly
src/plugins-build/license plugin.jelly
src/plugins-build/tasklist plugin.jelly
Log:
Fixing/cleaning up some of the plugins.
o Removed extraneous <mkdir>s
o Converted to new method of accessing properties
Revision Changes Path
1.2 +0 -1 jakarta-turbine-maven/src/plugins-build/changelog/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/changelog/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:44:50 -0000 1.1
+++ plugin.jelly 25 Jan 2003 17:25:24 -0000 1.2
@@ -30,7 +30,6 @@
<j:set var="_connection">${pom.repository.connection}</j:set>
<j:if test="${!empty(_connection)}">
<echo>Generating the changelog report</echo>
- <mkdir dir="${maven.gen.docs}"/>
<changelog:changelog
basedir="${basedir}"
1.2 +0 -1 jakarta-turbine-maven/src/plugins-build/developer-activity/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/developer-activity/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:46:27 -0000 1.1
+++ plugin.jelly 25 Jan 2003 17:25:24 -0000 1.2
@@ -22,7 +22,6 @@
<j:set var="_connection">${pom.repository.connection}</j:set>
<j:if test="${!empty(_connection)}">
<echo>Generating the developer activity report</echo>
- <mkdir dir="${maven.gen.docs}"/>
<!--
|
1.2 +5 -1 jakarta-turbine-maven/src/plugins-build/docbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/docbook/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:45:07 -0000 1.1
+++ plugin.jelly 25 Jan 2003 17:25:24 -0000 1.2
@@ -7,12 +7,16 @@
<!-- ================================================================== -->
<goal
name="docbook:transform"
+ prereqs="xdoc:init"
description="Transform any docbook-simple source into xdocs for later use">
+ <j:set var="genDocs"
+ value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+
${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
<style
basedir="${maven.src.docbook.simple}"
- destdir="${maven.gen.docs}" extension=".xml"
+ destdir="${genDocs}" extension=".xml"
style="${plugin.resources}/docbook2document.xsl"
includes="**/*.xml, **/*.sgml"
/>
1.2 +0 -1 jakarta-turbine-maven/src/plugins-build/file-activity/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/file-activity/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:46:27 -0000 1.1
+++ plugin.jelly 25 Jan 2003 17:25:24 -0000 1.2
@@ -31,7 +31,6 @@
<j:set var="_connection">${pom.repository.connection}</j:set>
<j:if test="${!empty(_connection)}">
<echo>Generating the file activity report</echo>
- <mkdir dir="${maven.gen.docs}"/>
<!--
|
1.4 +0 -1 jakarta-turbine-maven/src/plugins-build/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/javadoc/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 25 Jan 2003 16:42:51 -0000 1.3
+++ plugin.jelly 25 Jan 2003 17:25:24 -0000 1.4
@@ -20,7 +20,6 @@
<j:if test="${sourcesPresent == 'true'}">
<mkdir dir="${maven.javadoc.destdir}"/>
- <mkdir dir="${maven.gen.docs}" />
<!-- Get the year to display in the Javadocs -->
<tstamp>
1.2 +4 -3 jakarta-turbine-maven/src/plugins-build/license/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/license/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:45:45 -0000 1.1
+++ plugin.jelly 25 Jan 2003 17:25:24 -0000 1.2
@@ -21,11 +21,12 @@
<goal
name="license:transfer"
+ prereqs="xdoc:init"
description="Generate a xml file from your license.txt">
- <mkdir dir="${maven.gen.docs}"/>
-
<j:set var="licenseX" value='${maven.license.licenseFile}X'/>
+ <j:set var="genDocs"
+ value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
<j:choose>
<j:when test="${licenseX != 'X'}">
@@ -39,7 +40,7 @@
<license:license
description="Project License"
input="${licenseFile}"
- output="${maven.gen.docs}/license.xml"
+ output="${genDocs}/license.xml"
outputEncoding="${maven.docs.outputencoding}"
title="License"
/>
1.2 +5 -1 jakarta-turbine-maven/src/plugins-build/tasklist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/tasklist/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:46:22 -0000 1.1
+++ plugin.jelly 25 Jan 2003 17:25:24 -0000 1.2
@@ -12,15 +12,19 @@
<goal
name="maven-tasklist-plugin:report"
+ prereqs="xdoc:init"
description="Generate a list of tasks from @todo tags in your code">
+ <j:set var="genDocs"
+ value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+
<j:if test="${sourcesPresent == 'true'}">
<echo>Generating tasklist ...</echo>
<vdoclet:vdoclet
srcDir="${pom.build.sourceDirectory}"
- destDir="${maven.gen.docs}"
+ destDir="${genDocs}"
template="plugin-resources/templates/tasklist.vm"
outputFile="task-list.xml"
/>