/hg/icedtea8-forest/langtools: 36 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jan 25 07:09:28 UTC 2017
changeset 0516014fa89f in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=0516014fa89f
author: asaha
date: Fri Sep 30 11:14:10 2016 -0700
Added tag jdk8u112-b16 for changeset ee37eafc48cb
changeset 7b6c1bfeeb03 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7b6c1bfeeb03
author: asaha
date: Tue Jul 12 14:52:08 2016 -0700
Added tag jdk8u121-b00 for changeset 5710d574a99a
changeset 6f0746b6de9f in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=6f0746b6de9f
author: aefimov
date: Mon Jul 18 23:53:12 2016 +0300
8138725: Add options for Javadoc generation
Reviewed-by: jjg
changeset e3d17d092a61 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=e3d17d092a61
author: asaha
date: Mon Aug 08 15:40:58 2016 -0700
Merge
changeset 19a21c4d3705 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=19a21c4d3705
author: asaha
date: Tue Aug 16 13:37:18 2016 -0700
Merge
changeset 3d4b72198b23 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=3d4b72198b23
author: asaha
date: Tue Aug 02 08:04:11 2016 -0700
Added tag jdk8u102-b32 for changeset 1b511d4e93e7
changeset 8bde2f8474d3 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=8bde2f8474d3
author: asaha
date: Tue Aug 16 21:41:19 2016 -0700
Added tag jdk8u102-b33 for changeset 3d4b72198b23
changeset 2bcef3a28991 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=2bcef3a28991
author: asaha
date: Tue Aug 30 13:24:32 2016 -0700
Merge
changeset 720d0f9b06ba in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=720d0f9b06ba
author: asaha
date: Tue Aug 30 13:53:14 2016 -0700
Merge
changeset 3da248bb28be in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=3da248bb28be
author: asaha
date: Thu Sep 08 14:39:35 2016 -0700
Merge
changeset ab5d32d8cf5f in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=ab5d32d8cf5f
author: asaha
date: Thu Sep 08 15:35:21 2016 -0700
Merge
changeset e260d46661d2 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=e260d46661d2
author: asaha
date: Mon Sep 19 13:01:10 2016 -0700
Added tag jdk8u121-b01 for changeset ab5d32d8cf5f
changeset ff6dc79afab7 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=ff6dc79afab7
author: asaha
date: Mon Sep 26 14:38:12 2016 -0700
Added tag jdk8u121-b02 for changeset e260d46661d2
changeset e64f16f8a585 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=e64f16f8a585
author: asaha
date: Thu Sep 15 09:08:45 2016 -0700
Added tag jdk8u102-b34 for changeset 8bde2f8474d3
changeset 2b0dc1e2d28c in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=2b0dc1e2d28c
author: asaha
date: Mon Sep 19 09:50:03 2016 -0700
Merge
changeset 0353aa2fc746 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=0353aa2fc746
author: asaha
date: Mon Oct 03 08:08:11 2016 -0700
Merge
changeset 91a7256a6ff0 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=91a7256a6ff0
author: asaha
date: Tue Sep 27 09:25:36 2016 -0700
Added tag jdk8u102-b35 for changeset e64f16f8a585
changeset de1c3df992ad in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=de1c3df992ad
author: asaha
date: Mon Oct 03 08:36:22 2016 -0700
Merge
changeset 0acfd50d67d9 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=0acfd50d67d9
author: asaha
date: Mon Oct 03 08:48:12 2016 -0700
Merge
changeset 29a08aff0608 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=29a08aff0608
author: asaha
date: Mon Oct 03 11:11:34 2016 -0700
Added tag jdk8u121-b03 for changeset 0acfd50d67d9
changeset 8b331e7199f7 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=8b331e7199f7
author: asaha
date: Tue Oct 11 12:03:42 2016 -0700
Added tag jdk8u121-b04 for changeset 29a08aff0608
changeset c94fd1b737d0 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=c94fd1b737d0
author: asaha
date: Mon Oct 17 10:04:44 2016 -0700
Added tag jdk8u112-b31 for changeset de1c3df992ad
changeset a933635275c3 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=a933635275c3
author: asaha
date: Mon Oct 17 10:36:43 2016 -0700
Merge
changeset dc1dd2e6cf8e in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=dc1dd2e6cf8e
author: asaha
date: Mon Oct 17 12:44:55 2016 -0700
Added tag jdk8u121-b05 for changeset a933635275c3
changeset 6cd0cd4078e9 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=6cd0cd4078e9
author: asaha
date: Mon Oct 24 12:29:21 2016 -0700
Added tag jdk8u121-b06 for changeset dc1dd2e6cf8e
changeset b5d0109fb24a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b5d0109fb24a
author: asaha
date: Tue Nov 01 16:15:34 2016 -0700
Added tag jdk8u121-b07 for changeset 6cd0cd4078e9
changeset 8efc10efbfe1 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=8efc10efbfe1
author: asaha
date: Tue Nov 01 23:55:58 2016 -0700
8168993: JDK8u121 L10n resource file update
Reviewed-by: coffeys
Contributed-by: li.jiang at oracle.com
changeset 57a26fe61f2b in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=57a26fe61f2b
author: asaha
date: Tue Nov 08 09:49:43 2016 -0800
Added tag jdk8u121-b08 for changeset 8efc10efbfe1
changeset 53c94a674d60 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=53c94a674d60
author: asaha
date: Mon Nov 14 12:07:54 2016 -0800
Added tag jdk8u121-b09 for changeset 57a26fe61f2b
changeset 5341626bc939 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=5341626bc939
author: asaha
date: Mon Nov 21 12:24:11 2016 -0800
Added tag jdk8u121-b10 for changeset 53c94a674d60
changeset b634abfcd98f in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b634abfcd98f
author: asaha
date: Wed Nov 23 00:35:47 2016 -0800
8170268: 8u121 L10n resource file update - msgdrop 20
Reviewed-by: coffeys
Contributed-by: li.jiang at oracle.com
changeset 7fc347da372c in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7fc347da372c
author: asaha
date: Mon Nov 28 13:53:32 2016 -0800
Added tag jdk8u121-b11 for changeset b634abfcd98f
changeset f634736433d9 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f634736433d9
author: asaha
date: Mon Dec 05 13:11:48 2016 -0800
Added tag jdk8u121-b12 for changeset 7fc347da372c
changeset 26a274d91ee6 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=26a274d91ee6
author: andrew
date: Mon Jan 23 16:30:40 2017 +0000
Merge jdk8u121-b13
changeset d10a13bdc98c in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d10a13bdc98c
author: andrew
date: Tue Jan 24 20:01:21 2017 +0000
Added tag icedtea-3.3.0pre02 for changeset 26a274d91ee6
changeset c340c18278db in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=c340c18278db
author: andrew
date: Wed Jan 25 07:14:14 2017 +0000
Added tag icedtea-3.3.0 for changeset d10a13bdc98c
diffstat:
.hgtags | 46 +
.jcheck/conf | 2 -
make/BuildLangtools.gmk | 4 +-
make/build.xml | 2 +-
src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java | 44 +-
src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java | 4 +-
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java | 9 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java | 4 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java | 11 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties | 2 +
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties | 1 +
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties | 1 +
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/FatalError.java | 39 +
src/share/classes/com/sun/tools/doclint/Checker.java | 49 +-
src/share/classes/com/sun/tools/doclint/HtmlTag.java | 5 +-
src/share/classes/com/sun/tools/javac/parser/JavacParser.java | 4 +-
src/share/classes/com/sun/tools/javadoc/DocEnv.java | 14 +-
src/share/classes/com/sun/tools/javadoc/DocImpl.java | 12 +-
src/share/classes/com/sun/tools/javadoc/JavaScriptScanner.java | 1103 ++++++++++
src/share/classes/com/sun/tools/javadoc/RootDocImpl.java | 6 +-
src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties | 4 +-
src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties | 3 +-
src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties | 3 +-
test/tools/doclint/html/OtherTagsTest.out | 5 +-
test/tools/javadoc/TestScriptInComment.java | 314 ++
25 files changed, 1646 insertions(+), 45 deletions(-)
diffs (truncated from 2181 to 500 lines):
diff -r ee37eafc48cb -r c340c18278db .hgtags
--- a/.hgtags Thu Sep 22 13:18:42 2016 -0700
+++ b/.hgtags Wed Jan 25 07:14:14 2017 +0000
@@ -50,6 +50,7 @@
9596dff460935f09684c11d156ce591f92584f0d jdk7-b73
1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74
2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75
+83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12
8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76
0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77
acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
@@ -63,6 +64,7 @@
ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86
409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87
f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88
+681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13
6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89
71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90
97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91
@@ -111,6 +113,7 @@
3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134
9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135
ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136
+8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14
a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137
53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
@@ -295,6 +298,7 @@
1a57c569cb811a897691e42049eca33da8f8d761 jdk8u20-b07
0f821eb7e92b242c878dca68ef63f9626643ee8f jdk8u20-b08
aa0cb3af23d376e012a142b0531c4f42032fdacf jdk8u20-b09
+dd7b57ab4ab1a4bb93c543af3a13f66fe85a7802 icedtea-3.0.0pre01
a0d9c18a1041c4217db9cda1817f0e348f1be885 jdk8u20-b10
7ad480b982bf95b8a7290c8769b2698f6aacaf6b jdk8u20-b11
e101a12a45a777268a2e729803499a7514255e5b jdk8u20-b12
@@ -308,6 +312,7 @@
e92effa22ecee1cb9965c278e45e2b1a6fbe0766 jdk8u20-b20
7de1481c6cd88b42d815ae65e2d5b1cd918e11d1 jdk8u20-b21
61fb0d8b169164ad5db15b6c497489cb30efb9c6 jdk8u20-b22
+948daf9c5e22c99a8c4d26d7956d9b55b888ab08 icedtea-3.0.0pre02
5c1d6da1445aa3a2e5cf6101c70e79bfbe2745a5 jdk8u20-b23
9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b24
9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b25
@@ -375,6 +380,9 @@
94f30e5fde53e3ddcd3c4e9842349318eae8fe10 jdk8u40-b18
0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u40-b19
c3d6d1a5339952fbe4124e700407b7211446c99c jdk8u40-b20
+0d5d2b8411d9c36f180c6d0d3029629fa2070018 icedtea-3.0.0pre03
+66f265db6f474faba47a35888ca9131562fd59a1 icedtea-3.0.0pre04
+811deb5a72d392f846f0ab4e38d4ee392e9553cf icedtea-3.0.0pre05
9113c7c8d902ec94b28ca0ef4a6466bdba65fcfc jdk8u40-b21
79177246b3dbe5296fb53755d8695acdaef59fc8 jdk8u40-b22
fb294b49373bda0b3afc7f011d64ecefed73b42e jdk8u40-b23
@@ -453,6 +461,9 @@
97328f3e2aa2c713931edf471270a1208980b963 jdk8u60-b21
d1febf79ce5ea41fb4b818ffd3589cf923e6de5f jdk8u60-b22
7f88b5dc78cebc2c5ebb716938fd9a7632b052b2 jdk8u60-b23
+69b782e543d54118f9354b6071830de5feb96b83 icedtea-3.0.0pre06
+3c76eafe1b7010bf5536add7097c318d349efb16 icedtea-3.0.0pre07
+0d3479e0bac61b3fab0f8e884fc6bda8f8f351a5 icedtea-3.0.0pre08
2af11e10da7dc24610551bbeed02c4ca3f4ae654 jdk8u60-b24
8d152d1e45944616309886e730ffcbfb5c078d22 jdk8u60-b25
3876ab6f471b85a02bb2cdaca00652f169f9e27a jdk8u60-b26
@@ -535,6 +546,7 @@
5218bea65fe64b31cf201f3f6dd0310b74acec1e jdk8u72-b12
5b67278c6616dca433488697eb6f2f81fcbbf22d jdk8u72-b13
0ee6d8ae247d449950c18623513ccae4349e70d6 jdk8u72-b14
+076ec0ef64f0b4d71419e99ca2666ca814b508ad icedtea-3.0.0pre09
48d0c20256a37ad20d075091285ea23788186f9a jdk8u72-b15
ee6ec29fce4fa75ff846f7cbf61da162d8c5b605 jdk8u72-b31
1a1711b8d11959992c27462d652003965ef3dc36 jdk8u73-b00
@@ -570,6 +582,9 @@
ae2485fab956c636f6ce10a23812204c0ae17046 jdk8u77-b00
37a348477fe89736549913f51ec8143a8e73f71c jdk8u77-b01
47efac0d67984678edf626f407b3d3e54083c242 jdk8u77-b02
+d6b6666581f91588b9c66cadaaddadbe7266d78b icedtea-3.0.0pre10
+dd581e8047e6f15c811b345ed4eef0218ca9fe18 icedtea-3.0.0
+d05b69482d8390591cf8a1ebf9166ba46259bebd icedtea-3.0-branchpoint
094308b2ca1c6d6dd76d9412799b9f3b4299acb5 jdk8u77-b03
837f6e6559d578fadecb4932f3ceedfc31681bca jdk8u77-b31
4cbd08688ff5a39f936edf16dd765d1efa13d030 jdk8u91-b00
@@ -591,6 +606,10 @@
b86071b48b55340a3e712e91b2ba203a55a79571 jdk8u76-b12
db821ed6165c5080b09e829b4523dcf82d995a2f jdk8u92-b00
12846c3fc5a151a33e9446eff6e6704110c00362 jdk8u92-b13
+f3a9ed2cc7219a2b9b0cfd11729bbd0ef798e7ee icedtea-3.1.0pre01
+dbf29857221f4aa707e3a7acf850b06e690bcc01 icedtea-3.1.0pre02
+ff680965fa8c23cdafdd1028e1f33d0f351ad079 icedtea-3.1.0pre03
+fc69984700e156fe3290daea69e2d2ecc8acccaf icedtea-3.1.0pre04
c99c71a68555038fdd1e86a10dab9c9007ec3745 jdk8u92-b14
71176efa69475fc737d1245a28e739ddf105fd1c jdk8u92-b31
4e8ce6c84e4ca9dd385012c10e059c15dbfcc468 jdk8u92-b32
@@ -609,6 +628,8 @@
20f3856902a522f01b28aa2aa38701606af83ab8 jdk8u101-b10
5cc23fe55ff4c64838e2335644b674bdd0888340 jdk8u101-b11
0cef544b9eee7042001a2b7f5f9e8a48ef20d779 jdk8u101-b12
+05822f2e947be716d90fa20335b57c9ce5ee62aa icedtea-3.1.0
+88f7b4f1b721ab67ca4cd72e691d2f6c7a72c64b icedtea-3.2.0pre01
8dc8f71216bf40c259bb4127270922fb6a6ca293 jdk8u101-b13
10ffafaf53404de7fd23784aa3ff6016d107b9c8 jdk8u76-b00
0caab0d65a04d8cce71976a6bdc1ca0841bcbcf0 jdk8u76-b01
@@ -630,8 +651,14 @@
592d155cc1332eba606900a7273863c74ef082a4 jdk8u102-b11
16c58d7af5a4937e46bccd58114a56a7ffcd685c jdk8u102-b12
56b0df415b570e31dc0b97d4a1c8f28b85240089 jdk8u102-b13
+19ea84ae4992037367f85aadb746279ab489422a icedtea-3.2.0pre02
+5665ca5e1896dcf47faa2c5c50d1130b8b783944 icedtea-3.2.0pre03
0549bf2f507dae59bfcd7d11e038cdc62376fee7 jdk8u102-b14
d86027f25a9aa960d69cf3a524588a873ae888f5 jdk8u102-b31
+1b511d4e93e7128ccb7100110ab6604eb2838afa jdk8u102-b32
+3d4b72198b23108f93ccf36b8d9275cc3b40ee1e jdk8u102-b33
+8bde2f8474d372de6a3425affd38de506aa56a51 jdk8u102-b34
+e64f16f8a585332086127b4f24b79e6c83bee530 jdk8u102-b35
90f493bfe1faca0573844fdd2497070c8b224d76 jdk8u111-b00
085fd7e08f4855f134a8048251c4535ddde1feee jdk8u111-b01
f66a535fb6b3b41419c987cc90407507a64712b2 jdk8u111-b02
@@ -646,6 +673,7 @@
f51f1b8a7b58355c11392effdf0e4f738a79a8ad jdk8u111-b11
8e5e70b9cff8f928d28db4890d4e5905a739d210 jdk8u111-b12
ef3134b243da77d0aed9f3cef2b3855c3be2111a jdk8u111-b13
+a553c153d37671a371767229c71189d963964996 icedtea-3.2.0
0e2e745ed6d7bb8a2233e83f4bad40e793a16949 jdk8u111-b14
27503e49de52b54dde3a12af28e2d2de473192b3 jdk8u112-b00
60a0572cd449e33b7d48b5a40065222ab5accd36 jdk8u112-b01
@@ -662,3 +690,21 @@
04d857308b8c3db33e8fd4099c3a3dd5d50cdaeb jdk8u112-b13
b353281f73db9617d993353e468342d3420c29f1 jdk8u112-b14
6116c6644be0c85556931aaeb9b4f2dbc9c79157 jdk8u112-b15
+ee37eafc48cb6fb20cb6c1e31cfecfe1ccc800da jdk8u112-b16
+3ab9841babb7f624ae830024e42e75344a4fed5a icedtea-3.3.0pre01
+de1c3df992adb0c704005583210d1ed6dac758cd jdk8u112-b31
+5710d574a99aeff3600c49a4aed34fa1b373f7b8 jdk8u121-b00
+ab5d32d8cf5f6d81482692f801385a869b2d83c1 jdk8u121-b01
+e260d46661d2da3ede78aae434d5420acce99950 jdk8u121-b02
+0acfd50d67d98259a25fbd51129b763bab56d068 jdk8u121-b03
+29a08aff06088cad98dafddef7628b51e324fcae jdk8u121-b04
+a933635275c33e37c9403767d600a12b9ee71df7 jdk8u121-b05
+dc1dd2e6cf8e094c4a8437d54ebc7bac1f7ab964 jdk8u121-b06
+6cd0cd4078e9ec8ad9fa167cabf9c671ed21fc66 jdk8u121-b07
+8efc10efbfe137ed5de6bf55875fdafd25bb6a1b jdk8u121-b08
+57a26fe61f2b435332c0697e92965a22246cd143 jdk8u121-b09
+53c94a674d6076ff390c62a7682ea0e87a893cdc jdk8u121-b10
+b634abfcd98fb8b201da9208e398ea17cabd2b32 jdk8u121-b11
+7fc347da372c8c4e5530a7fa32084b5dbc4ee8b6 jdk8u121-b12
+26a274d91ee67eb2f029da07676bacc8af09f93b icedtea-3.3.0pre02
+d10a13bdc98ca6a44ef27059c8403162a7059197 icedtea-3.3.0
diff -r ee37eafc48cb -r c340c18278db .jcheck/conf
--- a/.jcheck/conf Thu Sep 22 13:18:42 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup
diff -r ee37eafc48cb -r c340c18278db make/BuildLangtools.gmk
--- a/make/BuildLangtools.gmk Thu Sep 22 13:18:42 2016 -0700
+++ b/make/BuildLangtools.gmk Wed Jan 25 07:14:14 2017 +0000
@@ -36,7 +36,7 @@
JAVAC := $(JAVAC), \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA), \
- FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
+ FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation $(JAVAC_WERROR)))
# javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
RESOURCE_SUFFIXES := .gif .xml .css .js javax.tools.JavaCompilerTool
@@ -175,7 +175,7 @@
JAVAC := "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
-cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
com.sun.tools.javac.Main, \
- FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror, \
+ FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation $(JAVAC_WERROR), \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
diff -r ee37eafc48cb -r c340c18278db make/build.xml
--- a/make/build.xml Thu Sep 22 13:18:42 2016 -0700
+++ b/make/build.xml Wed Jan 25 07:14:14 2017 +0000
@@ -1027,7 +1027,7 @@
</javac>
<taskdef name="genstubs"
classname="anttasks.GenStubsTask"
- classpath="${build.toolclasses.dir}/"/>
+ classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
</target>
<target name="-def-javadoc-tool" depends="-check-target.java.home">
diff -r ee37eafc48cb -r c340c18278db src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu Sep 22 13:18:42 2016 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Wed Jan 25 07:14:14 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.StringUtils;
+import com.sun.tools.javadoc.JavaScriptScanner;
import com.sun.tools.javadoc.RootDocImpl;
/**
@@ -181,6 +182,11 @@
public Set<String> doclintOpts = new LinkedHashSet<String>();
/**
+ * Whether or not to check for JavaScript in doc comments.
+ */
+ private boolean allowScriptInComments;
+
+ /**
* Unique Resource Handler for this package.
*/
public final MessageRetriever standardmessage;
@@ -283,8 +289,11 @@
doclintOpts.add(null);
} else if (opt.startsWith("-xdoclint:")) {
doclintOpts.add(opt.substring(opt.indexOf(":") + 1));
+ } else if (opt.equals("--allow-script-in-comments")) {
+ allowScriptInComments = true;
}
}
+
if (root.specifiedClasses().length > 0) {
Map<String,PackageDoc> map = new HashMap<String,PackageDoc>();
PackageDoc pd;
@@ -301,9 +310,30 @@
if (root instanceof RootDocImpl) {
((RootDocImpl) root).initDocLint(doclintOpts, tagletManager.getCustomTagNames());
+ JavaScriptScanner jss = ((RootDocImpl) root).initJavaScriptScanner(isAllowScriptInComments());
+ if (jss != null) {
+ // In a more object-oriented world, this would be done by methods on the Option objects.
+ // Note that -windowtitle silently removes any and all HTML elements, and so does not need
+ // to be handled here.
+ checkJavaScript(jss, "-header", header);
+ checkJavaScript(jss, "-footer", footer);
+ checkJavaScript(jss, "-top", top);
+ checkJavaScript(jss, "-bottom", bottom);
+ checkJavaScript(jss, "-doctitle", doctitle);
+ checkJavaScript(jss, "-packagesheader", packagesheader);
+ }
}
}
+ private void checkJavaScript(JavaScriptScanner jss, final String opt, String value) {
+ jss.parse(value, new JavaScriptScanner.Reporter() {
+ public void report() {
+ root.printError(getText("doclet.JavaScript_in_option", opt));
+ throw new FatalError();
+ }
+ });
+ }
+
/**
* Returns the "length" of a given option. If an option takes no
* arguments, its length is one. If it takes one argument, it's
@@ -337,7 +367,8 @@
option.equals("-nonavbar") ||
option.equals("-nooverview") ||
option.equals("-xdoclint") ||
- option.startsWith("-xdoclint:")) {
+ option.startsWith("-xdoclint:") ||
+ option.equals("--allow-script-in-comments")) {
return 1;
} else if (option.equals("-help")) {
// Uugh: first, this should not be hidden inside optionLength,
@@ -595,4 +626,13 @@
public Content newContent() {
return new ContentBuilder();
}
+
+ /**
+ * Returns whether or not to allow JavaScript in comments.
+ * Default is off; can be set true from a command line option.
+ * @return the allowScriptInComments
+ */
+ public boolean isAllowScriptInComments() {
+ return allowScriptInComments;
+ }
}
diff -r ee37eafc48cb -r c340c18278db src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Thu Sep 22 13:18:42 2016 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Wed Jan 25 07:14:14 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -190,6 +190,8 @@
}
} catch (IOException e) {
throw new DocletAbortException(e);
+ } catch (FatalError fe) {
+ throw fe;
} catch (DocletAbortException de) {
throw de;
} catch (Exception e) {
diff -r ee37eafc48cb -r c340c18278db src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Thu Sep 22 13:18:42 2016 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed Jan 25 07:14:14 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -164,7 +164,9 @@
public final Content descfrmInterfaceLabel;
- private final Writer writer;
+ private final DocFile file;
+
+ private Writer writer;
private Content script;
@@ -180,7 +182,7 @@
*/
public HtmlWriter(Configuration configuration, DocPath path)
throws IOException, UnsupportedEncodingException {
- writer = DocFile.createFileForOutput(configuration, path).openWriter();
+ file = DocFile.createFileForOutput(configuration, path);
this.configuration = configuration;
this.memberDetailsListPrinted = false;
profileTableHeader = new String[] {
@@ -239,6 +241,7 @@
}
public void write(Content c) throws IOException {
+ writer = file.openWriter();
c.write(writer, true);
}
diff -r ee37eafc48cb -r c340c18278db src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java Thu Sep 22 13:18:42 2016 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java Wed Jan 25 07:14:14 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -83,6 +83,8 @@
} catch (Configuration.Fault f) {
root.printError(f.getMessage());
return false;
+ } catch (FatalError fe) {
+ return false;
} catch (DocletAbortException e) {
Throwable cause = e.getCause();
if (cause != null) {
diff -r ee37eafc48cb -r c340c18278db src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Thu Sep 22 13:18:42 2016 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Wed Jan 25 07:14:14 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -140,7 +140,14 @@
configuration.root.printError("Unknown element: " + component);
throw new DocletAbortException(e);
} catch (InvocationTargetException e) {
- throw new DocletAbortException(e.getCause());
+ Throwable cause = e.getCause();
+ if (cause instanceof FatalError) {
+ throw (FatalError) cause;
+ } else if (cause instanceof DocletAbortException) {
+ throw (DocletAbortException) cause;
+ } else {
+ throw new DocletAbortException(cause);
+ }
} catch (Exception e) {
e.printStackTrace();
configuration.root.printError("Exception " +
diff -r ee37eafc48cb -r c340c18278db src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Thu Sep 22 13:18:42 2016 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Wed Jan 25 07:14:14 2017 +0000
@@ -29,6 +29,8 @@
doclet.Building_Tree=Building tree for all the packages and classes...
doclet.Building_Index=Building index for all the packages and classes...
doclet.Building_Index_For_All_Classes=Building index for all classes...
+doclet.JavaScript_in_option=Argument for {0} contains JavaScript.\n\
+Use --allow-script-in-comments to allow use of JavaScript.
doclet.sourcetab_warning=The argument for -sourcetab must be an integer greater than 0.
doclet.Packages=Packages
doclet.Profiles=Profiles
diff -r ee37eafc48cb -r c340c18278db src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Thu Sep 22 13:18:42 2016 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Wed Jan 25 07:14:14 2017 +0000
@@ -27,6 +27,7 @@
doclet.Building_Tree=\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30AF\u30E9\u30B9\u306E\u968E\u5C64\u30C4\u30EA\u30FC\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
doclet.Building_Index=\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
doclet.Building_Index_For_All_Classes=\u5168\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
+doclet.JavaScript_in_option={0}\u306E\u5F15\u6570\u306BJavaScript\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\n--allow-script-in-comments\u3092\u4F7F\u7528\u3057\u3066\u3001JavaScript\u306E\u4F7F\u7528\u3092\u8A31\u53EF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
doclet.sourcetab_warning=-sourcetab\u306E\u5F15\u6570\u306F0\u3088\u308A\u5927\u304D\u3044\u6574\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
doclet.Packages=\u30D1\u30C3\u30B1\u30FC\u30B8
doclet.Profiles=\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB
diff -r ee37eafc48cb -r c340c18278db src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties Thu Sep 22 13:18:42 2016 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties Wed Jan 25 07:14:14 2017 +0000
@@ -27,6 +27,7 @@
doclet.Building_Tree=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u7C7B\u7684\u6811...
doclet.Building_Index=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u7C7B\u7684\u7D22\u5F15...
doclet.Building_Index_For_All_Classes=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7C7B\u7684\u7D22\u5F15...
+doclet.JavaScript_in_option={0} \u7684\u53C2\u6570\u5305\u542B JavaScript\u3002\n\u4F7F\u7528 --allow-script-in-comments \u53EF\u5141\u8BB8\u4F7F\u7528 JavaScript\u3002
doclet.sourcetab_warning=-sourcetab \u7684\u53C2\u6570\u5FC5\u987B\u662F\u5927\u4E8E 0 \u7684\u6574\u6570\u3002
doclet.Packages=\u7A0B\u5E8F\u5305
doclet.Profiles=\u914D\u7F6E\u6587\u4EF6
diff -r ee37eafc48cb -r c340c18278db src/share/classes/com/sun/tools/doclets/internal/toolkit/util/FatalError.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/FatalError.java Wed Jan 25 07:14:14 2017 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.doclets.internal.toolkit.util;
+
+/**
+ * <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.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+ at Deprecated
+public class FatalError extends Error {
+ private static final long serialVersionUID = -9131058909576418984L;
+
+ public FatalError() { }
+}
diff -r ee37eafc48cb -r c340c18278db src/share/classes/com/sun/tools/doclint/Checker.java
--- a/src/share/classes/com/sun/tools/doclint/Checker.java Thu Sep 22 13:18:42 2016 -0700
+++ b/src/share/classes/com/sun/tools/doclint/Checker.java Wed Jan 25 07:14:14 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -126,7 +126,7 @@
}
}
- private Deque<TagStackItem> tagStack; // TODO: maybe want to record starting tree as well
+ private final Deque<TagStackItem> tagStack; // TODO: maybe want to record starting tree as well
private HtmlTag currHeaderTag;
private final int implicitHeaderLevel;
@@ -401,7 +401,16 @@
break;
case OTHER:
- env.messages.error(HTML, tree, "dc.tag.not.allowed", treeName);
+ switch (t) {
+ case SCRIPT:
+ // <script> may or may not be allowed, depending on --allow-script-in-comments
+ // but we allow it here, and rely on a separate scanner to detect all uses
+ // of JavaScript, including <script> tags, and use in attributes, etc.
+ break;
+
+ default:
+ env.messages.error(HTML, tree, "dc.tag.not.allowed", treeName);
+ }
return;
}
@@ -519,22 +528,27 @@
if (!first)
More information about the distro-pkg-dev
mailing list