PR: MPJAVADOC-56

Other doclets cannot use standard doclet parameters.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@357203 13f79535-47bb-0310-9956-ffa450edef68

javadoc/plugin.jelly

@@ -394,7 +394,7 @@ internal_javadoc_working_dir      = [${internal_javadoc_working_dir}]
         <!-- 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}" />

javadoc/plugin.properties

@@ -30,6 +30,7 @@ maven.javadoc.destdir               = ${maven.docs.dest}/apidocs
 # optional properties for specifying a custom doclet
 #maven.javadoc.doclet               =
 #maven.javadoc.docletpath           =
+#maven.javadoc.usestandardparameters =
 
 #maven.javadoc.excludepackagenames  =
 #maven.javadoc.footer               =

javadoc/project.xml

@@ -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>

javadoc/xdocs/changes.xml

@@ -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>

javadoc/xdocs/properties.xml

@@ -66,6 +66,16 @@
             ant javadoc task</a> documentation for more detail.
           </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>