You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2005/10/12 22:40:38 UTC

svn commit: r315040 - /maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

Author: jdcasey
Date: Wed Oct 12 13:40:34 2005
New Revision: 315040

URL: http://svn.apache.org/viewcvs?rev=315040&view=rev
Log:
Resolving: MNG-1155...Applied patch for OS X path of javadoc.

Modified:
    maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

Modified: maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=315040&r1=315039&r2=315040&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (original)
+++ maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java Wed Oct 12 13:40:34 2005
@@ -885,6 +885,10 @@
         {
             javadocExe = new File( SystemUtils.getJavaHome() + "/../sh", javadocCommand );
         }
+        else if ( SystemUtils.IS_OS_MAC_OSX )
+        {
+            javadocExe = new File( SystemUtils.getJavaHome() + "/bin", javadocCommand );
+        }
         else
         {
             javadocExe = new File( SystemUtils.getJavaHome() + "/../bin", javadocCommand );