You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2005/12/16 19:33:26 UTC
svn commit: r357203 - in /maven/maven-1/plugins/trunk/javadoc: plugin.jelly
plugin.properties project.xml xdocs/changes.xml xdocs/properties.xml
Author: ltheussl
Date: Fri Dec 16 10:33:22 2005
New Revision: 357203
URL: http://svn.apache.org/viewcvs?rev=357203&view=rev
Log:
PR: MPJAVADOC-56
Other doclets cannot use standard doclet parameters.
Modified:
maven/maven-1/plugins/trunk/javadoc/plugin.jelly
maven/maven-1/plugins/trunk/javadoc/plugin.properties
maven/maven-1/plugins/trunk/javadoc/project.xml
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=357203&r1=357202&r2=357203&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/javadoc/plugin.jelly Fri Dec 16 10:33:22 2005
@@ -394,7 +394,7 @@
<!-- Standard doclet parameters -->
<!-- ========================== -->
- <j:if test="${context.getVariable('maven.javadoc.doclet') == null}">
+ <j:if test="${context.getVariable('maven.javadoc.doclet') == null or context.getVariable('maven.javadoc.usestandardparameters') != null}">
<j:if test="${context.getVariable('maven.javadoc.destdir') != null}">
<ant:setProperty name="destdir" value="${maven.javadoc.destdir}" />
Modified: maven/maven-1/plugins/trunk/javadoc/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/plugin.properties?rev=357203&r1=357202&r2=357203&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/javadoc/plugin.properties Fri Dec 16 10:33:22 2005
@@ -30,6 +30,7 @@
# optional properties for specifying a custom doclet
#maven.javadoc.doclet =
#maven.javadoc.docletpath =
+#maven.javadoc.usestandardparameters =
#maven.javadoc.excludepackagenames =
#maven.javadoc.footer =
Modified: maven/maven-1/plugins/trunk/javadoc/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/project.xml?rev=357203&r1=357202&r2=357203&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/javadoc/project.xml Fri Dec 16 10:33:22 2005
@@ -130,6 +130,14 @@
</roles>
<timezone>-3</timezone>
</developer>
+ <developer>
+ <name>Lukas Theussl</name>
+ <id>ltheussl</id>
+ <email>ltheussl@apache.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
</developers>
<dependencies>
<dependency>
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=357203&r1=357202&r2=357203&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/javadoc/xdocs/changes.xml Fri Dec 16 10:33:22 2005
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.8-SNAPSHOT" date="In SVN">
+ <action dev="ltheussl" type="fix" issue="MPJAVADOC-56">Other doclets cannot use standard doclet parameters.</action>
<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>
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=357203&r1=357202&r2=357203&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/javadoc/xdocs/properties.xml Fri Dec 16 10:33:22 2005
@@ -67,6 +67,16 @@
</td>
</tr>
<tr>
+ <td>maven.javadoc.usestandardparameters</td>
+ <td>Yes</td>
+ <td>
+ If this option is set, javadoc will use the standard doclet
+ parameters (see <a href="#Standard_Doclet_Settings">below</a>)
+ even if the <code>maven.javadoc.doclet</code> option is set.
+ This is useful for doclets that extend the standard one.
+ </td>
+ </tr>
+ <tr>
<td>maven.javadoc.excludepackagenames</td>
<td>Yes</td>
<td>