You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/01/01 16:25:32 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/vdoclet plugin.jelly
jvanzyl 2003/01/01 07:25:32
Modified: . beta-8.txt project.xml
src/plugins-build/changelog plugin.jelly
src/plugins-build/checkstyle plugin.jelly
src/plugins-build/javadoc plugin.jelly
src/plugins-build/jdepend plugin.jelly
src/plugins-build/junit-report plugin.jelly
src/plugins-build/jxr plugin.jelly
src/plugins-build/site plugin.jelly
src/plugins-build/tasklist plugin.jelly
src/plugins-build/vdoclet plugin.jelly
Log:
Revision Changes Path
1.3 +7 -1 jakarta-turbine-maven/beta-8.txt
Index: beta-8.txt
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/beta-8.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beta-8.txt 31 Dec 2002 07:28:17 -0000 1.2
+++ beta-8.txt 1 Jan 2003 15:25:31 -0000 1.3
@@ -10,4 +10,10 @@
o Maven sample project generator
o Abstract tests are automatically exluded from test execution
o all resource usage has been unified.
-o classworlds has replaced the use of forehead
\ No newline at end of file
+o classworlds has replaced the use of forehead
+o reactor tag usage has changed from:
+
+ <reactor:execute/> to <maven:reactor/>
+
+o maven tag usage has change. you only need to specify the path to
+ the project.xml file. You no longer need to specify the basedir.
1.229 +7 -11 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- project.xml 1 Jan 2003 06:24:55 -0000 1.228
+++ project.xml 1 Jan 2003 15:25:31 -0000 1.229
@@ -590,19 +590,15 @@
|
-->
- <!--
- <report>jdepend</report>
- <report>checkstyle</report>
- <report>changelog</report>
- -->
+ <report>maven-jdepend-plugin</report>
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-changelog-plugin</report>
<report>maven-file-activity-plugin</report>
<report>maven-developer-activity-plugin</report>
- <!--
- <report>javadoc</report>
- <report>jxr</report>
- <report>junit-report</report>
- <report>tasklist</report>
- -->
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-tasklist-plugin</report>
</reports>
</project>
1.15 +1 -1 jakarta-turbine-maven/src/plugins-build/changelog/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/changelog/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 31 Dec 2002 07:17:01 -0000 1.14
+++ plugin.jelly 1 Jan 2003 15:25:31 -0000 1.15
@@ -19,7 +19,7 @@
<!-- ================================================================== -->
<goal
- name="changelog"
+ name="maven-changelog-plugin:report"
description="Generate a changelog report">
<j:if test="${context.getVariable('maven.mode.online') == null}">
1.12 +17 -14 jakarta-turbine-maven/src/plugins-build/checkstyle/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/checkstyle/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 31 Dec 2002 07:17:01 -0000 1.11
+++ plugin.jelly 1 Jan 2003 15:25:31 -0000 1.12
@@ -8,13 +8,13 @@
<!-- C H E C K S T Y L E -->
<!-- ================================================================== -->
- <goal name="checkstyle"
+ <goal
+ name="maven-checkstyle-plugin:report"
description="Generate code convention conformance reports"
prereqs="checkstyle:check-license-file"/>
<goal
- name="checkstyle:generate-report"
- description="Generate code convention conformance reports">
+ name="checkstyle:report">
<j:if test="${sourcesPresent == 'true'}">
@@ -24,21 +24,25 @@
</taskdef>
<!--
-
- If an explicit properties file is set then use that. If one isn't then
- we will look for the maven.checkstyle.type property as there aren't going
- to be that many different formats: gnu, turbine, sun.
-
+ |
+ | If an explicit properties file is set then use that. If one isn't then
+ | we will look for the maven.checkstyle.type property as there aren't going
+ | to be that many different formats: gnu, turbine, sun.
+ |
-->
<j:set var="checkstylePropertiesX" value="${maven.checkstyle.properties}X"/>
<j:choose>
<j:when test="${checkstylePropertiesX != 'X'}">
- <j:set var="checkstyleProperties" value="${maven.checkstyle.properties}"/>
+ <j:set
+ var="checkstyleProperties"
+ value="${maven.checkstyle.properties}"/>
</j:when>
<j:otherwise>
- <j:set var="checkstyleProperties" value="${plugin.dir}/${maven.checkstyle.format}-checkstyle.properties"/>
+ <j:set
+ var="checkstyleProperties"
+ value="${plugin.dir}/${maven.checkstyle.format}-checkstyle.properties"/>
</j:otherwise>
</j:choose>
@@ -102,10 +106,9 @@
=======================================================================
</echo>
</j:when>
-
- <j:when test="${maven.checkstyle.license.exists}">
- <attainGoal name="checkstyle:generate-report"/>
- </j:when>
+ <j:otherwise>
+ <attainGoal name="checkstyle:report"/>
+ </j:otherwise>
</j:choose>
</goal>
1.9 +2 -7 jakarta-turbine-maven/src/plugins-build/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/javadoc/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 31 Dec 2002 07:17:01 -0000 1.8
+++ plugin.jelly 1 Jan 2003 15:25:31 -0000 1.9
@@ -8,14 +8,9 @@
<!-- J A V A D O C S -->
<!-- ================================================================== -->
- <goal name="javadoc"
- description="Generate API documentation"
- prereqs="javadoc:generate"/>
+ <goal name="maven-javadoc-plugin:report"
+ description="Generate API documentation">
- <goal
- name="javadoc:generate"
- description="Generate API documentation">
-
<j:if test="${sourcesPresent == 'true'}">
<mkdir dir="${maven.javadoc.destdir}"/>
1.5 +1 -6 jakarta-turbine-maven/src/plugins-build/jdepend/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jdepend/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 31 Dec 2002 07:17:02 -0000 1.4
+++ plugin.jelly 1 Jan 2003 15:25:31 -0000 1.5
@@ -6,13 +6,8 @@
<!-- J D E P E N D X M L T A R G E T -->
<!-- ================================================================== -->
- <goal name="jdepend"
- description="Generate a dependency report with JDepend"
- prereqs="jdepend:generate-report"/>
-
- <!-- Should we deprecate it to use only "jdepend" ? -->
<goal
- name="jdepend:generate-report"
+ name="maven-jdepend-plugin:report"
description="Generate a dependency report with JDepend">
<j:if test="${sourcesPresent == 'true'}">
1.8 +1 -7 jakarta-turbine-maven/src/plugins-build/junit-report/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/junit-report/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 31 Dec 2002 07:17:02 -0000 1.7
+++ plugin.jelly 1 Jan 2003 15:25:31 -0000 1.8
@@ -9,13 +9,7 @@
<!-- ================================================================== -->
<goal
- name="junit-report"
- description="Generate a report from the test results">
- <attainGoal name="junit-report:generate"/>
- </goal>
-
- <goal
- name="junit-report:generate"
+ name="maven-junit-report-plugin:report"
description="Generate a report from the test results">
<j:if test="${unitTestSourcesPresent == 'true'}">
1.7 +1 -5 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 31 Dec 2002 07:17:02 -0000 1.6
+++ plugin.jelly 1 Jan 2003 15:25:31 -0000 1.7
@@ -17,13 +17,9 @@
<!-- C R O S S R E F E R E N C E S O U R C E S -->
<!-- ================================================================== -->
- <goal name="jxr"
- description="Generate HTML cross reference sources"
- prereqs="jxr:generate"/>
-
<!-- Should we deprecate it to use only 'jxr' ? -->
<goal
- name="jxr:generate"
+ name="maen-jxr-plugin:report"
description="Generate HTML cross reference sources">
<j:if test="${sourcesPresent == 'true'}">
1.10 +21 -19 jakarta-turbine-maven/src/plugins-build/site/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/site/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 31 Dec 2002 08:41:07 -0000 1.9
+++ plugin.jelly 1 Jan 2003 15:25:31 -0000 1.10
@@ -13,15 +13,15 @@
name="site"
description="Generate the web site">
- <attainGoal name="jdepend"/>
- <attainGoal name="checkstyle"/>
- <attainGoal name="changelog"/>
+ <attainGoal name="maven-jdepend-plugin:report"/>
+ <attainGoal name="maven-checkstyle-plugin:report"/>
+ <attainGoal name="maven-changelog-plugin:report"/>
<attainGoal name="maven-developer-activity-plugin:report"/>
<attainGoal name="maven-file-activity-plugin:report"/>
- <attainGoal name="javadoc"/>
- <attainGoal name="jxr"/>
- <attainGoal name="junit-report"/>
- <attainGoal name="tasklist"/>
+ <attainGoal name="maven-javadoc-plugin:report"/>
+ <attainGoal name="maven-jxr-plugin:report"/>
+ <attainGoal name="maven-junit-report-plugin:report"/>
+ <attainGoal name="maven-tasklist-plugin:report"/>
<attainGoal name="xdoc"/>
</goal>
@@ -53,23 +53,25 @@
<!-- S I T E D E P L O Y -->
<!-- ================================================================== -->
- <goal name="site:deploy" description="deploy the generated site docs">
+ <goal
+ name="site:deploy"
+ description="deploy the generated site docs">
<!--
-
- Generate the site documentation if it has not already been generated.
- We need some markers or timestamps for this so we don't repeat work
- if it's not necessary.
-
+ |
+ | Generate the site documentation if it has not already been generated.
+ | We need some markers or timestamps for this so we don't repeat work
+ | if it's not necessary.
+ |
-->
- <attainGoal name="site:generate"/>
+ <attainGoal name="site"/>
<!--
-
- Deploy the site using the maven.site.deploy.method property (right
- now possible variants are 'fs' and 'ssh')
-
+ |
+ | Deploy the site using the maven.site.deploy.method property (right
+ | now possible variants are 'fs' and 'ssh')
+ |
-->
<attainGoal name="site:${maven.site.deploy.method}deploy"/>
@@ -78,7 +80,7 @@
</goal>
<!-- ================================================================== -->
- <!-- S I T E S S H D E P L O Y -->
+ <!-- S I T E S S H D E P L O Y -->
<!-- Deploys the site using SSH -->
<!-- ================================================================== -->
1.10 +3 -7 jakarta-turbine-maven/src/plugins-build/tasklist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/tasklist/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 10 Dec 2002 20:49:29 -0000 1.9
+++ plugin.jelly 1 Jan 2003 15:25:32 -0000 1.10
@@ -8,13 +8,9 @@
<!-- T A S K C R E A T I O N -->
<!-- ================================================================== -->
- <goal name="tasklist"
- description="Generate a list of tasks from @task tags in your code">
- <attainGoal name="tasklist:generate"/>
- </goal>
-
- <goal name="tasklist:generate" prereqs="vdoclet-init"
- description="Generate a list of tasks from @todo tags in your code">
+ <goal
+ name="maven-tasklist-plugin:report"
+ description="Generate a list of tasks from @todo tags in your code">
<j:if test="${sourcesPresent == 'true'}">
1.3 +2 -8 jakarta-turbine-maven/src/plugins-build/vdoclet/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/vdoclet/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 30 Nov 2002 01:19:31 -0000 1.2
+++ plugin.jelly 1 Jan 2003 15:25:32 -0000 1.3
@@ -2,13 +2,7 @@
xmlns:j="jelly:core"
xmlns:define="jelly:define"
xmlns:vdoclet="vdoclet">
-
- <!-- ================================================================== -->
- <!-- V D O C L E T I N I T -->
- <!-- ================================================================== -->
-
- <goal name="vdoclet-init"
- description="Initialize vdoclet tag library for later use">
+
<define:taglib uri="vdoclet">
<define:jellybean
name="vdocletBean"
@@ -25,5 +19,5 @@
/>
</define:tag>
</define:taglib>
- </goal>
+
</project>
Re: cvs commit: jakarta-turbine-maven/src/plugins-build/vdoclet
plugin.jelly
Posted by Jason van Zyl <ja...@zenplex.com>.
On Wed, 2003-01-01 at 10:25, jvanzyl@apache.org wrote:
> jvanzyl 2003/01/01 07:25:32
>
> Modified: . beta-8.txt project.xml
> src/plugins-build/changelog plugin.jelly
> src/plugins-build/checkstyle plugin.jelly
> src/plugins-build/javadoc plugin.jelly
> src/plugins-build/jdepend plugin.jelly
> src/plugins-build/junit-report plugin.jelly
> src/plugins-build/jxr plugin.jelly
> src/plugins-build/site plugin.jelly
> src/plugins-build/tasklist plugin.jelly
> src/plugins-build/vdoclet plugin.jelly
> Log:
This one slipped off. What were doing is using the plugin id as the
basis for the name for the report a plugin provides. We're using this in
conjunction with the <reports/> element in the POM to control which
reports are created for a project.
--
jvz.
Jason van Zyl
jason@zenplex.com
http://tambora.zenplex.org
In short, man creates for himself a new religion of a rational
and technical order to justify his work and to be justified in it.
-- Jacques Ellul, The Technological Society