Author: ltheussl
Date: Thu Dec 15 13:25:44 2005
New Revision: 357072
URL: http://svn.apache.org/viewcvs?rev=357072&view=rev
Log:
PR: MPJAVADOC-65
Added maven.javadoc.warningsreport and maven.javadoc.javadocreport properties.
Modified:
maven/maven-1/plugins/trunk/javadoc/plugin.jelly
maven/maven-1/plugins/trunk/javadoc/plugin.properties
maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml
maven/maven-1/plugins/trunk/javadoc/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/javadoc/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/plugin.jelly?rev=357072&r1=357071&r2=357072&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/javadoc/plugin.jelly Thu Dec 15 13:25:44 2005
@@ -210,18 +210,21 @@
target="_blank"
description="JavaDoc API documentation."
/>
- <doc:registerReport
- name="JavaDoc Report"
- pluginName=""
- link="javadoc"
- description="Report on the generation of JavaDoc."
- />
- <doc:registerReport
- name="JavaDoc Warnings Report"
- pluginName=""
- link="javadoc-warnings-report"
- description="Formatted report of JavaDoc warnings."
- />
+ <j:if test="${maven.javadoc.javadocreport}">
+ <doc:registerReport
+ name="JavaDoc Report"
+ pluginName=""
+ link="javadoc"
+ description="Report on the generation of JavaDoc."
+ />
+ </j:if>
+ <j:if test="${maven.javadoc.warningsreport}">
+ <doc:registerReport
+ name="JavaDoc Warnings Report"
+ pluginName=""
+ link="javadoc-warnings-report"
+ description="Formatted report of JavaDoc warnings."/>
+ </j:if>
</j:if>
</goal>
@@ -544,12 +547,15 @@
<j:arg type="java.lang.String" value="" />
</j:invokeStatic>
+ <j:if test="${maven.javadoc.javadocreport}">
<doc:text-xdoc
title="Javadoc Report"
section="Javadoc Report"
inputText="${inputText}"
output="${genDocs}/javadoc.xml"/>
+ </j:if>
+ <j:if test="${maven.javadoc.warningsreport}">
<javadoc:javadocwarnings
verbose="${maven.javadoc.debug}"
inputFileName="${internal_javadoc_working_dir}/report.txt"
@@ -564,6 +570,7 @@
outputMode="xml"
prettyPrint="true"
/>
+ </j:if>
<ant:delete dir="${internal_javadoc_src_tmp}"/>
Modified: maven/maven-1/plugins/trunk/javadoc/plugin.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/plugin.properties?rev=357072&r1=357071&r2=357072&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/javadoc/plugin.properties Thu Dec 15 13:25:44
2005
@@ -55,3 +55,5 @@
maven.javadoc.version = true
maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion} API
maven.javadoc.failonerror = false
+maven.javadoc.warningsreport = true
+maven.javadoc.javadocreport = true
\ No newline at end of file
Modified: maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml?rev=357072&r1=357071&r2=357072&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml Thu Dec 15 13:25:44
2005
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.8-SNAPSHOT" date="In SVN">
+ <action dev="ltheussl" type="add" issue="MPJAVADOC-65">Added
maven.javadoc.warningsreport and maven.javadoc.javadocreport
properties.</action>
<action dev="ltheussl" type="update" issue="MPJAVADOC-66">The maxmemory
property is set to 512m by default.</action>
<action dev="ltheussl" type="fix"
issue="MPJAVADOC-61">StringIndexOutOfBoundsException on parsing the
files.</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-59">Files
package.html and overview.html are not copied when source modifications are
used.</action>
Modified: maven/maven-1/plugins/trunk/javadoc/xdocs/properties.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/xdocs/properties.xml?rev=357072&r1=357071&r2=357072&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/javadoc/xdocs/properties.xml Thu Dec 15
13:25:44 2005
@@ -141,6 +141,20 @@
than 0. Default value : false.
</td>
</tr>
+ <tr>
+ <td>maven.javadoc.javadocreport</td>
+ <td>Yes</td>
+ <td>
+ Include the javadoc report. Default value: true.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.javadoc.warningsreport</td>
+ <td>Yes</td>
+ <td>
+ Include the javadoc warnings report. Default value: true.
+ </td>
+ </tr>
</table>
</section>
<section name="Standard Doclet Settings">
