evenisse 2003/07/01 06:53:43
Modified: src/plugins-build/changelog plugin.jelly
src/plugins-build/checkstyle plugin.jelly
src/plugins-build/clover plugin.jelly project.xml
src/plugins-build/developer-activity plugin.jelly
project.xml
src/plugins-build/file-activity plugin.jelly
src/plugins-build/jdepend plugin.jelly project.xml
src/plugins-build/junit-report plugin.jelly project.xml
src/plugins-build/license plugin.jelly project.xml
src/plugins-build/statcvs plugin.jelly project.xml
src/plugins-build/tasklist plugin.jelly project.xml
Log:
fixed MAVEN-493.
I register reports only if source, test,... exists.
Revision Changes Path
1.7 +10 -5 maven/src/plugins-build/changelog/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changelog/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 26 Mar 2003 23:27:44 -0000 1.6
+++ plugin.jelly 1 Jul 2003 13:53:41 -0000 1.7
@@ -8,11 +8,16 @@
xmlns:doc="doc">
<goal name="maven-changelog-plugin:register">
- <doc:registerReport
- name="Change Log"
- pluginName="maven-changelog-plugin"
- link="changelog-report"
- description="Report on the source control changelog."/>
+ <j:if test="${context.getVariable('maven.mode.online') == null}">
+ <j:set var="maven.mode.online" value="true" />
+ </j:if>
+ <j:if test="${maven.mode.online}">
+ <doc:registerReport
+ name="Change Log"
+ pluginName="maven-changelog-plugin"
+ link="changelog-report"
+ description="Report on the source control changelog."/>
+ </j:if>
</goal>
<goal name="maven-changelog-plugin:deregister">
1.10 +10 -6 maven/src/plugins-build/checkstyle/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/checkstyle/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 1 Jul 2003 12:47:35 -0000 1.9
+++ plugin.jelly 1 Jul 2003 13:53:41 -0000 1.10
@@ -166,11 +166,13 @@
========================================================================
-->
<goal name="maven-checkstyle-plugin:register">
- <doc:registerReport
- name="Checkstyle"
- pluginName="checkstyle"
- link="checkstyle-report"
- description="Report on coding style conventions."/>
+ <j:if test="${sourcesPresent == 'true'}">
+ <doc:registerReport
+ name="Checkstyle"
+ pluginName="checkstyle"
+ link="checkstyle-report"
+ description="Report on coding style conventions."/>
+ </j:if>
</goal>
<!--
@@ -179,7 +181,9 @@
========================================================================
-->
<goal name="maven-checkstyle-plugin:deregister">
- <doc:deregisterReport name="Checkstyle"/>
+ <j:if test="${sourcesPresent == 'true'}">
+ <doc:deregisterReport name="Checkstyle"/>
+ </j:if>
</goal>
</project>
1.8 +10 -6 maven/src/plugins-build/clover/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/clover/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 10 Jun 2003 13:22:47 -0000 1.7
+++ plugin.jelly 1 Jul 2003 13:53:41 -0000 1.8
@@ -29,15 +29,19 @@
<goal name="maven-clover-plugin:register">
- <doc:registerReport
- name="Clover"
- pluginName="maven-clover-plugin"
- link="clover/index"
- description="Clover test coverage report."/>
+ <j:if test="${sourcesPresent == 'true'}">
+ <doc:registerReport
+ name="Clover"
+ pluginName="maven-clover-plugin"
+ link="clover/index"
+ description="Clover test coverage report."/>
+ </j:if>
</goal>
<goal name="maven-clover-plugin:deregister">
- <doc:deregisterReport name="Clover"/>
+ <j:if test="${sourcesPresent == 'true'}">
+ <doc:deregisterReport name="Clover"/>
+ </j:if>
</goal>
<goal name="maven-clover-plugin:report">
1.13 +9 -0 maven/src/plugins-build/clover/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/clover/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 10 Jun 2003 20:58:09 -0000 1.12
+++ project.xml 1 Jul 2003 13:53:41 -0000 1.13
@@ -59,6 +59,15 @@
</roles>
</developer>
<developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Fi System</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
<name>Jason van Zyl</name>
<id>jvanzyl</id>
<email>[EMAIL PROTECTED]</email>
1.9 +10 -5 maven/src/plugins-build/developer-activity/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/developer-activity/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 27 Mar 2003 13:12:03 -0000 1.8
+++ plugin.jelly 1 Jul 2003 13:53:42 -0000 1.9
@@ -8,11 +8,16 @@
xmlns:doc="doc">
<goal name="maven-developer-activity-plugin:register">
- <doc:registerReport
- name="Developer Activity"
- pluginName="maven-developer-activity-plugin"
- link="developer-activity-report"
- description="Report on the amount of developer activity."/>
+ <j:if test="${context.getVariable('maven.mode.online') == null}">
+ <j:set var="maven.mode.online" value="true" />
+ </j:if>
+ <j:if test="${maven.mode.online}">
+ <doc:registerReport
+ name="Developer Activity"
+ pluginName="maven-developer-activity-plugin"
+ link="developer-activity-report"
+ description="Report on the amount of developer activity."/>
+ </j:if>
</goal>
<goal name="maven-developer-activity-plugin:deregister">
1.12 +11 -0 maven/src/plugins-build/developer-activity/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/developer-activity/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 9 Apr 2003 01:06:45 -0000 1.11
+++ project.xml 1 Jul 2003 13:53:42 -0000 1.12
@@ -14,6 +14,17 @@
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven/src/plugins-build/developer-activity/</connection>
<url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/developer-activity/</url>
</repository>
+ <developers>
+ <developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Fi System</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
<dependencies>
<dependency>
<groupId>commons-jelly</groupId>
1.9 +10 -5 maven/src/plugins-build/file-activity/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/file-activity/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 27 Mar 2003 13:21:38 -0000 1.8
+++ plugin.jelly 1 Jul 2003 13:53:42 -0000 1.9
@@ -8,11 +8,16 @@
xmlns:util="jelly:util">
<goal name="maven-file-activity-plugin:register">
- <doc:registerReport
- name="File Activity"
- pluginName="maven-file-activity-plugin"
- link="file-activity-report"
- description="Report on file activity."/>
+ <j:if test="${context.getVariable('maven.mode.online') == null}">
+ <j:set var="maven.mode.online" value="true" />
+ </j:if>
+ <j:if test="${maven.mode.online}">
+ <doc:registerReport
+ name="File Activity"
+ pluginName="maven-file-activity-plugin"
+ link="file-activity-report"
+ description="Report on file activity."/>
+ </j:if>
</goal>
<goal name="maven-file-activity-plugin:deregister">
1.6 +10 -6 maven/src/plugins-build/jdepend/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jdepend/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 30 Mar 2003 15:25:56 -0000 1.5
+++ plugin.jelly 1 Jul 2003 13:53:42 -0000 1.6
@@ -6,15 +6,19 @@
xmlns:doc="doc">
<goal name="maven-jdepend-plugin:register">
- <doc:registerReport
- name="Metrics"
- pluginName="maven-jdepend-plugin"
- link="jdepend-report"
- description="Report on source code metrics."/>
+ <j:if test="${sourcesPresent == 'true'}">
+ <doc:registerReport
+ name="Metrics"
+ pluginName="maven-jdepend-plugin"
+ link="jdepend-report"
+ description="Report on source code metrics."/>
+ </j:if>
</goal>
<goal name="maven-jdepend-plugin:deregister">
- <doc:deregisterReport name="Metrics"/>
+ <j:if test="${sourcesPresent == 'true'}">
+ <doc:deregisterReport name="Metrics"/>
+ </j:if>
</goal>
<!-- ================================================================== -->
1.14 +9 -0 maven/src/plugins-build/jdepend/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jdepend/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 9 Apr 2003 01:06:46 -0000 1.13
+++ project.xml 1 Jul 2003 13:53:42 -0000 1.14
@@ -52,6 +52,15 @@
<role>Release Manager</role>
</roles>
</developer>
+ <developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Fi System</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
</developers>
<dependencies>
<dependency>
1.7 +10 -6 maven/src/plugins-build/junit-report/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/junit-report/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 4 Jun 2003 11:36:27 -0000 1.6
+++ plugin.jelly 1 Jul 2003 13:53:42 -0000 1.7
@@ -6,15 +6,19 @@
xmlns:j="jelly:core">
<goal name="maven-junit-report-plugin:register">
- <doc:registerReport
- name="Unit Tests"
- pluginName="maven-junit-report-plugin"
- description="Report on the results of the unit tests."
- link="junit-report"/>
+ <j:if test="${unitTestSourcesPresent == 'true'}">
+ <doc:registerReport
+ name="Unit Tests"
+ pluginName="maven-junit-report-plugin"
+ description="Report on the results of the unit tests."
+ link="junit-report"/>
+ </j:if>
</goal>
<goal name="maven-junit-report-plugin:deregister">
- <doc:deregisterReport name="Unit Tests"/>
+ <j:if test="${unitTestSourcesPresent == 'true'}">
+ <doc:deregisterReport name="Unit Tests"/>
+ </j:if>
</goal>
<!-- ================================================================== -->
1.13 +9 -0 maven/src/plugins-build/junit-report/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/junit-report/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 4 Jun 2003 11:36:27 -0000 1.12
+++ project.xml 1 Jul 2003 13:53:42 -0000 1.13
@@ -31,6 +31,15 @@
<role>Java Developer</role>
</roles>
</developer>
+ <developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Fi System</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
</developers>
<dependencies>
<dependency>
1.13 +12 -5 maven/src/plugins-build/license/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/license/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 30 Mar 2003 16:17:20 -0000 1.12
+++ plugin.jelly 1 Jul 2003 13:53:42 -0000 1.13
@@ -46,11 +46,18 @@
<!-- L I C E N S E -->
<!-- ================================================================== -->
<goal name="maven-license-plugin:register">
- <doc:registerReport
- name="Project License"
- pluginName="maven-license-plugin"
- link="license"
- description="Displays the primary license for the project."/>
+ <j:set var="licenseFile"><license:fileName /></j:set>
+ <util:available file="${licenseFile}">
+ <j:set var="licensePresent" value="true"/>
+ </util:available>
+
+ <j:if test="${licensePresent != 'true'}">
+ <doc:registerReport
+ name="Project License"
+ pluginName="maven-license-plugin"
+ link="license"
+ description="Displays the primary license for the project."/>
+ </j:if>
</goal>
<goal name="maven-license-plugin:deregister">
1.10 +9 -0 maven/src/plugins-build/license/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/license/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 9 Apr 2003 01:06:47 -0000 1.9
+++ project.xml 1 Jul 2003 13:53:42 -0000 1.10
@@ -25,6 +25,15 @@
</roles>
</developer>
<developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Fi System</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
<name>dIon Gillard</name>
<id>dion</id>
<email>[EMAIL PROTECTED]</email>
1.5 +12 -6 maven/src/plugins-build/statcvs/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/statcvs/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 30 Mar 2003 16:17:19 -0000 1.4
+++ plugin.jelly 1 Jul 2003 13:53:42 -0000 1.5
@@ -18,15 +18,21 @@
================================================================== -->
<goal name="maven-statcvs-plugin:register">
- <doc:registerReport
- name="StatCVS Report"
- pluginName="maven-statcvs-plugin"
- link="statcvs/index"
- description="Show some statistics about the CVS repository"/>
+ <available property="jdk14" classname="java.lang.CharSequence"/>
+
+ <j:if test="${jdk14 == 'true'}">
+ <doc:registerReport
+ name="StatCVS Report"
+ pluginName="maven-statcvs-plugin"
+ link="statcvs/index"
+ description="Show some statistics about the CVS repository"/>
+ </j:if>
</goal>
<goal name="maven-statcvs-plugin:deregister">
- <doc:deregisterReport name="StatCVS Report"/>
+ <j:if test="${jdk14 == 'true'}">
+ <doc:deregisterReport name="StatCVS Report"/>
+ </j:if>
</goal>
<goal name="maven-statcvs-plugin:report">
1.10 +9 -0 maven/src/plugins-build/statcvs/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/statcvs/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 9 Apr 2003 01:06:48 -0000 1.9
+++ project.xml 1 Jul 2003 13:53:42 -0000 1.10
@@ -25,6 +25,15 @@
</roles>
</developer>
<developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Fi System</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
<name>Vincent Massol</name>
<id>vmassol</id>
<email>[EMAIL PROTECTED]</email>
1.7 +10 -6 maven/src/plugins-build/tasklist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/tasklist/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 3 Mar 2003 21:20:56 -0000 1.6
+++ plugin.jelly 1 Jul 2003 13:53:42 -0000 1.7
@@ -6,15 +6,19 @@
xmlns:vdoclet="vdoclet">
<goal name="maven-tasklist-plugin:register">
- <doc:registerReport
- name="Task List"
- pluginName="maven-tasklist-plugin"
- link="task-list"
- description="Report on tasks specified in the source code."/>
+ <j:if test="${sourcesPresent}">
+ <doc:registerReport
+ name="Task List"
+ pluginName="maven-tasklist-plugin"
+ link="task-list"
+ description="Report on tasks specified in the source code."/>
+ </j:if>
</goal>
<goal name="maven-tasklist-plugin:deregister">
- <doc:deregisterReport name="Task List"/>
+ <j:if test="${sourcesPresent}">
+ <doc:deregisterReport name="Task List"/>
+ </j:if>
</goal>
<!-- ================================================================== -->
1.11 +9 -0 maven/src/plugins-build/tasklist/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/tasklist/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 9 Apr 2003 01:06:48 -0000 1.10
+++ project.xml 1 Jul 2003 13:53:42 -0000 1.11
@@ -53,6 +53,15 @@
</roles>
</developer>
<developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Fi System</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
<name>Jason van Zyl</name>
<id>jvanzyl</id>
<email>[EMAIL PROTECTED]</email>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
