You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/01/28 07:36:35 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/jxr plugin.properties plugin.jelly
dion 2003/01/27 22:36:35
Modified: src/plugins-build/jxr plugin.properties plugin.jelly
Log:
Cleanup usage of other plugins' properties
Revision Changes Path
1.2 +0 -13 jakarta-turbine-maven/src/plugins-build/jxr/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jxr/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 24 Jan 2003 03:45:38 -0000 1.1
+++ plugin.properties 28 Jan 2003 06:36:34 -0000 1.2
@@ -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
1.2 +5 -2 jakarta-turbine-maven/src/plugins-build/jxr/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jxr/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:45:38 -0000 1.1
+++ plugin.jelly 28 Jan 2003 06:36:34 -0000 1.2
@@ -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 &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}">