Mercurial > jdk8-mips64-public > langtools / changeset
changeset
Merge
Thu, 17 Apr 2014 09:34:39 -0700
- author
- lana
- date
- Thu, 17 Apr 2014 09:34:39 -0700
- changeset 2363
- 7ad480b982bf
- parent 2361
- d75c4adbc698
- parent 2362
- 34f8ce53eac2
- child 2364
- e101a12a45a7
- child 2366
- 5b8151ede720
Merge
1.1 --- a/.hgtags Tue Apr 15 17:09:56 2014 -0400 1.2 +++ b/.hgtags Thu Apr 17 09:34:39 2014 -0700 1.3 @@ -253,6 +253,22 @@ 1.4 bb69217ed81202b1a490dc7150dc7cd073689341 jdk8-b127 1.5 09cdd3b493c0d13dc32206e5f12bb1a2f7465687 jdk8-b128 1.6 8fe7202d3c38784f3f14368e3954fc4e0394afa4 jdk8-b129 1.7 +9d81ae1c417a4748f58921c1f8def7f3c401cecd jdk8-b130 1.8 +196ab3dcbd28fac1578590684a337f1c7cf505c9 jdk8-b131 1.9 +c8a87a58eb3efdd64055566b502c9d4a72ca0996 jdk8-b132 1.10 +519557cab6d4a7fd77b33226e71f92303090420b jdk8u5-b01 1.11 +9003a59a512e6b764d8a3f805aadc3996a58e5bd jdk8u5-b02 1.12 +30e3dad0ebbdf3129bacd04a7f4cdecd3df92bb2 jdk8u5-b03 1.13 +019dcdfffced0ca2026a0ad8c0e5fcb49d46116f jdk8u5-b04 1.14 +c9db8c800797258540e0411e58b8f7d59273de5f jdk8u5-b05 1.15 +b1920c0b701d5ff219c9f622db5cafc9bf00d5c8 jdk8u5-b06 1.16 +180df7f2c078f1efaa6fcd8ca9f55dc5f81b182c jdk8u5-b07 1.17 +9c3d7d1a70391bd772693dc5a838b53e1cad0761 jdk8u5-b08 1.18 +169c8c1a2e8d1e80a4474d91f7809aa2a6b2249a jdk8u5-b09 1.19 +026543c71810701de08cdfd906d1b8fdc69b89c0 jdk8u5-b10 1.20 +a12055904afd9f951131804868215e724c71b684 jdk8u5-b11 1.21 +2a7002626e7997e946b96530629e2787bc1864bb jdk8u5-b12 1.22 +9beafb58fb99e8b5f7577b2f26b12743ef4d07e7 jdk8u5-b13 1.23 26b33a6ea08810853af37e81c9b435465b289c98 jdk8u20-b02 1.24 a07271bca831cf1bab35a2ffbcebd8e060b2734b jdk8u20-b03 1.25 613c1d9930c9f650e3fc6926215931a85b679c66 jdk8u20-b04 1.26 @@ -264,3 +280,4 @@ 1.27 1a57c569cb811a897691e42049eca33da8f8d761 jdk8u20-b07 1.28 0f821eb7e92b242c878dca68ef63f9626643ee8f jdk8u20-b08 1.29 aa0cb3af23d376e012a142b0531c4f42032fdacf jdk8u20-b09 1.30 +a0d9c18a1041c4217db9cda1817f0e348f1be885 jdk8u20-b10
2.1 --- a/THIRD_PARTY_README Tue Apr 15 17:09:56 2014 -0400 2.2 +++ b/THIRD_PARTY_README Thu Apr 17 09:34:39 2014 -0700 2.3 @@ -1399,13 +1399,13 @@ 2.4 2.5 ------------------------------------------------------------------------------- 2.6 2.7 -%% This notice is provided with respect to Little CMS 2.4, which may be 2.8 +%% This notice is provided with respect to Little CMS 2.5, which may be 2.9 included with JRE 8, JDK 8, and OpenJDK 8. 2.10 2.11 --- begin of LICENSE --- 2.12 2.13 Little CMS 2.14 -Copyright (c) 1998-2010 Marti Maria Saguer 2.15 +Copyright (c) 1998-2011 Marti Maria Saguer 2.16 2.17 Permission is hereby granted, free of charge, to any person obtaining a copy 2.18 of this software and associated documentation files (the "Software"), to deal
3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Tue Apr 15 17:09:56 2014 -0400 3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu Apr 17 09:34:39 2014 -0700 3.3 @@ -1,5 +1,5 @@ 3.4 /* 3.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 3.6 + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. 3.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 * 3.9 * This code is free software; you can redistribute it and/or modify it 3.10 @@ -247,7 +247,7 @@ 3.11 } else if (opt.equals("-doctitle")) { 3.12 doctitle = os[1]; 3.13 } else if (opt.equals("-windowtitle")) { 3.14 - windowtitle = os[1]; 3.15 + windowtitle = os[1].replaceAll("\\<.*?>", ""); 3.16 } else if (opt.equals("-top")) { 3.17 top = os[1]; 3.18 } else if (opt.equals("-bottom")) {
4.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Tue Apr 15 17:09:56 2014 -0400 4.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Thu Apr 17 09:34:39 2014 -0700 4.3 @@ -419,8 +419,6 @@ 4.4 4.5 compiler.err.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u5FC5\u8981\u3067\u3059 4.6 4.7 -compiler.err.intf.or.array.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u307E\u305F\u306F\u914D\u5217\u578B\u304C\u5FC5\u8981\u3067\u3059 4.8 - 4.9 compiler.err.intf.meth.cant.have.body=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 4.10 4.11 # 0: symbol
5.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Tue Apr 15 17:09:56 2014 -0400 5.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Thu Apr 17 09:34:39 2014 -0700 5.3 @@ -419,8 +419,6 @@ 5.4 5.5 compiler.err.intf.expected.here=\u6B64\u5904\u9700\u8981\u63A5\u53E3 5.6 5.7 -compiler.err.intf.or.array.expected.here=\u6B64\u5904\u9884\u671F\u4E3A\u63A5\u53E3\u6216\u6570\u7EC4\u7C7B\u578B 5.8 - 5.9 compiler.err.intf.meth.cant.have.body=\u63A5\u53E3\u62BD\u8C61\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53 5.10 5.11 # 0: symbol
6.1 --- a/src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties Tue Apr 15 17:09:56 2014 -0400 6.2 +++ b/src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties Thu Apr 17 09:34:39 2014 -0700 6.3 @@ -29,8 +29,11 @@ 6.4 6.5 main.opt.dotoutput=\ -dotoutput <dir> DOT\u30D5\u30A1\u30A4\u30EB\u51FA\u529B\u306E\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA 6.6 6.7 +main.opt.jdkinternals=\ -jdkinternals JDK\u5185\u90E8API\u306E\u30AF\u30E9\u30B9\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\u3002\n \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001-include\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u306A\u3044\u3068\u3001\n -classpath\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u5206\u6790\u3057\u307E\u3059\u3002\n \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F-p\u3001-e\u304A\u3088\u3073-s\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n \u8B66\u544A: JDK\u5185\u90E8API\u306F\u3001\u6B21\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u304F\u306A\u308B\u53EF\u80FD\u6027\u304C\n \u3042\u308A\u307E\u3059\u3002 6.8 + 6.9 main.opt.depth=\ -depth=<depth> \u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u5206\u6790\u306E\u6DF1\u3055\u3092\n \u6307\u5B9A\u3057\u307E\u3059 6.10 6.11 + 6.12 err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0} 6.13 err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093 6.14 err.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0} {1} {2}
7.1 --- a/src/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties Tue Apr 15 17:09:56 2014 -0400 7.2 +++ b/src/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties Thu Apr 17 09:34:39 2014 -0700 7.3 @@ -29,8 +29,11 @@ 7.4 7.5 main.opt.dotoutput=\ -dotoutput <dir> DOT \u6587\u4EF6\u8F93\u51FA\u7684\u76EE\u6807\u76EE\u5F55 7.6 7.7 +main.opt.jdkinternals=\ -jdkinternals \u5728 JDK \u5185\u90E8 API \u4E0A\u67E5\u627E\u7C7B\u7EA7\u522B\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n \u9ED8\u8BA4\u60C5\u51B5\u4E0B, \u5B83\u5206\u6790 -classpath \u4E0A\u7684\u6240\u6709\u7C7B\n \u548C\u8F93\u5165\u6587\u4EF6, \u9664\u975E\u6307\u5B9A\u4E86 -include \u9009\u9879\u3002\n \u6B64\u9009\u9879\u4E0D\u80FD\u4E0E -p, -e \u548C -s \u9009\u9879\u4E00\u8D77\u4F7F\u7528\u3002\n \u8B66\u544A: \u5728\u4E0B\u4E00\u4E2A\u53D1\u884C\u7248\u4E2D\u53EF\u80FD\u65E0\u6CD5\u8BBF\u95EE\n JDK \u5185\u90E8 API\u3002 7.8 + 7.9 main.opt.depth=\ -depth=<depth> \u6307\u5B9A\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5206\u6790\n \u7684\u6DF1\u5EA6 7.10 7.11 + 7.12 err.unknown.option=\u672A\u77E5\u9009\u9879: {0} 7.13 err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C 7.14 err.internal.error=\u5185\u90E8\u9519\u8BEF: {0} {1} {2}
8.1 --- a/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Tue Apr 15 17:09:56 2014 -0400 8.2 +++ b/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Thu Apr 17 09:34:39 2014 -0700 8.3 @@ -1,5 +1,5 @@ 8.4 /* 8.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 8.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. 8.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.8 * 8.9 * This code is free software; you can redistribute it and/or modify it 8.10 @@ -23,7 +23,7 @@ 8.11 8.12 /* 8.13 * @test 8.14 - * @bug 8016675 8.15 + * @bug 8016675 8026736 8.16 * @summary Test for window title. 8.17 * @author Bhavesh Patel 8.18 * @library ../lib/ 8.19 @@ -34,26 +34,153 @@ 8.20 public class TestWindowTitle extends JavadocTester { 8.21 8.22 private static final String BUG_ID = "8016675"; 8.23 - private static final String WIN_TITLE = 8.24 + //Window title with JavaScript special characters. 8.25 + private static final String TITLE_JS_CHARS = 8.26 "Testing \"Window 'Title'\" with a \\ backslash and a / " + 8.27 "forward slash and a \u00e8 unicode char also a tab and also a " + 8.28 "\t special character another \u0002 unicode)"; 8.29 - private static final String[][] TEST = { 8.30 - {BUG_ID + FS + "overview-summary.html", 8.31 + private static final String[] ARGS_JS_CHARS = new String[]{ 8.32 + "-d", BUG_ID + "-1", "-windowtitle", TITLE_JS_CHARS, "-sourcepath", SRC_DIR, "p1", "p2" 8.33 + }; 8.34 + private static final String[][] TEST_JS_CHARS = { 8.35 + {BUG_ID + "-1" + FS + "overview-summary.html", 8.36 "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" " + 8.37 "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char " + 8.38 "also a tab and also a \\t special character another \\u0002 unicode))\";" 8.39 }, 8.40 }; 8.41 - private static final String[][] NEG_TEST = { 8.42 - {BUG_ID + FS + "overview-summary.html", 8.43 + private static final String[][] NEG_TEST_JS_CHARS = { 8.44 + {BUG_ID + "-1" + FS + "overview-summary.html", 8.45 "parent.document.title=\"Overview (Testing \"Window \'Title\'\" " + 8.46 "with a \\ backslash and a / forward slash and a \u00E8 unicode char " + 8.47 "also a tab and also a \t special character another \u0002 unicode))\";" 8.48 + } 8.49 + }; 8.50 + 8.51 + //Window title with a script tag. 8.52 + private static final String TITLE_SCRIPT_TAG = 8.53 + "Testing script tag in title </title><script>alert(\"Should not pop up\")</script>."; 8.54 + private static final String[] ARGS_SCRIPT_TAG = new String[]{ 8.55 + "-d", BUG_ID + "-2", "-windowtitle", TITLE_SCRIPT_TAG, "-sourcepath", SRC_DIR, "p1", "p2" 8.56 + }; 8.57 + private static final String[][] TEST_SCRIPT_TAG = { 8.58 + {BUG_ID + "-2" + FS + "overview-summary.html", 8.59 + "parent.document.title=\"Overview (Testing script tag in title alert" + 8.60 + "(\\\"Should not pop up\\\").)\";" 8.61 }, 8.62 + {BUG_ID + "-2" + FS + "p2" + FS + "C2.html", 8.63 + "parent.document.title=\"C2 (Testing script tag in title alert" + 8.64 + "(\\\"Should not pop up\\\").)\";" 8.65 + } 8.66 }; 8.67 - private static final String[] ARGS = new String[]{ 8.68 - "-d", BUG_ID, "-windowtitle", WIN_TITLE, "-sourcepath", SRC_DIR, "p1", "p2" 8.69 + private static final String[][] NEG_TEST_SCRIPT_TAG = { 8.70 + {BUG_ID + "-2" + FS + "overview-summary.html", 8.71 + "parent.document.title=\"Overview (Testing script tag in title </title><script>" + 8.72 + "alert(\\\"Should not pop up\\\")</script>.)\";" 8.73 + }, 8.74 + {BUG_ID + "-2" + FS + "p2" + FS + "C2.html", 8.75 + "parent.document.title=\"C2 (Testing script tag in title </title><script>" + 8.76 + "alert(\\\"Should not pop up\\\")</script>.)\";" 8.77 + } 8.78 + }; 8.79 + 8.80 + //Window title with other HTML tags. 8.81 + private static final String TITLE_HTML_TAGS = 8.82 + "Testing another <p>HTML</p> tag. Another <h1>tag</h1>. A " + 8.83 + "<span id=\"testTag\">tag with attributes</span>. <script and </p are not tags."; 8.84 + private static final String[] ARGS_HTML_TAGS = new String[]{ 8.85 + "-d", BUG_ID + "-3", "-windowtitle", TITLE_HTML_TAGS, "-sourcepath", SRC_DIR, "p1", "p2" 8.86 + }; 8.87 + private static final String[][] TEST_HTML_TAGS = { 8.88 + {BUG_ID + "-3" + FS + "overview-summary.html", 8.89 + "parent.document.title=\"Overview (Testing another HTML tag. Another tag. A " + 8.90 + "tag with attributes. <script and </p are not tags.)\";" 8.91 + } 8.92 + }; 8.93 + private static final String[][] NEG_TEST_HTML_TAGS = { 8.94 + {BUG_ID + "-3" + FS + "overview-summary.html", 8.95 + "parent.document.title=\"Overview (Testing another <p>HTML</p> tag. Another " + 8.96 + "<h1>tag</h1>. A <span id=\"testTag\">tag with attributes</span>. <script and " + 8.97 + "</p are not tags.)\";" 8.98 + } 8.99 + }; 8.100 + 8.101 + //Window title using entities. 8.102 + private static final String TITLE_HTML_ENTITIES = 8.103 + "Testing entities <script>alert(\"Should not pop up\")</script>."; 8.104 + private static final String[] ARGS_HTML_ENTITIES = new String[]{ 8.105 + "-d", BUG_ID + "-4", "-windowtitle", TITLE_HTML_ENTITIES, "-sourcepath", SRC_DIR, "p1", "p2" 8.106 + }; 8.107 + private static final String[][] TEST_HTML_ENTITIES = { 8.108 + {BUG_ID + "-4" + FS + "overview-summary.html", 8.109 + "parent.document.title=\"Overview (Testing entities <script>alert(\\\"Should " + 8.110 + "not pop up\\\")</script>.)\";" 8.111 + } 8.112 + }; 8.113 + private static final String[][] NEG_TEST_HTML_ENTITIES = { 8.114 + {BUG_ID + "-4" + FS + "overview-summary.html", 8.115 + "parent.document.title=\"Overview (Testing entities alert(\\\"Should not pop up\\\").)\";" 8.116 + } 8.117 + }; 8.118 + 8.119 + //Window title with just empty HTML tags. 8.120 + private static final String TITLE_EMPTY_TAGS = 8.121 + "</title><script></script>"; 8.122 + private static final String[] ARGS_EMPTY_TAGS = new String[]{ 8.123 + "-d", BUG_ID + "-5", "-windowtitle", TITLE_EMPTY_TAGS, "-sourcepath", SRC_DIR, "p1", "p2" 8.124 + }; 8.125 + private static final String[][] TEST_EMPTY_TAGS = { 8.126 + {BUG_ID + "-5" + FS + "overview-summary.html", 8.127 + "parent.document.title=\"Overview\";" 8.128 + } 8.129 + }; 8.130 + private static final String[][] NEG_TEST_EMPTY_TAGS = { 8.131 + {BUG_ID + "-5" + FS + "overview-summary.html", 8.132 + "parent.document.title=\"Overview (</title><script></script>)\";" 8.133 + } 8.134 + }; 8.135 + 8.136 + //Window title with unicode characters. 8.137 + private static final String TITLE_UNICODE_CHARS = 8.138 + "Testing unicode \u003cscript\u003ealert(\"Should not pop up\")\u003c/script\u003e."; 8.139 + private static final String[] ARGS_UNICODE_CHARS = new String[]{ 8.140 + "-d", BUG_ID + "-6", "-windowtitle", TITLE_UNICODE_CHARS, "-sourcepath", SRC_DIR, "p1", "p2" 8.141 + }; 8.142 + private static final String[][] TEST_UNICODE_CHARS = { 8.143 + {BUG_ID + "-6" + FS + "overview-summary.html", 8.144 + "parent.document.title=\"Overview (Testing unicode alert(\\\"Should " + 8.145 + "not pop up\\\").)\";" 8.146 + } 8.147 + }; 8.148 + private static final String[][] NEG_TEST_UNICODE_CHARS = { 8.149 + {BUG_ID + "-6" + FS + "overview-summary.html", 8.150 + "parent.document.title=\"Overview (Testing unicode <script>alert(\\\"Should not pop up\\\")" + 8.151 + "</script>.)\";" 8.152 + } 8.153 + }; 8.154 + 8.155 + //An empty window title. 8.156 + private static final String TITLE_EMPTY = 8.157 + ""; 8.158 + private static final String[] ARGS_EMPTY_TITLE = new String[]{ 8.159 + "-d", BUG_ID + "-7", "-windowtitle", TITLE_EMPTY, "-sourcepath", SRC_DIR, "p1", "p2" 8.160 + }; 8.161 + private static final String[][] TEST_EMPTY = { 8.162 + {BUG_ID + "-7" + FS + "overview-summary.html", 8.163 + "parent.document.title=\"Overview\";" 8.164 + } 8.165 + }; 8.166 + 8.167 + //Test doctitle. 8.168 + private static final String[] ARGS_DOCTITLE = new String[]{ 8.169 + "-d", BUG_ID + "-8", "-doctitle", TITLE_JS_CHARS, "-sourcepath", SRC_DIR, "p1", "p2" 8.170 + }; 8.171 + private static final String[][] NEG_TEST_DOCTITLE = { 8.172 + {BUG_ID + "-8" + FS + "overview-summary.html", 8.173 + "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" " + 8.174 + "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char " + 8.175 + "also a tab and also a \\t special character another \\u0002 unicode)\";" 8.176 + }, 8.177 }; 8.178 8.179 /** 8.180 @@ -62,7 +189,14 @@ 8.181 */ 8.182 public static void main(String[] args) { 8.183 TestWindowTitle tester = new TestWindowTitle(); 8.184 - run(tester, ARGS, TEST, NEG_TEST); 8.185 + run(tester, ARGS_JS_CHARS, TEST_JS_CHARS, NEG_TEST_JS_CHARS); 8.186 + run(tester, ARGS_SCRIPT_TAG, TEST_SCRIPT_TAG, NEG_TEST_SCRIPT_TAG); 8.187 + run(tester, ARGS_HTML_TAGS, TEST_HTML_TAGS, NEG_TEST_HTML_TAGS); 8.188 + run(tester, ARGS_HTML_ENTITIES, TEST_HTML_ENTITIES, NEG_TEST_HTML_ENTITIES); 8.189 + run(tester, ARGS_EMPTY_TAGS, TEST_EMPTY_TAGS, NEG_TEST_EMPTY_TAGS); 8.190 + run(tester, ARGS_UNICODE_CHARS, TEST_UNICODE_CHARS, NEG_TEST_UNICODE_CHARS); 8.191 + run(tester, ARGS_EMPTY_TITLE, TEST_EMPTY, NO_TEST); 8.192 + run(tester, ARGS_DOCTITLE, NO_TEST, NEG_TEST_DOCTITLE); 8.193 tester.printSummary(); 8.194 } 8.195
