You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/07/30 00:53:06 UTC
svn commit: r680869 -
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: vsiveton
Date: Tue Jul 29 15:53:06 2008
New Revision: 680869
URL: http://svn.apache.org/viewvc?rev=680869&view=rev
Log:
MJAVADOC-78: Add a flag to provide standard doclet parameters to custom ones too
o applied my patch
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=680869&r1=680868&r2=680869&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Tue Jul 29 15:53:06 2008
@@ -360,6 +360,27 @@
*/
protected boolean failOnError;
+ /**
+ * Specifies to use the <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#standard">
+ * options provided by the Standard Doclet</a> for a custom doclet.
+ * <br/>
+ * Example:
+ * <pre>
+ * <docletArtifacts>
+ * <docletArtifact>
+ * <groupId>com.sun.tools.doclets</groupId>
+ * <artifactId>doccheck</artifactId>
+ * <version>1.2b2</version>
+ * </docletArtifact>
+ * </docletArtifacts>
+ * <useStandardDocletOptions>true</useStandardDocletOptions>
+ * </pre>
+ *
+ * @parameter expression="${useStandardDocletOptions}" default-value="true"
+ * @since 2.5
+ */
+ protected boolean useStandardDocletOptions;
+
// ----------------------------------------------------------------------
// Javadoc Options
// ----------------------------------------------------------------------
@@ -1431,7 +1452,7 @@
// Wrap Standard doclet Options
// ----------------------------------------------------------------------
- if ( StringUtils.isEmpty( doclet ) )
+ if ( StringUtils.isEmpty( doclet ) || useStandardDocletOptions )
{
addStandardDocletOptions( javadocOutputDirectory, arguments );
}