svn commit: r577583 - in /maven/plugins/branches/MNG-468/maven-javadoc-plugin: ./ pom.xml src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

[mkleint]

Author: mkleint
Date: Wed Sep 19 23:54:56 2007
New Revision: 577583

URL: http://svn.apache.org/viewvc?rev=577583&view=rev
Log:
MNG-468 toolchain-ize javadoc plugin.

Modified:
    maven/plugins/branches/MNG-468/maven-javadoc-plugin/   (props changed)
    maven/plugins/branches/MNG-468/maven-javadoc-plugin/pom.xml
    
maven/plugins/branches/MNG-468/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Propchange: maven/plugins/branches/MNG-468/maven-javadoc-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 19 23:54:56 2007
@@ -6,3 +6,4 @@
 .classpath
 .wtpmodules
 cobertura.ser
+nbproject

Modified: maven/plugins/branches/MNG-468/maven-javadoc-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/MNG-468/maven-javadoc-plugin/pom.xml?rev=577583&r1=577582&r2=577583&view=diff
==============================================================================
--- maven/plugins/branches/MNG-468/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/branches/MNG-468/maven-javadoc-plugin/pom.xml Wed Sep 19 
23:54:56 2007
@@ -132,6 +132,18 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-toolchain</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <exclusions>
+        <!-- Using org.codehaus.plexus:plexus-utils instead of -->
+        <exclusion>
+          <groupId>plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>1.4.3</version>

Modified: 
maven/plugins/branches/MNG-468/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/MNG-468/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=577583&r1=577582&r2=577583&view=diff
==============================================================================
--- 
maven/plugins/branches/MNG-468/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 (original)
+++ 
maven/plugins/branches/MNG-468/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 Wed Sep 19 23:54:56 2007
@@ -53,6 +53,7 @@
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.context.BuildContextManager;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.javadoc.options.Group;
 import org.apache.maven.plugin.javadoc.options.DocletArtifact;
@@ -65,6 +66,8 @@
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Settings;
+import org.apache.maven.toolchain.Toolchain;
+import org.apache.maven.toolchain.ToolchainManager;
 import org.apache.maven.wagon.PathUtils;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
@@ -86,6 +89,19 @@
 public abstract class AbstractJavadocMojo
     extends AbstractMojo
 {
+    
+    /**
+     *
+     * @component
+     */
+    private ToolchainManager toolchainManager;
+    
+    /**
+     *
+     * @component
+     */
+    private BuildContextManager buildContextManager;
+
     /**
      * The current class directory
      */
@@ -2043,6 +2059,17 @@
     private String getJavadocExecutable()
         throws IOException
     {
+        Toolchain tc = toolchainManager.getToolchainFromBuildContext("jdk", 
//NOI18N
+                                buildContextManager.readBuildContext(true));
+        if (tc != null) {
+            getLog().info("Toolchain in javadoc-plugin: " + tc);
+            if ( javadocExecutable  != null) { 
+                getLog().warn("Toolchains are ignored, 'javadocExecutable' 
parameter is set to " + javadocExecutable);
+            } else {
+                javadocExecutable = tc.findTool("javadoc"); //NOI18N
+            }
+        }
+        
         String javadocCommand = "javadoc" + ( SystemUtils.IS_OS_WINDOWS ? 
".exe" : "" );
 
         File javadocExe;