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

[mperham]

Author: mperham
Date: Tue Jan 10 11:03:38 2006
New Revision: 367734

URL: http://svn.apache.org/viewcvs?rev=367734&view=rev
Log:
PR: MJAVADOC-40
Submitted by: Brian Fox
destDir parameter causing problems

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

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java?rev=367734&r1=367733&r2=367734&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
 Tue Jan 10 11:03:38 2006
@@ -36,6 +36,15 @@
     extends AbstractMojo
 {
     /**
+     * Specifies the destination directory where javadoc saves the generated 
HTML files.
+     * See <a 
href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#d";>d</a>.
+     *
+     * @parameter expression="${destDir}" alias="destDir" 
default-value="${project.build.directory}/javadoc/"
+     * @required
+     */
+    private File destDir;
+    
+    /**
      * @parameter expression="${project.build.directory}"
      */
     private String outputDirectory;
@@ -74,7 +83,7 @@
 
         try
         {
-            File outputFile = generateArchive( outputDirectory + "/javadoc", 
finalName + "-javadoc.jar" );
+            File outputFile = generateArchive( destDir.getAbsolutePath(), 
finalName + "-javadoc.jar" );
 
             if ( !attach )
             {