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

[ar...@apache.org]

Author: aramirez
Date: Fri Mar  3 23:27:04 2006
New Revision: 383066

URL: http://svn.apache.org/viewcvs?rev=383066&view=rev
Log:
PR: MJAVADOC-47
Submitted By: Maria Odea Ching
Reviewed By: Allan Ramirez

-fixed the part of always creating apidocs directory when the report plugin is declared in reporting section of the POM even if an output directory is specified

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

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=383066&r1=383065&r2=383066&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java Fri Mar  3 23:27:04 2006
@@ -714,16 +714,8 @@
         {
             return;
         }
-
-        File javadocDirectory = getReportOutputDirectory();
-
-        if ( !javadocDirectory.getAbsolutePath().equals( getOutputDirectory() ) )
-        {
-            // we're in site-embedded report mode, so Doxia has set the
-            // reportOutputDirectory to the basedir of the site.
-            // Append 'apidocs'.
-            javadocDirectory = new File( javadocDirectory, "apidocs" );
-        }
+                
+        File javadocDirectory = new File( getOutputDirectory() );
         javadocDirectory.mkdirs();
 
         File file = new File( javadocDirectory, "files" );