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

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112768 13f79535-47bb-0310-9956-ffa450edef68
---
 jdiff/plugin.jelly                |  9 +++++----
 junit-report/plugin.jelly         |  7 +++++--
 junit-report/plugin.properties    | 17 -----------------
 junit-report/xdocs/properties.xml | 16 ----------------
 4 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/jdiff/plugin.jelly b/jdiff/plugin.jelly
index 1e5dda2e..702e4654 100644
--- a/jdiff/plugin.jelly
+++ b/jdiff/plugin.jelly
@@ -6,9 +6,7 @@
   <!-- P R O J E C T  D O C U M E N T A T I O N                           -->
   <!-- ================================================================== -->
       
-  <goal
-    name="jdiff"
-    prereqs="xdoc:init"
+  <goal name="jdiff" prereqs="xdoc:init"
     description="generate an api difference report between versions">
 
     <property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
@@ -16,6 +14,9 @@
 
     <j:set var="docsDest"
       value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+    <j:set var="javadocDestdir"
+      value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
+      
     <property name="maven.jdiff.changes.dir" value="${docsDest}/jdiff"/>    
     <mkdir dir="${maven.jdiff.changes.dir}"/>
             
@@ -112,7 +113,7 @@
         <param name="-stats"/>
         <param name="-oldapi" value="${maven.jdiff.old.tag}"/>
         <param name="-newapi" value="${maven.jdiff.new.tag}"/>
-        <param name="-javadocnew" value="${maven.javadoc.destdir}/"/>
+        <param name="-javadocnew" value="${javadocDestdir}/"/>
       </doclet>      
 
     </javadoc> 
diff --git a/junit-report/plugin.jelly b/junit-report/plugin.jelly
index 87d12dfd..893c476c 100644
--- a/junit-report/plugin.jelly
+++ b/junit-report/plugin.jelly
@@ -18,11 +18,14 @@
       <attainGoal name="test:test"/>
       <j:set var="maven.test.failure.ignore" scope="parent"/>
 
-      <mkdir dir="${maven.test.reportsDirectory}"/>
+      <j:set var="testReportsDirectory"
+        value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.test.reportsDirectory')}"/>
+
+      <mkdir dir="${testReportsDirectory}"/>
 
       <!-- Consolidate the reports into a single -->
       <junitreport todir="${maven.build.dir}">
-        <fileset dir="${maven.test.reportsDirectory}">
+        <fileset dir="${testReportsDirectory}">
           <include name="TEST-*.xml"/>
         </fileset>
       </junitreport>
diff --git a/junit-report/plugin.properties b/junit-report/plugin.properties
index 2db1e64d..2a105425 100644
--- a/junit-report/plugin.properties
+++ b/junit-report/plugin.properties
@@ -3,20 +3,3 @@
 # -------------------------------------------------------------------
 # JUnit report 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.junit.fork = no 
-maven.junit.dir = ${basedir}
-maven.junit.usefile = true
-maven.test.dest = ${maven.build.dir}/test-classes
-maven.test.reportsDirectory = ${maven.build.dir}/test-reports
diff --git a/junit-report/xdocs/properties.xml b/junit-report/xdocs/properties.xml
index 71f8e10f..bc99e2af 100644
--- a/junit-report/xdocs/properties.xml
+++ b/junit-report/xdocs/properties.xml
@@ -37,14 +37,6 @@
               <code>${maven.build.dir}/generated-xdocs</code>.</p>
           </td>
         </tr>
-        <tr>
-          <td>maven.junit.fork</td>
-          <td>Yes</td>
-          <td>
-            <p>Default value is
-              <code>no</code>.</p>
-          </td>
-        </tr>
         <tr>
           <td>maven.build.dest</td>
           <td>Yes</td>
@@ -93,14 +85,6 @@
               <code>${basedir}/target</code>.</p>
           </td>
         </tr>
-        <tr>
-          <td>maven.junit.dir</td>
-          <td>Yes</td>
-          <td>
-            <p>Default value is
-              <code>${basedir}</code>.</p>
-          </td>
-        </tr>
         <tr>
           <td>maven.docs.dest</td>
           <td>Yes</td>