From 4803435d1a7ebb064eeccc85f5669787f7a97601 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 28 Jan 2003 06:36:34 +0000
Subject: [PATCH] Cleanup usage of other plugins' properties

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112769 13f79535-47bb-0310-9956-ffa450edef68
---
 jxr/plugin.jelly      |  7 +++++--
 jxr/plugin.properties | 13 -------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/jxr/plugin.jelly b/jxr/plugin.jelly
index 5390c9bf..46ba1947 100644
--- a/jxr/plugin.jelly
+++ b/jxr/plugin.jelly
@@ -31,6 +31,9 @@
 
     <echo>${maven.sourcesPresent}</echo>
 
+    <j:set var="javadocDestdir"
+      value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
+
     <property
       name="copyright"
       value="Copyright &amp;copy; ${year} ${pom.organization.name}. All Rights Reserved."
@@ -49,7 +52,7 @@
       sourceDir="${pom.build.sourceDirectory}"
       destDir="${maven.jxr.destdir}"
       templateDir="${maven.jxr.templateDir}"
-      javadocDir="${maven.javadoc.destdir}"
+      javadocDir="${javadocDestdir}"
       windowTitle="${title}"
       docTitle="${title}"
       bottom="${copyright}">
@@ -62,7 +65,7 @@
       sourceDir="${pom.build.unitTestSourceDirectory}"
       destDir="${maven.jxr.destdir}"
       templateDir="${maven.jxr.templateDir}"
-      javadocDir="${maven.javadoc.destdir}"
+      javadocDir="${javadocDestdir}"
       windowTitle="${title}"
       docTitle="${title}"
       bottom="${copyright}">
diff --git a/jxr/plugin.properties b/jxr/plugin.properties
index 2e17373c..aea289f1 100644
--- a/jxr/plugin.properties
+++ b/jxr/plugin.properties
@@ -4,19 +4,6 @@
 # JXR Plugin.
 # -------------------------------------------------------------------
 
-maven.src.dir = ${basedir}/src
-maven.conf.dir = ${basedir}/conf
-maven.build.dir = ${basedir}/target
-maven.build.src = ${maven.build.dir}/src
-maven.build.dest = ${maven.build.dir}/classes
-
-maven.docs.src = ${basedir}/xdocs
-maven.docs.dest = ${maven.build.dir}/docs
-maven.docs.outputencoding = ISO-8859-1
-maven.gen.docs = ${maven.build.dir}/generated-xdocs
-
 maven.jxr.destdir = ${maven.docs.dest}/xref
 maven.jxr.stylesheet = ${plugin.resources}/stylesheet.css
 maven.jxr.templateDir = ${plugin.resources}/templates
-
-maven.javadoc.destdir = ${maven.docs.dest}/apidocs