From 1d6c924c9d1dd7cb044130966251214c7764ce64 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 29 Aug 2003 06:27:54 +0000
Subject: [PATCH] MAVEN-548. Move common reporting properties to defaults

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113899 13f79535-47bb-0310-9956-ffa450edef68
---
 ashkelon/plugin.jelly                  |  2 --
 ashkelon/project.xml                   |  2 +-
 ashkelon/xdocs/changes.xml             | 16 ++++++++++++++++
 changes/plugin.jelly                   |  6 ------
 changes/xdocs/changes.xml              |  3 +++
 checkstyle/plugin.jelly                |  2 --
 checkstyle/xdocs/changes.xml           |  3 +++
 clover/plugin.jelly                    |  4 +---
 clover/xdocs/changes.xml               |  3 +++
 dist/plugin.jelly                      |  3 +--
 dist/xdocs/changes.xml                 |  3 +++
 docbook/plugin.jelly                   |  3 +--
 docbook/xdocs/changes.xml              |  3 +++
 faq/plugin.jelly                       |  2 +-
 faq/project.xml                        |  2 +-
 faq/xdocs/changes.xml                  | 16 ++++++++++++++++
 javadoc/plugin.jelly                   |  2 +-
 javadoc/plugin.properties              |  2 +-
 javadoc/xdocs/changes.xml              |  3 +++
 jdiff/plugin.jelly                     |  3 +--
 jdiff/project.xml                      |  2 +-
 jdiff/xdocs/changes.xml                | 15 +++++++++++++++
 jellydoc/plugin.jelly                  |  3 +--
 jellydoc/xdocs/changes.xml             |  1 +
 jxr/plugin.properties                  |  4 ++--
 jxr/xdocs/changes.xml                  |  1 +
 license/plugin.jelly                   |  3 +--
 license/xdocs/changes.xml              |  1 +
 linkcheck/plugin.jelly                 |  2 +-
 linkcheck/xdocs/changes.xml            |  1 +
 multiproject/plugin.jelly              |  7 -------
 multiproject/xdocs/current/changes.xml |  1 +
 pdf/plugin.jelly                       |  6 ++----
 pdf/project.xml                        |  2 +-
 pdf/xdocs/changes.xml                  |  6 +++++-
 site/plugin.jelly                      |  3 +--
 site/xdocs/changes.xml                 |  1 +
 statcvs/plugin.jelly                   |  1 -
 statcvs/xdocs/changes.xml              |  1 +
 tasklist/plugin.jelly                  |  6 ++----
 tasklist/xdocs/changes.xml             |  1 +
 word2html/plugin.jelly                 |  3 +--
 word2html/xdocs/current/changes.xml    |  4 ++++
 xdoc/plugin.jelly                      | 12 +++---------
 xdoc/plugin.properties                 |  6 ------
 xdoc/xdocs/changes.xml                 |  3 +++
 46 files changed, 110 insertions(+), 69 deletions(-)
 create mode 100644 ashkelon/xdocs/changes.xml
 create mode 100644 faq/xdocs/changes.xml
 create mode 100644 jdiff/xdocs/changes.xml

diff --git a/ashkelon/plugin.jelly b/ashkelon/plugin.jelly
index 0fc759d9..89396433 100644
--- a/ashkelon/plugin.jelly
+++ b/ashkelon/plugin.jelly
@@ -9,8 +9,6 @@
   
   <ant:property name="maven.linkcheck.cache" 
     value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.linkcheck.cache')}"/>
-  <ant:property name="maven.gen.docs" 
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
   
   <goal name="maven-ashkelon-plugin:register">
     <doc:registerReport 
diff --git a/ashkelon/project.xml b/ashkelon/project.xml
index a2ccd358..9e5396bb 100644
--- a/ashkelon/project.xml
+++ b/ashkelon/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-ashkelon-plugin</id>
   <name>Maven Ashkelon Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ashkelon/</url>
diff --git a/ashkelon/xdocs/changes.xml b/ashkelon/xdocs/changes.xml
new file mode 100644
index 00000000..fd778bf4
--- /dev/null
+++ b/ashkelon/xdocs/changes.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="jason@zenplex.com">Jason van Zyl</author>
+  </properties>
+
+  <body>
+    <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
+    </release>
+  </body>
+</document>
+
diff --git a/changes/plugin.jelly b/changes/plugin.jelly
index 79c21b7d..a4d5cd0c 100644
--- a/changes/plugin.jelly
+++ b/changes/plugin.jelly
@@ -8,8 +8,6 @@
   xmlns:doc="doc">
 
   <goal name="maven-changes-plugin:register">
-    <ant:property name="maven.docs.src"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
     <util:file var="changes" name="${maven.docs.src}/changes.xml"/>
     <j:if test="${changes.exists()}">
       <doc:registerReport 
@@ -31,10 +29,6 @@
   <goal
     name="changes:report"
     description="Generate a changes report">
-  <j:set var="maven.docs.src"
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
-  <j:set var="maven.docs.outputencoding"
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
 
   <doc:jsl
         input="${maven.docs.src}/changes.xml"
diff --git a/changes/xdocs/changes.xml b/changes/xdocs/changes.xml
index 1499948c..7286bc8f 100644
--- a/changes/xdocs/changes.xml
+++ b/changes/xdocs/changes.xml
@@ -7,6 +7,9 @@
 
   <body>
     <release version="1.2" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
       <action dev="evenisse" type="add">
         <a href="http://jira.codehaus.org/ViewIssue.jspa?key=MAVEN-587">Maven-587</a>.
         Add index table of release.
diff --git a/checkstyle/plugin.jelly b/checkstyle/plugin.jelly
index 4b5467c7..fe03e031 100644
--- a/checkstyle/plugin.jelly
+++ b/checkstyle/plugin.jelly
@@ -165,8 +165,6 @@
 
       </ant:checkstyle>
       
-      <j:set var="maven.docs.outputencoding" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
-      
       <doc:jsl
         input="${maven.build.dir}/checkstyle-raw-report.xml"
         output="checkstyle-report.xml"
diff --git a/checkstyle/xdocs/changes.xml b/checkstyle/xdocs/changes.xml
index 6dea022b..63b98903 100644
--- a/checkstyle/xdocs/changes.xml
+++ b/checkstyle/xdocs/changes.xml
@@ -9,6 +9,9 @@
   <body>
 
     <release version="2.0" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
       <action dev="dion" type="fix">
         Add maven dependency and classes directory to classpath. This stops
         'Unable to get class information for '&lt;classname&gt;' errors.
diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 3a37c08d..427fd2fe 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -77,9 +77,7 @@
 
 	<clover-setup initstring="${maven.clover.database.dir}/clover_coverage.db"/>
 	
-    <j:set 
-      var="cloverReportDirectory"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/clover"/>
+    <j:set var="cloverReportDirectory" value="${maven.docs.dest}/clover"/>
 
     <maven:addPath id="maven.dependency.classpath" refid="clover.classpath"/>
 
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index d1023230..66000e82 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -8,6 +8,9 @@
 
   <body>
 	<release version="1.2" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
       <action dev="evenisse" type="fix">
         Fixed MAVEN-493. I register reports only if source, test,... exists.
         So, corresponding entrys in menu will appear only if reports are registered.
diff --git a/dist/plugin.jelly b/dist/plugin.jelly
index e46c1a93..091f85a2 100644
--- a/dist/plugin.jelly
+++ b/dist/plugin.jelly
@@ -59,8 +59,7 @@
     </ant:copy>
 
     <!-- Copy documentation -->
-    <j:set var="docsDest"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+    <j:set var="docsDest" value="${maven.docs.dest}"/>
     <ant:copy todir="${maven.dist.bin.assembly.dir}/docs">
       <ant:fileset dir="${docsDest}">
         <ant:include name="**"/>
diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml
index ad7716aa..b578bebe 100644
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -7,6 +7,9 @@
 
   <body>
     <release version="1.3" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
       <action dev="dion" type="update">
         update to commons-lang 1.0.1
       </action>
diff --git a/docbook/plugin.jelly b/docbook/plugin.jelly
index f55cbcd0..058a869e 100644
--- a/docbook/plugin.jelly
+++ b/docbook/plugin.jelly
@@ -11,8 +11,7 @@
     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')}"/>
+    <j:set var="genDocs" value="${maven.gen.docs}"/>
 
     ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
     <j:set var="dtd" value="${maven.docbook.dtd}"/>
diff --git a/docbook/xdocs/changes.xml b/docbook/xdocs/changes.xml
index 7a918531..10f11546 100644
--- a/docbook/xdocs/changes.xml
+++ b/docbook/xdocs/changes.xml
@@ -7,6 +7,9 @@
 
   <body>
     <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
       <action dev="dion" type="update">
         update to xalan 2.4.1
       </action>
diff --git a/faq/plugin.jelly b/faq/plugin.jelly
index 96d6a332..f278cda0 100644
--- a/faq/plugin.jelly
+++ b/faq/plugin.jelly
@@ -47,7 +47,7 @@
     <util:file var="destfileFile" name="${destfile}"/>
     <j:set var="destfile" value="${destfileFile.canonicalPath}"/>
         
-    <j:set var="outputencoding" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
+    <j:set var="outputencoding" value="${maven.docs.outputencoding}"/>
 
     <util:available file="${srcfile}">
       <j:set var="srcFileExists" value="true" />
diff --git a/faq/project.xml b/faq/project.xml
index ea6eb6a3..0f85364c 100644
--- a/faq/project.xml
+++ b/faq/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-faq-plugin</id>
   <name>Maven FAQ Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
   <!-- Gump integration -->
 
   <gumpRepositoryId>jakarta</gumpRepositoryId>
diff --git a/faq/xdocs/changes.xml b/faq/xdocs/changes.xml
new file mode 100644
index 00000000..2f90af07
--- /dev/null
+++ b/faq/xdocs/changes.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="dion@apache.org">dIon Gillard</author>
+  </properties>
+
+  <body>
+    <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
+    </release>
+  </body>
+</document>
+
diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 2ff3a4fc..e4966737 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -193,7 +193,7 @@
       </ant:javadoc>
       <ant:record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
 
-      <j:set var="genDocs" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}" />
+      <j:set var="genDocs" value="${maven.gen.docs}" />
       <doc:text-xdoc
         title="Javadoc Report"
         section="Javadoc Report"
diff --git a/javadoc/plugin.properties b/javadoc/plugin.properties
index 8f20fcc5..89782b81 100644
--- a/javadoc/plugin.properties
+++ b/javadoc/plugin.properties
@@ -5,7 +5,7 @@
 # -------------------------------------------------------------------
 
 maven.javadoc.author = true
-maven.javadoc.destdir = ${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/apidocs
+maven.javadoc.destdir = ${maven.docs.dest}/apidocs
 
 # optional properties for specifying a custom doclet
 #maven.javadoc.docletpath=
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index 8c89c05d..e1d6d37a 100644
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -8,6 +8,9 @@
 
   <body>
     <release version="1.3" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
       <action dev="dion" type="update">
         update to commons-lang 1.0.1
       </action>
diff --git a/jdiff/plugin.jelly b/jdiff/plugin.jelly
index 2e7e5e18..2e2b269c 100644
--- a/jdiff/plugin.jelly
+++ b/jdiff/plugin.jelly
@@ -15,8 +15,7 @@
     <ant:property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
     <ant:mkdir dir="${maven.jdiff.dir}"/>
 
-    <j:set var="docsDest"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+    <j:set var="docsDest" value="${maven.docs.dest}"/>
     <j:set var="javadocDestdir"
       value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
       
diff --git a/jdiff/project.xml b/jdiff/project.xml
index e1197ea0..78209dee 100644
--- a/jdiff/project.xml
+++ b/jdiff/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jdiff-plugin</id>
   <name>Maven JDiff Plugin</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jdiff/</url>
diff --git a/jdiff/xdocs/changes.xml b/jdiff/xdocs/changes.xml
new file mode 100644
index 00000000..1344f1d6
--- /dev/null
+++ b/jdiff/xdocs/changes.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="dion@multitask.com.au">dIon Gillard</author>
+    <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
+  </properties>
+
+  <body>
+    <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
+    </release>
+  </body>
+</document>
+
diff --git a/jellydoc/plugin.jelly b/jellydoc/plugin.jelly
index ac5cfb4b..8b8799c3 100644
--- a/jellydoc/plugin.jelly
+++ b/jellydoc/plugin.jelly
@@ -88,8 +88,7 @@
   <!-- sets the classpath used for doclet invocations -->
   <goal name="jellydoc:init">
 
-    <j:set var="genDocs"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+    <j:set var="genDocs" value="${maven.gen.docs}"/>
 
     <!-- just in case this is ran before a compile -->
     <ant:mkdir dir="${genDocs}"/>
diff --git a/jellydoc/xdocs/changes.xml b/jellydoc/xdocs/changes.xml
index dbd575bb..3ca901d2 100644
--- a/jellydoc/xdocs/changes.xml
+++ b/jellydoc/xdocs/changes.xml
@@ -9,6 +9,7 @@
   <body>
 
     <release version="1.1" date="In CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
       <action dev="dion" type="update">
         Upgrade to dom4j 1.4
       </action>
diff --git a/jxr/plugin.properties b/jxr/plugin.properties
index eedff54b..3c131ee3 100644
--- a/jxr/plugin.properties
+++ b/jxr/plugin.properties
@@ -4,8 +4,8 @@
 # JXR Plugin.
 # -------------------------------------------------------------------
 
-maven.jxr.destdir = ${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/xref
-maven.jxr.destdir.test = ${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/xref-test
+maven.jxr.destdir = ${maven.docs.dest}/xref
+maven.jxr.destdir.test = ${maven.docs.dest}/xref-test
 
 maven.jxr.stylesheet = ${plugin.resources}/stylesheet.css
 maven.jxr.templateDir = ${plugin.resources}/templates
diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml
index 89d56a2b..6dba1456 100644
--- a/jxr/xdocs/changes.xml
+++ b/jxr/xdocs/changes.xml
@@ -8,6 +8,7 @@
 
   <body>
     <release version="1.2" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
       <action dev="dion" type="update">
         Move to oro 2.0.7
       </action>
diff --git a/license/plugin.jelly b/license/plugin.jelly
index 8a6e0804..e652edd4 100644
--- a/license/plugin.jelly
+++ b/license/plugin.jelly
@@ -72,8 +72,7 @@
     description="Generate a xml file from your license file">
 
       <j:set var="licenseFile"><license:fileName /></j:set>
-      <j:set var="genDocs" 
-        value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+      <j:set var="genDocs" value="${maven.gen.docs}"/>
 
       <util:available file="${licenseFile}">
         <j:set var="licensePresent" value="true"/>
diff --git a/license/xdocs/changes.xml b/license/xdocs/changes.xml
index ae204576..de83e065 100644
--- a/license/xdocs/changes.xml
+++ b/license/xdocs/changes.xml
@@ -7,6 +7,7 @@
 
   <body>
 	<release version="1.1" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
       <action dev="evenisse" type="fix">
         Fixed MAVEN-493. I register reports only if source, test,... exists.
         So, corresponding entrys in menu will appear only if reports are registered.
diff --git a/linkcheck/plugin.jelly b/linkcheck/plugin.jelly
index ca66a122..bbb5a018 100644
--- a/linkcheck/plugin.jelly
+++ b/linkcheck/plugin.jelly
@@ -7,7 +7,6 @@
   xmlns:doc="doc">
   
   <property name="maven.linkcheck.cache" value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.linkcheck.cache')}"/>
-  <property name="maven.gen.docs" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
   
   <goal name="maven-linkcheck-plugin:register">
     <doc:registerReport 
@@ -50,6 +49,7 @@
     
     <j:if test="${online.trim().length() > 0}">
       <j:forEach var="report" items="${reports}">
+      <!-- FIXME: Why special case linkcheck - fix it! -->
        <j:if test="${report.get('pluginName').equals('maven-linkcheck-plugin')}">
        <attainGoal name="maven-linkcheck-plugin:report-real"/>
        </j:if>
diff --git a/linkcheck/xdocs/changes.xml b/linkcheck/xdocs/changes.xml
index d60d2209..74ce997f 100644
--- a/linkcheck/xdocs/changes.xml
+++ b/linkcheck/xdocs/changes.xml
@@ -8,6 +8,7 @@
   <body>
 
 	<release version="1.1" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
       <action dev="dion" type="update">
         Upgrade to dom4j 1.4
       </action>
diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly
index fefa4ab9..264c632b 100644
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -8,11 +8,6 @@
   xmlns:util="jelly:util"
   xmlns:velocity="jelly:velocity">
 
-  <j:set var="maven.gen.docs" 
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
-  <j:set var="maven.docs.dest" 
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
-
   <!--==================================================================-->
   <!-- Default goal: builds sites for all subprojects                   -->
   <!--==================================================================-->    
@@ -120,8 +115,6 @@
         template="navigation-${navType}.xml"/>
     </j:if>
 
-    <j:set var="maven.docs.src"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}" />
     <j:set var="userNav" value="${maven.docs.src}/navigation.xml" />
 
     <!-- FIXME: Will the xdoc stuff screw this up?? -->
diff --git a/multiproject/xdocs/current/changes.xml b/multiproject/xdocs/current/changes.xml
index e8c0b4a7..2e11d59d 100644
--- a/multiproject/xdocs/current/changes.xml
+++ b/multiproject/xdocs/current/changes.xml
@@ -7,6 +7,7 @@
 
   <body>
     <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
     </release>
     
     <release version="1.0" date="2003-08-28">
diff --git a/pdf/plugin.jelly b/pdf/plugin.jelly
index bc591f2e..4bec4591 100644
--- a/pdf/plugin.jelly
+++ b/pdf/plugin.jelly
@@ -6,10 +6,8 @@
     name="pdf:init"
     prereqs="xdoc:init">
 
-    <j:set var="docsDest"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
-    <j:set var="docsSrc"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
+    <j:set var="docsDest" value="${maven.docs.dest}"/>
+    <j:set var="docsSrc" value="${maven.docs.src}"/>
 
   </goal>
 
diff --git a/pdf/project.xml b/pdf/project.xml
index 6fa05da6..c63aef49 100644
--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-pdf-plugin</id>
   <name>Maven PDF Plug-in</name>
-  <currentVersion>1.1</currentVersion>
+  <currentVersion>1.2-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pdf/</url>
diff --git a/pdf/xdocs/changes.xml b/pdf/xdocs/changes.xml
index 498f1fa0..9c7b1b9b 100644
--- a/pdf/xdocs/changes.xml
+++ b/pdf/xdocs/changes.xml
@@ -6,7 +6,11 @@
   </properties>
 
   <body>
-    <release version="1.1" date="in CVS">
+    <release version="1.2" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
+    </release>
+
+    <release version="1.1" date="Unknown">
       <action dev="dion" type="add">
         Upgraded to xerces 2.3.0, xalan 2.4.1 and fop 0.20.5rc2
       </action>
diff --git a/site/plugin.jelly b/site/plugin.jelly
index b9acced0..0c7f7e14 100644
--- a/site/plugin.jelly
+++ b/site/plugin.jelly
@@ -11,8 +11,7 @@
   <goal name="site:generate" prereqs="site"/>
 
   <goal name="site:init" prereqs="xdoc:init">
-    <j:set var="docsDest"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+    <j:set var="docsDest" value="${maven.docs.dest}"/>
   </goal>
   
   
diff --git a/site/xdocs/changes.xml b/site/xdocs/changes.xml
index bc5794e8..64b2a903 100644
--- a/site/xdocs/changes.xml
+++ b/site/xdocs/changes.xml
@@ -7,6 +7,7 @@
 
   <body>
     <release version="1.3" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
       <action dev="dion" type="update">
         update to commons-lang 1.0.1
       </action>
diff --git a/statcvs/plugin.jelly b/statcvs/plugin.jelly
index 2add830d..1d765d79 100644
--- a/statcvs/plugin.jelly
+++ b/statcvs/plugin.jelly
@@ -56,7 +56,6 @@
         <!-- FIXME : We must use, with cvs, the connection string define in project.xml -->
         <cvs command="-q log" output="${statcvs.logfile}"/>
 
-        <property name="maven.docs.dest" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
         <ant:mkdir dir="${maven.docs.dest}"/>
   
         <java jar="${plugin.getDependencyPath('statcvs')}" fork="true">
diff --git a/statcvs/xdocs/changes.xml b/statcvs/xdocs/changes.xml
index 34dcda50..8096d5ba 100644
--- a/statcvs/xdocs/changes.xml
+++ b/statcvs/xdocs/changes.xml
@@ -7,6 +7,7 @@
 
   <body>
 	<release version="1.2" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
       <action dev="evenisse" type="fix" due-to="Alwyn Schoeman">
         Fixed MAVEN-561. Creates maven.build.dir and maven.docs.dest directory if doesn't exist.
       </action>
diff --git a/tasklist/plugin.jelly b/tasklist/plugin.jelly
index 7d79fa37..2be21f16 100644
--- a/tasklist/plugin.jelly
+++ b/tasklist/plugin.jelly
@@ -32,10 +32,8 @@
     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:set var="encoding"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
+    <j:set var="genDocs"  value="${maven.gen.docs}"/>
+    <j:set var="encoding" value="${maven.docs.outputencoding}"/>
 
     <j:set var="taskTag" value="${maven.tasklist.taskTag}"/>
 
diff --git a/tasklist/xdocs/changes.xml b/tasklist/xdocs/changes.xml
index 643af1da..34d31f6b 100644
--- a/tasklist/xdocs/changes.xml
+++ b/tasklist/xdocs/changes.xml
@@ -9,6 +9,7 @@
   <body>
 
     <release version="2.2" date="In CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
       <action dev="evenisse" type="fix">
         Fixed MAVEN-493. I register reports only if source, test,... exists.
         So, corresponding entrys in menu will appear only if reports are registered.
diff --git a/word2html/plugin.jelly b/word2html/plugin.jelly
index 01512e7e..f4b16e7e 100644
--- a/word2html/plugin.jelly
+++ b/word2html/plugin.jelly
@@ -28,8 +28,7 @@
         </fileset>
       </fileScanner>
 
-      <j:set var="docsDest"
-        value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+      <j:set var="docsDest" value="${maven.docs.dest}"/>
 
       <j:forEach var="file" items="${wordFiles.iterator()}">
         <echo>Generating from ${file} to ${docsDest}</echo>
diff --git a/word2html/xdocs/current/changes.xml b/word2html/xdocs/current/changes.xml
index 245c3588..4f123a2f 100644
--- a/word2html/xdocs/current/changes.xml
+++ b/word2html/xdocs/current/changes.xml
@@ -7,6 +7,10 @@
 
   <body>
 
+    <release version="1.4" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
+    </release>
+    
     <release version="1.3" date="2003-08-28">
       <action dev="dion" type="fix">
         Correctly handle files with <code>..</code> in the names
diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 05cff78b..24f5b316 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -139,23 +139,17 @@
       
       -->
       <j:if test="${outputDirectory == null}">
-        <j:set 
-          var="outputDirectory" 
-          value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"
+        <j:set var="outputDirectory"  value="${maven.gen.docs}"
         />
       </j:if>
 
       <!-- Set default encoding if not set. -->
       <j:if test="${encoding == null}">
-        <j:set 
-          var="encoding" 
-          value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"
-        />
+        <j:set var="encoding" value="${maven.docs.outputencoding}" />
       </j:if>
       
       <j:if test="${omitXmlDeclaration == null}">
-        <j:set var="omitXmlDeclaration" 
-          value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.omitXmlDeclaration')}"/>
+        <j:set var="omitXmlDeclaration" value="${maven.docs.omitXmlDeclaration}"/>
       </j:if>
       
       <mkdir dir="${outputDirectory}"/>
diff --git a/xdoc/plugin.properties b/xdoc/plugin.properties
index b78f2cd1..50e40ffa 100644
--- a/xdoc/plugin.properties
+++ b/xdoc/plugin.properties
@@ -4,12 +4,6 @@
 # Xdoc plugin.
 # -------------------------------------------------------------------
 
-maven.docs.src = ${basedir}/xdocs
-maven.docs.dest = ${maven.build.dir}/docs
-maven.docs.outputencoding = ISO-8859-1
-maven.docs.omitXmlDeclaration=false
-maven.gen.docs = ${maven.build.dir}/generated-xdocs
-
 maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html
 maven.xdoc.includeProjectDocumentation = yes
 
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index b160d202..4473610e 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -7,6 +7,9 @@
 
   <body>
     <release version="1.4" date="in CVS">
+      <action dev='dion' type='fix'>
+        Move maven.docs.* and maven.gen.docs to defaults.properties instead of xdoc plugin
+      </action>
       <action dev="evenisse" type="fix">
         Fix for MAVEN-698. Fix the broken build if repository/connection is not present.
       </action>