Mercurial > hg > openjdk > aarch64-port > langtools

changeset 2848:ac5998942806

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 22 Jan 2015 09:40:16 -0800
parents d8ce0450b95d (diff) 4392102958f5 (current diff)
children 1348999387c3
files .hgtags
diffstat 7 files changed, 16 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jan 12 15:11:18 2015 -0800
+++ b/.hgtags	Thu Jan 22 09:40:16 2015 -0800
@@ -372,6 +372,7 @@
 94f30e5fde53e3ddcd3c4e9842349318eae8fe10 jdk8u40-b18
 0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u40-b19
 c3d6d1a5339952fbe4124e700407b7211446c99c jdk8u40-b20
+9113c7c8d902ec94b28ca0ef4a6466bdba65fcfc jdk8u40-b21
 dbae37f50c43453f7d6f22d96adc8b5b6cd1e90d jdk8u45-b00
 244e6dc772877dfae6286530f58e11a210a48a3c jdk8u45-b01
 401ec76887623a29d3f868f9f9b18b42838d2e92 jdk8u45-b02
--- a/src/share/classes/com/sun/source/doctree/package-info.java	Mon Jan 12 15:11:18 2015 -0800
+++ b/src/share/classes/com/sun/source/doctree/package-info.java	Thu Jan 22 09:40:16 2015 -0800
@@ -29,7 +29,7 @@
  *
  * @author Jonathan Gibbons
  * @since 1.8
- * @see <a href="http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags">http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags</a>
+ * @see <a href="https://docs.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags">https://docs.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags</a>
  */
 @jdk.Exported
 package com.sun.source.doctree;
--- a/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java	Mon Jan 12 15:11:18 2015 -0800
+++ b/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java	Thu Jan 22 09:40:16 2015 -0800
@@ -29,7 +29,7 @@
 
 /**
  * See JVMS 4.7.21
- * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21
+ * https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java	Mon Jan 12 15:11:18 2015 -0800
+++ b/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java	Thu Jan 22 09:40:16 2015 -0800
@@ -1039,7 +1039,7 @@
     }
 
     /**
-     * @see <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a>
+     * @see <a href="https://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a>
      */
     private void initTagParsers() {
         TagParser[] parsers = {
--- a/src/share/classes/com/sun/tools/javac/util/Convert.java	Mon Jan 12 15:11:18 2015 -0800
+++ b/src/share/classes/com/sun/tools/javac/util/Convert.java	Thu Jan 22 09:40:16 2015 -0800
@@ -36,9 +36,9 @@
  *  <p>
  *  See also:
  *  <ul>
- *  <li><a href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.7">
+ *  <li><a href="https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.7">
  *    JVMS 4.4.7 </a></li>
- *  <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html#modified-utf-8">
+ *  <li><a href="https://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html#modified-utf-8">
       java.io.DataInput: Modified UTF-8 </a></li>
     <li><a href="https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8">
       Modified UTF-8 (wikipedia) </a></li>
--- a/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java	Mon Jan 12 15:11:18 2015 -0800
+++ b/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java	Thu Jan 22 09:40:16 2015 -0800
@@ -155,7 +155,7 @@
          * Tests if a given package name is exported.
          */
         public boolean isExportedPackage(String pn) {
-            if (Profile.getProfile(pn) != null) {
+            if (Profile.getProfile(pn) != null || "javax.jnlp".equals(pn)) {
                 return true;
             }
             return exportedPackages.containsKey(pn) ? exportedPackages.get(pn) : false;
--- a/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Mon Jan 12 15:11:18 2015 -0800
+++ b/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Thu Jan 22 09:40:16 2015 -0800
@@ -60,21 +60,21 @@
     };
     private static final String[][] NEGATED_TEST1 = {
         {BUG_ID + FS + "pkg1" + FS + "C1.html",
-            "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
+            "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">"
         },
         {BUG_ID + FS + "pkg1" + FS + "C1.html",
-            "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">"
+            "<a href=\"https://docs.oracle.com/javase/7/docs/pkg2/C2.html\">"
         },
         {BUG_ID + FS + "pkg1" + FS + "package-summary.html",
-            "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
+            "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">"
         },
         {BUG_ID + FS + "pkg1" + FS + "package-summary.html",
-            "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">"
+            "<a href=\"https://docs.oracle.com/javase/7/docs/pkg2/C2.html\">"
         }
     };
     private static final String[][] TEST2 = {
         {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
-            "Refer <a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>"
+            "Refer <a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>"
         },
         {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
             "This <a href=\"../pkg1/C1.html\">Here</a> should not be replaced" + NL +
@@ -85,7 +85,7 @@
             " <a href=\"../pkg1/C1.html\">Link 2</a>."
         },
         {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html",
-            "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL +
+            "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL +
             "            Test document 1</a>"
         },
         {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html",
@@ -100,13 +100,13 @@
             "<a href=\"../../technotes/guides/index.html\">"
         },
         {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
-            "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">"
+            "<a href=\"https://docs.oracle.com/javase/7/docs/pkg1/C1.html\">"
         },
         {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html",
             "<a href=\"../../technotes/guides/index.html\">"
         },
         {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html",
-            "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">"
+            "<a href=\"https://docs.oracle.com/javase/7/docs/pkg1/C1.html\">"
         }
     };
     private static final String[] ARGS1 =
@@ -115,7 +115,7 @@
     };
     private static final String[] ARGS2 =
             new String[]{
-        "-d", BUG_ID + "-1", "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2"
+        "-d", BUG_ID + "-1", "-Xdocrootparent", "https://docs.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2"
     };
 
     /**