jvanzyl 2002/07/05 14:48:20
Modified: src/plugins/activity plugin.jelly
src/plugins/checkstyle plugin.jelly
src/plugins/core plugin.jelly
src/plugins/dependency plugin.jelly
src/plugins/docbook plugin.jelly
src/plugins/gump plugin.jelly
src/plugins/jdepend plugin.jelly
src/plugins/junit-report plugin.jelly
src/plugins/jxr plugin.jelly
src/plugins/pdf plugin.jelly
src/plugins/xdoc plugin.jelly
Log:
o Now using the ${plugin.dir} reference where applicable.
Revision Changes Path
1.4 +4 -4 jakarta-turbine-maven/src/plugins/activity/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/activity/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 4 Jul 2002 22:07:19 -0000 1.3
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.4
@@ -36,8 +36,8 @@
destdir="${maven.gen.docs}/"
extension=".xml"
force="true"
- toolboxfile="${maven.home}/plugins/activity/toolbox.props"
- style="${maven.home}/plugins/activity/developer-activity.dvsl"
+ toolboxfile="${plugin.dir}/toolbox.props"
+ style="${plugin.dir}/developer-activity.dvsl"
includes="activity-log.xml"
outputencoding="${maven.docs.outputencoding}">
<!-- Need to add the maven jar to load the toolbox -->
@@ -50,8 +50,8 @@
<dvsl
extension=".xml"
force="true"
- toolboxfile="${maven.home}/plugins/activity/toolbox.props"
- style="${maven.home}/plugins/activity/file-activity.dvsl"
+ toolboxfile="${plugin.dir}/toolbox.props"
+ style="${plugin.dir}/file-activity.dvsl"
in="${maven.build.dir}/activity-log.xml"
out="${maven.gen.docs}/file-activity-report.xml">
<!-- Need to add the maven jar to load the toolbox -->
1.5 +2 -2 jakarta-turbine-maven/src/plugins/checkstyle/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/checkstyle/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 5 Jul 2002 00:51:00 -0000 1.4
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.5
@@ -39,8 +39,8 @@
<dvsl
basedir="${basedir}"
- style="${maven.home}/plugins/checkstyle/checkstyle.dvsl"
- toolboxfile="${maven.home}/plugins/checkstyle/toolbox.props"
+ style="${plugin.dir}/checkstyle.dvsl"
+ toolboxfile="${plugin.dir}/toolbox.props"
in="${maven.build.dir}/checkstyle-raw-report.xml"
out="${maven.gen.docs}/checkstyle-report.xml">
<classpath>
1.14 +2 -2 jakarta-turbine-maven/src/plugins/core/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/core/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 5 Jul 2002 16:39:20 -0000 1.13
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.14
@@ -167,8 +167,8 @@
<attainGoal name="jxr:generate"/>
<attainGoal name="junit-report:generate"/>
<attainGoal name="tasklist:generate"/>
- <attainGoal name="xdocs:generate-from-pom"/>
- <attainGoal name="xdocs:transform"/>
+ <attainGoal name="xdoc:generate-from-pom"/>
+ <attainGoal name="xdoc:transform"/>
</goal>
1.8 +2 -2 jakarta-turbine-maven/src/plugins/dependency/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/dependency/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 5 Jul 2002 20:35:05 -0000 1.7
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.8
@@ -154,8 +154,8 @@
out="${file.absolutePath}.new/"
extension=".xml"
force="true"
- toolboxfile="${maven.home}/plugins/dependency/toolbox.props"
- style="${maven.home}/plugins/dependency/createpom.dvsl"
+ toolboxfile="${plugin.dir}/toolbox.props"
+ style="${plugin.dir}/createpom.dvsl"
outputencoding="${maven.docs.outputencoding}">
<tool name="toolbox.string.basedir" value="${basedir}"/>
1.4 +1 -1 jakarta-turbine-maven/src/plugins/docbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/docbook/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 4 Jul 2002 04:41:32 -0000 1.3
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.4
@@ -12,7 +12,7 @@
<style
basedir="${maven.src.docbook-simple}"
destdir="${maven.gen.docs}" extension=".xml"
- style="${maven.home}/plugins/docbook/docbook2document.xsl"
+ style="${plugins.dir}/docbook2document.xsl"
includes="**/*.xml, **/*.sgml"
/>
1.2 +1 -1 jakarta-turbine-maven/src/plugins/gump/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/gump/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 4 Jul 2002 21:54:50 -0000 1.1
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.2
@@ -27,7 +27,7 @@
basedir="."
destdir="./"
extension=".xml"
- style="${maven.home}/plugins/gump/maven-to-gump.dvsl"
+ style="${plugin.dir}/maven-to-gump.dvsl"
in="project.xml"
out="gump.xml"
/>
1.4 +2 -2 jakarta-turbine-maven/src/plugins/jdepend/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/jdepend/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 5 Jul 2002 00:51:00 -0000 1.3
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.4
@@ -33,8 +33,8 @@
<dvsl
basedir="."
- style="${maven.home}/plugins/jdepend/jdepend.dvsl"
- toolboxfile="${maven.home}/plugins/jdepend/toolbox.props"
+ style="${plugin.dir}/jdepend.dvsl"
+ toolboxfile="${plugin.dir}/toolbox.props"
in="${maven.build.dir}/jdepend-raw-report.xml"
out="${maven.gen.docs}/jdepend-report.xml">
<!-- Need to add the maven jar to load the toolbox -->
1.4 +2 -2 jakarta-turbine-maven/src/plugins/junit-report/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/junit-report/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 5 Jul 2002 00:51:00 -0000 1.3
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.4
@@ -29,8 +29,8 @@
<!-- Convert single report into an xdoc -->
<dvsl
basedir="${basedir}"
- style="${maven.home}/plugins/junit-report/junit.dvsl"
- toolboxfile="${maven.home}/plugins/junit-report/toolbox.props"
+ style="${plugin.dir}/junit.dvsl"
+ toolboxfile="${plugin.dir}/toolbox.props"
in="${maven.test.reportsDirectory}/TESTS-TestSuites.xml"
out="${maven.gen.docs}/junit-report.xml">
<classpath>
1.4 +2 -2 jakarta-turbine-maven/src/plugins/jxr/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/jxr/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 5 Jul 2002 16:23:11 -0000 1.3
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.4
@@ -28,8 +28,8 @@
sourcepath="${pom.build.sourceDirectory}"
destDir="${maven.jxr.destdir}"
javadocDir="${maven.javadoc.destdir}"
- imageFolder="${maven.home}/plugins/jxr/images/folder.gif"
- imageFile="${maven.home}/plugins/jxr/images/file.gif">
+ imageFolder="${plugin.dir}/images/folder.gif"
+ imageFile="${plugin.dir}/images/file.gif">
</jxr>
<!-- The last two parameters don't really matter but the
1.4 +1 -1 jakarta-turbine-maven/src/plugins/pdf/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/pdf/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 5 Jul 2002 16:07:47 -0000 1.3
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.4
@@ -25,7 +25,7 @@
<arg value="-out"/>
<arg value="${maven.docs.dest}/project.fo"/>
<arg value="-xsl"/>
- <arg value="${maven.home}/plugins/pdf/project2fo.xslt"/>
+ <arg value="${plugin.dir}/project2fo.xslt"/>
<arg value="-param"/>
<arg value="basePath"/>
<arg value="${maven.docs.src}"/>
1.10 +8 -8 jakarta-turbine-maven/src/plugins/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/xdoc/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 5 Jul 2002 16:39:20 -0000 1.9
+++ plugin.jelly 5 Jul 2002 21:48:19 -0000 1.10
@@ -13,13 +13,13 @@
</taskdef>
<goal
- name="xdocs:generate-from-pom"
+ name="xdoc:generate-from-pom"
description="Generates xdocs for site based on project descriptor">
<create-xdocs
controlTemplate="Control.vm"
outputDirectory="${maven.gen.docs}"
- templatePath="${maven.home}/plugins/xdoc/templates"
+ templatePath="${plugin.dir}/templates"
outputFile="xdocs.report"
projectDescriptor="project.xml"
/>
@@ -37,7 +37,7 @@
</taskdef>
<goal
- name="xdocs:transform"
+ name="xdoc:transform"
description="Generate html project documentation xdoc sources">
<tstamp>
@@ -50,8 +50,8 @@
destdir="${maven.docs.dest}/"
extension=".html"
force="true"
- toolboxfile="${maven.home}/plugins/xdoc/toolbox.props"
- style="${maven.home}/plugins/xdoc/site.dvsl"
+ toolboxfile="${plugin.dir}/toolbox.props"
+ style="${plugin.dir}/site.dvsl"
excludes="**/project.xml,**/template.xml"
includes="**/*.xml"
outputencoding="${maven.docs.outputencoding}">
@@ -75,8 +75,8 @@
destdir="${maven.docs.dest}/"
extension=".html"
force="true"
- toolboxfile="${maven.home}/plugins/xdoc/toolbox.props"
- style="${maven.home}/plugins/xdoc/site.dvsl"
+ toolboxfile="${plugin.dir}/toolbox.props"
+ style="${plugin.dir}/site.dvsl"
excludes="**/project.xml,**/template.xml"
includes="**/*.xml"
outputencoding="${maven.docs.outputencoding}">
@@ -118,7 +118,7 @@
<!-- Copy maven supplied stylesheets. -->
<copy todir="${maven.docs.dest}/style" overwrite="yes" filtering="yes">
- <fileset dir="${maven.home}/plugins/xdoc/css">
+ <fileset dir="${plugin.dir}/css">
<include name="**/*.css"/>
</fileset>
<filterset>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
