[prev in list] [next in list] [prev in thread] [next in thread] 

List:       maven-dev
Subject:    svn commit: r1391706 - in /maven/plugins/trunk/maven-javadoc-plugin/src: main/java/org/apache/maven/
From:       hboutemy () apache ! org
Date:       2012-09-29 0:43:46
Message-ID: 20120929004346.A96A7238896F () eris ! apache ! org
[Download RAW message or body]

Author: hboutemy
Date: Sat Sep 29 00:43:45 2012
New Revision: 1391706

URL: http://svn.apache.org/viewvc?rev=1391706&view=rev
Log:
[MJAVADOC-354] support unnamed package in isValidJavadocLink() check

Added:
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/JavadocUtilTest-package-list.txt \
(with props) 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/JavadocUtil.java
  maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.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/ja \
va/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1391706&r1=1391705&r2=1391706&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 \
Sat Sep 29 00:43:45 2012 @@ -4231,7 +4231,7 @@ public abstract class \
AbstractJavadocMoj  
         try
         {
-            FileUtils.fileWrite( optionsFile.getAbsolutePath(), options.toString() \
); +            FileUtils.fileWrite( optionsFile.getAbsolutePath(), null /* platform \
encoding */, options.toString() );  }
         catch ( IOException e )
         {

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
                
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/ja \
va/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=1391706&r1=1391705&r2=1391706&view=diff
 ==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java \
                (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java \
Sat Sep 29 00:43:45 2012 @@ -1749,7 +1749,8 @@ public class JavadocUtil
     {
         if ( StringUtils.isEmpty( str ) )
         {
-            return false;
+            // unnamed package is valid (even if bad practice :) )
+            return true;
         }
 
         int idx;

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java
                
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/ja \
va/org/apache/maven/plugin/javadoc/JavadocUtilTest.java?rev=1391706&r1=1391705&r2=1391706&view=diff
 ==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java \
                (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java \
Sat Sep 29 00:43:45 2012 @@ -298,6 +298,9 @@ public class JavadocUtilTest
             assertTrue( true );
         }
 
+        url = this.getClass().getResource( "/JavadocUtilTest-package-list.txt" \
).toURI().toURL(); +        assertTrue( JavadocUtil.isValidPackageList( url, \
settings, true ) ); +
         url = new URL( \
                "http://maven.apache.org/plugins/maven-javadoc-plugin/apidocs/package-list" \
                );
         assertTrue( JavadocUtil.isValidPackageList( url, settings, true ) );
 

Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/JavadocUtilTest-package-list.txt
                
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/JavadocUtilTest-package-list.txt?rev=1391706&view=auto
 ==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/JavadocUtilTest-package-list.txt \
                (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/JavadocUtilTest-package-list.txt \
Sat Sep 29 00:43:45 2012 @@ -0,0 +1,2 @@
+
+org.apache.maven.plugins.javadoc
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/JavadocUtilTest-package-list.txt
                
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/JavadocUtilTest-package-list.txt
                
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/JavadocUtilTest-package-list.txt
                
------------------------------------------------------------------------------
    svn:mime-type = text/plain


[prev in list] [next in list] [prev in thread] [next in thread]