svn commit: r617984 - in /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc: AbstractJavadocMojo.java TestJavadocReport.java

[vsiveton]

Author: vsiveton
Date: Sun Feb  3 05:02:51 2008
New Revision: 617984

URL: http://svn.apache.org/viewvc?rev=617984&view=rev
Log:
o take care of 'null' output directory (mainly for tests)

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

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=617984&r1=617983&r2=617984&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 Sun Feb  3 05:02:51 2008
@@ -1053,6 +1053,11 @@
      */
     protected List getProjectBuildOutputDirs( MavenProject p )
     {
+        if ( StringUtils.isEmpty( p.getBuild().getOutputDirectory() ) )
+        {
+            return Collections.EMPTY_LIST;
+        }
+
         return Collections.singletonList( p.getBuild().getOutputDirectory() );
     }
 
@@ -1487,7 +1492,7 @@
         // Write options file and include it in the command line
         // 
----------------------------------------------------------------------
 
-        if ( options.length() > 0 )
+        if ( options.length() > 0 || arguments.size() > 0 )
         {
             addCommandLineOptions( cmd, options, arguments, 
javadocOutputDirectory );
         }
@@ -1903,7 +1908,7 @@
 
                     ArtifactVersion oldVersion = new DefaultArtifactVersion( 
oldArtifact.getVersion() );
                     ArtifactVersion newVersion = new DefaultArtifactVersion( 
newArtifact.getVersion() );
-                    if ( newVersion.compareTo( oldVersion ) > 1 )
+                    if ( newVersion.compareTo( oldVersion ) > 0 )
                     {
                         compileArtifactMap.put( 
newArtifact.getDependencyConflictId(), newArtifact );
                     }

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java?rev=617984&r1=617983&r2=617984&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
 Sun Feb  3 05:02:51 2008
@@ -195,8 +195,14 @@
     protected List getProjectBuildOutputDirs( MavenProject p )
     {
         List dirs = new ArrayList();
-        dirs.add( p.getBuild().getOutputDirectory() );
-        dirs.add( p.getBuild().getTestOutputDirectory() );
+        if ( StringUtils.isNotEmpty( p.getBuild().getOutputDirectory() ) )
+        {
+            dirs.add( p.getBuild().getOutputDirectory() );
+        }
+        if ( StringUtils.isNotEmpty( p.getBuild().getTestOutputDirectory() ) )
+        {
+            dirs.add( p.getBuild().getTestOutputDirectory() );
+        }
 
         return dirs;
     }
@@ -269,7 +275,7 @@
 
     /**
      * Gets the resource bundle for the specified locale.
-     * 
+     *
      * @param locale The locale of the currently generated report.
      * @return The resource bundle for the requested locale.
      */