From eabbe63ba0a9232312de344a3ac41cb9a74bf9b2 Mon Sep 17 00:00:00 2001
From: kaz <kaz@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 25 Jan 2003 17:25:24 +0000
Subject: [PATCH] Fixing/cleaning up some of the plugins.

o Removed extraneous <mkdir>s
o Converted to new method of accessing properties


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112743 13f79535-47bb-0310-9956-ffa450edef68
---
 changelog/plugin.jelly          | 1 -
 developer-activity/plugin.jelly | 1 -
 docbook/plugin.jelly            | 6 +++++-
 file-activity/plugin.jelly      | 1 -
 javadoc/plugin.jelly            | 1 -
 license/plugin.jelly            | 7 ++++---
 tasklist/plugin.jelly           | 6 +++++-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/changelog/plugin.jelly b/changelog/plugin.jelly
index e1838c44..aee59af0 100644
--- a/changelog/plugin.jelly
+++ b/changelog/plugin.jelly
@@ -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}"
diff --git a/developer-activity/plugin.jelly b/developer-activity/plugin.jelly
index d12351ef..31d2a776 100644
--- a/developer-activity/plugin.jelly
+++ b/developer-activity/plugin.jelly
@@ -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}"/>
           
           <!--
            |
diff --git a/docbook/plugin.jelly b/docbook/plugin.jelly
index 45ed54fe..3b930c00 100644
--- a/docbook/plugin.jelly
+++ b/docbook/plugin.jelly
@@ -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"
     />
diff --git a/file-activity/plugin.jelly b/file-activity/plugin.jelly
index 751d91a0..61adc53a 100644
--- a/file-activity/plugin.jelly
+++ b/file-activity/plugin.jelly
@@ -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}"/>
           
           <!--
            |
diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index d7a71a15..9cab51b5 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -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>
diff --git a/license/plugin.jelly b/license/plugin.jelly
index 02108014..6bbede6f 100644
--- a/license/plugin.jelly
+++ b/license/plugin.jelly
@@ -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"
       />
diff --git a/tasklist/plugin.jelly b/tasklist/plugin.jelly
index 76870996..81480d2b 100644
--- a/tasklist/plugin.jelly
+++ b/tasklist/plugin.jelly
@@ -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"
       />