From f6532349c2312fc161c11302087580a3e8769892 Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 16 Dec 2005 18:33:22 +0000
Subject: [PATCH] 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         |  2 +-
 javadoc/plugin.properties    |  1 +
 javadoc/project.xml          |  8 ++++++++
 javadoc/xdocs/changes.xml    |  1 +
 javadoc/xdocs/properties.xml | 10 ++++++++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index e6057e0b..88c38440 100644
--- a/javadoc/plugin.jelly
+++ b/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}" />
diff --git a/javadoc/plugin.properties b/javadoc/plugin.properties
index c745c736..eec44080 100644
--- a/javadoc/plugin.properties
+++ b/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               =
diff --git a/javadoc/project.xml b/javadoc/project.xml
index fa5e40ce..14f58261 100644
--- a/javadoc/project.xml
+++ b/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>
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index 15983c8b..ce80cf37 100644
--- a/javadoc/xdocs/changes.xml
+++ b/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>
diff --git a/javadoc/xdocs/properties.xml b/javadoc/xdocs/properties.xml
index 2f94b532..aaca25e3 100644
--- a/javadoc/xdocs/properties.xml
+++ b/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>