svn commit: r680869 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

[vsiveton]

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>
+     * &lt;docletArtifacts&gt;
+     * &nbsp;&nbsp;&lt;docletArtifact&gt;
+     * 
&nbsp;&nbsp;&nbsp;&nbsp;&lt;groupId&gt;com.sun.tools.doclets&lt;/groupId&gt;
+     * &nbsp;&nbsp;&nbsp;&nbsp;&lt;artifactId&gt;doccheck&lt;/artifactId&gt;
+     * &nbsp;&nbsp;&nbsp;&nbsp;&lt;version&gt;1.2b2&lt;/version&gt;
+     * &nbsp;&nbsp;&lt;/docletArtifact&gt;
+     * &lt;/docletArtifacts&gt;
+     * &lt;useStandardDocletOptions&gt;true&lt;/useStandardDocletOptions&gt;
+     * </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 );
         }