svn commit: r1042228 - in /maven/plugins/trunk/maven-javadoc-plugin/src: main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java

Sat, 04 Dec 2010 11:47:15 -0800 

Author: hboutemy
Date: Sat Dec  4 19:45:40 2010
New Revision: 1042228

URL: http://svn.apache.org/viewvc?rev=1042228&view=rev
Log:
[MJAVADOC-300] changed API docs URL after Oracle's acquisition of Sun

Modified:
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.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=1042228&r1=1042227&r2=1042228&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 Dec  4 19:45:40 2010
@@ -151,19 +151,19 @@ public abstract class AbstractJavadocMoj
      * <javaApiLinks>
      *   <property>
      *     <name>api_1.3</name>
-     *     <value>http://java.sun.com/j2se/1.3/docs/api</value>
+     *     
<value>http://download.oracle.com/javase/1.3/docs/api/</value>
      *   </property>
      *   <property>
      *     <name>api_1.4</name>
-     *     <value>http://java.sun.com/j2se/1.4.2/docs/api/</value>
+     *     
<value>http://download.oracle.com/javase/1.4.2/docs/api/</value>
      *   </property>
      *   <property>
      *     <name>api_1.5</name>
-     *     <value>http://java.sun.com/j2se/1.5.0/docs/api/</value>
+     *     
<value>http://download.oracle.com/javase/1.5.0/docs/api/</value>
      *   </property>
      *   <property>
      *     <name>api_1.6</name>
-     *     <value>http://java.sun.com/javase/6/docs/api/</value>
+     *     
<value>http://download.oracle.com/javase/6/docs/api/</value>
      *   </property>
      * </javaApiLinks>
      * </pre>
@@ -520,7 +520,7 @@ public abstract class AbstractJavadocMoj
     private boolean detectOfflineLinks;
 
     /**
-     * Detect the Java API link for the current build, i.e. 
<code>http://java.sun.com/j2se/1.4.2/docs/api</code>
+     * Detect the Java API link for the current build, i.e. 
<code>http://download.oracle.com/javase/1.4.2/docs/api/</code>
      * for Java source 1.4.
      * <br/>
      * By default, the goal detects the Javadoc API link depending the value 
of the <code>source</code>
@@ -1651,10 +1651,10 @@ public abstract class AbstractJavadocMoj
 
     static
     {
-        DEFAULT_JAVA_API_LINKS.put( "api_1.3", 
"http://java.sun.com/j2se/1.3/docs/api"; );
-        DEFAULT_JAVA_API_LINKS.put( "api_1.4", 
"http://java.sun.com/j2se/1.4.2/docs/api/"; );
-        DEFAULT_JAVA_API_LINKS.put( "api_1.5", 
"http://java.sun.com/j2se/1.5.0/docs/api/"; );
-        DEFAULT_JAVA_API_LINKS.put( "api_1.6", 
"http://java.sun.com/javase/6/docs/api/"; );
+        DEFAULT_JAVA_API_LINKS.put( "api_1.3", 
"http://download.oracle.com/javase/1.3/docs/api/"; );
+        DEFAULT_JAVA_API_LINKS.put( "api_1.4", 
"http://download.oracle.com/javase/1.4.2/docs/api/"; );
+        DEFAULT_JAVA_API_LINKS.put( "api_1.5", 
"http://download.oracle.com/javase/1.5.0/docs/api/"; );
+        DEFAULT_JAVA_API_LINKS.put( "api_1.6", 
"http://download.oracle.com/javase/6/docs/api/"; );
     }
 
     // ----------------------------------------------------------------------

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java?rev=1042228&r1=1042227&r2=1042228&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
 Sat Dec  4 19:45:40 2010
@@ -426,12 +426,8 @@ public class JavadocReportTest
         }
 
         assertTrue( contentOptions != null );
-        if ( JavadocUtilTest.isWebSiteOnline( null, 
getContainer().getLogger(), "http://java.sun.com"; ) )
-        {
-            assertTrue( contentOptions.indexOf( "-link" ) != -1 );
-            assertTrue( contentOptions.indexOf( "http://java.sun.com/j2se/"; ) 
!= -1
-                || contentOptions.indexOf( "http://java.sun.com/javase/"; ) != 
-1 );
-        }
+        assertTrue( contentOptions.indexOf( "-link" ) != -1 );
+        assertTrue( contentOptions.indexOf( "http://java.sun.com/j2se/"; ) != 
-1 );
     }
 
     /**
@@ -936,8 +932,8 @@ public class JavadocReportTest
         File options = new File( getBasedir(), 
"target/test/unit/proxy-test/target/site/apidocs/options" );
         assertTrue( FileUtils.fileExists( options.getAbsolutePath() ) );
         String optionsContent = readFile( options );
-        // NO -link http://java.sun.com/j2se/1.5.0/docs/api/package-list
-        if ( JavadocUtilTest.isWebSiteOnline( null, 
getContainer().getLogger(), "http://java.sun.com"; ) )
+        // NO -link 
http://download.oracle.com/javase/1.5.0/docs/api/docs/api/package-list
+        if ( JavadocUtilTest.isWebSiteOnline( null, 
getContainer().getLogger(), "http://download.oracle.com/"; ) )
         {
             assertTrue( optionsContent.indexOf( "-link" ) == -1 );
         }
@@ -968,8 +964,8 @@ public class JavadocReportTest
             assertTrue( readed.indexOf( "-J-Dhttp.proxyPort=" + 
proxyServer.getPort() ) != -1 );
 
             optionsContent = readFile( options );
-            // -link http://java.sun.com/j2se/1.5.0/docs/api/package-list
-            if ( JavadocUtilTest.isWebSiteOnline( null, 
getContainer().getLogger(), "http://java.sun.com"; ) )
+            // -link 
http://download.oracle.com/javase/1.5.0/docs/api/package-list
+            if ( JavadocUtilTest.isWebSiteOnline( null, 
getContainer().getLogger(), "http://download.oracle.com/"; ) )
             {
                 assertTrue( optionsContent.indexOf( "-link" ) != -1 );
             }
@@ -1017,8 +1013,8 @@ public class JavadocReportTest
             assertTrue( readed.indexOf( "-J-Dhttp.proxyPassword=\\\"bar\\\"" ) 
!= -1 );
 
             optionsContent = readFile( options );
-            // -link http://java.sun.com/j2se/1.5.0/docs/api/package-list
-            if ( JavadocUtilTest.isWebSiteOnline( null, 
getContainer().getLogger(), "http://java.sun.com"; ) )
+            // -link 
http://download.oracle.com/javase/1.5.0/docs/api/docs/api/package-list
+            if ( JavadocUtilTest.isWebSiteOnline( null, 
getContainer().getLogger(), "http://download.oracle.com"; ) )
             {
                 assertTrue( optionsContent.indexOf( "-link" ) != -1 );
             }

Reply via email to