/hg/release/icedtea7-forest-2.4/langtools: 28 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 16 18:42:21 UTC 2014
changeset 5d36d5fb1078 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5d36d5fb1078
author: katleman
date: Fri Dec 20 18:53:28 2013 -0800
Added tag jdk7u51-b31 for changeset e3d4896d52ab
changeset aed2651202db in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=aed2651202db
author: katleman
date: Thu Dec 26 13:05:15 2013 -0800
Added tag jdk7u51-b30 for changeset ada23e55d76a
changeset d03b91d1f50d in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d03b91d1f50d
author: asaha
date: Tue Dec 31 09:02:26 2013 -0800
Merge
changeset 3e64e49131b8 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=3e64e49131b8
author: asaha
date: Mon Dec 16 12:14:15 2013 -0800
Added tag jdk7u55-b00 for changeset 5b44df2114e4
changeset f6506ddb9433 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=f6506ddb9433
author: asaha
date: Mon Dec 16 14:55:17 2013 -0800
Added tag jdk7u55-b01 for changeset 3e64e49131b8
changeset 11faf64b5153 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=11faf64b5153
author: asaha
date: Mon Dec 16 18:55:10 2013 -0800
Merge
changeset 5d04e4f8e09b in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5d04e4f8e09b
author: asaha
date: Fri Dec 20 11:54:03 2013 -0800
Merge
changeset f78274253714 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=f78274253714
author: asaha
date: Fri Dec 20 14:17:23 2013 -0800
Merge
changeset 2a9f5c00ba46 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=2a9f5c00ba46
author: asaha
date: Fri Dec 20 21:38:15 2013 -0800
Merge
changeset 11892b902d6c in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=11892b902d6c
author: katleman
date: Tue Dec 24 14:47:10 2013 -0800
Added tag jdk7u55-b02 for changeset 2a9f5c00ba46
changeset 0479d260ac83 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0479d260ac83
author: asaha
date: Thu Dec 26 16:02:32 2013 -0800
Merge
changeset a1cdb7ff88b6 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a1cdb7ff88b6
author: katleman
date: Mon Jan 06 13:57:21 2014 -0800
Added tag jdk7u55-b03 for changeset 0479d260ac83
changeset 8f79a22ee7d1 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8f79a22ee7d1
author: katleman
date: Wed Jan 08 13:24:16 2014 -0800
Added tag jdk7u45-b35 for changeset efbda7abd821
changeset fb3ff30ecd8e in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=fb3ff30ecd8e
author: asaha
date: Wed Jan 08 14:18:19 2014 -0800
Merge
changeset 7f3b35338390 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=7f3b35338390
author: asaha
date: Thu Jan 09 07:59:42 2014 -0800
Merge
changeset a244cc40ae0b in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a244cc40ae0b
author: bpatel
date: Mon Jan 13 14:46:55 2014 -0800
8026736: Enhance Javadoc pages
Reviewed-by: jjg
changeset 25d63d986653 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=25d63d986653
author: katleman
date: Mon Jan 13 16:15:06 2014 -0800
Added tag jdk7u55-b04 for changeset a244cc40ae0b
changeset 76eeeaace70d in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=76eeeaace70d
author: katleman
date: Wed Jan 22 10:07:16 2014 -0800
Added tag jdk7u55-b05 for changeset 25d63d986653
changeset 08f7914d6aa9 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=08f7914d6aa9
author: katleman
date: Tue Jan 28 11:50:07 2014 -0800
Added tag jdk7u55-b06 for changeset 76eeeaace70d
changeset e64301b473b4 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e64301b473b4
author: katleman
date: Tue Feb 04 13:12:36 2014 -0800
Added tag jdk7u55-b07 for changeset 08f7914d6aa9
changeset a296112a3fd7 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a296112a3fd7
author: katleman
date: Tue Feb 11 13:12:43 2014 -0800
Added tag jdk7u55-b08 for changeset e64301b473b4
changeset faa9f8c51a6e in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=faa9f8c51a6e
author: katleman
date: Tue Feb 18 13:36:50 2014 -0800
Added tag jdk7u55-b09 for changeset a296112a3fd7
changeset 2bdd105e433d in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=2bdd105e433d
author: katleman
date: Tue Feb 25 12:21:21 2014 -0800
Added tag jdk7u55-b10 for changeset faa9f8c51a6e
changeset a3cdca5d3773 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a3cdca5d3773
author: katleman
date: Tue Mar 04 12:02:32 2014 -0800
Added tag jdk7u55-b11 for changeset 2bdd105e433d
changeset 81bf1ca3a3a7 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=81bf1ca3a3a7
author: katleman
date: Tue Mar 11 13:00:25 2014 -0700
Added tag jdk7u55-b12 for changeset a3cdca5d3773
changeset 96d55b4d88fe in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=96d55b4d88fe
author: katleman
date: Tue Mar 18 12:08:15 2014 -0700
Added tag jdk7u55-b13 for changeset 81bf1ca3a3a7
changeset c1964a222000 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c1964a222000
author: katleman
date: Thu Mar 27 11:23:22 2014 -0700
Added tag jdk7u55-b30 for changeset 96d55b4d88fe
changeset 200ea1a5797e in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=200ea1a5797e
author: andrew
date: Wed Apr 16 19:41:08 2014 +0100
Merge jdk7u55-b14
diffstat:
.hgtags | 35 ++
.jcheck/conf | 2 -
make/Makefile | 4 +
make/build.properties | 3 +-
make/build.xml | 2 +-
src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java | 4 +-
test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java | 154 +++++++++-
test/tools/javac/T5090006/broken.jar | Bin
8 files changed, 188 insertions(+), 16 deletions(-)
diffs (391 lines):
diff -r e3d4896d52ab -r 200ea1a5797e .hgtags
--- a/.hgtags Thu Dec 19 09:36:21 2013 -0800
+++ b/.hgtags Wed Apr 16 19:41:08 2014 +0100
@@ -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
@@ -123,6 +126,7 @@
9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
+fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint
cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
@@ -141,6 +145,7 @@
f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12
f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13
fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21
+58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint
fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02
0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03
f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04
@@ -157,6 +162,7 @@
8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10
4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11
a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12
+e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint
56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13
0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14
0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01
@@ -191,6 +197,7 @@
47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15
5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
+cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint
6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20
@@ -258,6 +265,7 @@
382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07
7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08
96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09
+85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint
e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10
db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11
f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12
@@ -335,6 +343,7 @@
5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19
86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20
+cbb9be4fb46d8dfd3a8c32dc693f9501a64b9a47 icedtea-2.4.0
c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21
eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22
e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23
@@ -345,6 +354,7 @@
9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28
bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29
0586afeb2caa0b4595bf5b306657a5dd1f0d121c jdk7u40-b30
+91c95fd8eea822b47bcebd7eed22fdf3c404dd62 icedtea-2.4.1
9c343668b0a95e5510f715014884e5d45df9dfb0 jdk7u40-b31
056f998e75f87a299808671ecc0d96e270f62dca jdk7u40-b32
e36d8f754801c9d17585a9469f9b33f9799167f8 jdk7u40-b33
@@ -359,6 +369,7 @@
765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42
988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43
a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60
+06ea051f7ffe0f91213c8e7064ddb045c93ba1b4 icedtea-2.4.2
b2e29b79e54e58349c1dbcf5449f67fc5d5a235a jdk7u40-b61
94ea3d062a3c28c64a837fa8f999c6b6956ff7c4 jdk7u40-b62
9bbfba4981e1db5016bbfbc23025763966021c26 jdk7u45-b01
@@ -380,9 +391,12 @@
b9aeec6b9d5aac0746f8d1764a7740f8b83334ab jdk7u45-b17
ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
+3c8eb52a32ea6a119657487c40e24c21c1020e51 icedtea-2.4.3
+3d9f5aad3f497f5b2bedad6c77f5cacaf721648f icedtea-2.4.4
7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31
ef7bdbe7f1fa42fd58723e541d9cdedcacb2649a jdk7u45-b33
bcb3e939d046d75436c7c8511600b6edce42e6da jdk7u45-b34
+efbda7abd821f280ec3a3aa6819ad62d45595e55 jdk7u45-b35
18d1864abca976ca68cb71612e9b20c908455d3d jdk7u51-b00
14d1cf2630aea549cfba9d052200c7ebcabd875c jdk7u51-b01
f0168ccf171ed6080267fe0a7f7aed0b46bd5713 jdk7u51-b02
@@ -397,3 +411,24 @@
c9d8d8793d9330d592190c334260ccf26c986df6 jdk7u51-b11
5b44df2114e466da85c3816627bfcd1b59c6499d jdk7u51-b12
4d0807934c302f2e35e6a5acc6cdc720c82b5671 jdk7u51-b13
+dabd37b7e2950b42c1c9550caea26522348cd7b4 icedtea-2.4.5
+06eeb77dac248eb62fed00aa25f9f9fa9b4df210 icedtea-2.4.6pre01
+06eeb77dac248eb62fed00aa25f9f9fa9b4df210 icedtea-2.4.6
+8c26a3c3912898619032a5d913ba81ebfa6e4e22 icedtea-2.4.7
+ada23e55d76a378cb2fc2cd7ffae8c147aaf0055 jdk7u51-b30
+e3d4896d52ab4ad0fc0b7a45d60340dbdcb8826d jdk7u51-b31
+5b44df2114e466da85c3816627bfcd1b59c6499d jdk7u55-b00
+3e64e49131b88c839733c9869ff8aebcd15cf828 jdk7u55-b01
+2a9f5c00ba46f895bc9d16a584bf7d80c1822268 jdk7u55-b02
+0479d260ac835eb3f0c7f3d7d15be0599b92a20a jdk7u55-b03
+a244cc40ae0b29028ff8503ee516cb5f9e3db6e3 jdk7u55-b04
+25d63d986653d81522b01bbd2664083ae5fdc243 jdk7u55-b05
+76eeeaace70d38795eef5215f758493421cee0ac jdk7u55-b06
+08f7914d6aa947e73269b4e60110ed12573ffa28 jdk7u55-b07
+e64301b473b43609cb28d8cfe7e5db17d9bf8a4a jdk7u55-b08
+a296112a3fd774c258375912c7ada38daf8eee1e jdk7u55-b09
+faa9f8c51a6e3fcb444729012a798e3ad09c3da4 jdk7u55-b10
+2bdd105e433da7fbf7f37ec2f75fc4bed4e54280 jdk7u55-b11
+a3cdca5d3773f67a49091f9131a4d073bc6b83d9 jdk7u55-b12
+81bf1ca3a3a71c628b7d952ba47c6f200a223f27 jdk7u55-b13
+96d55b4d88fea1d9f8227e70003210a6c10a1dba jdk7u55-b30
diff -r e3d4896d52ab -r 200ea1a5797e .jcheck/conf
--- a/.jcheck/conf Thu Dec 19 09:36:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r e3d4896d52ab -r 200ea1a5797e make/Makefile
--- a/make/Makefile Thu Dec 19 09:36:21 2013 -0800
+++ b/make/Makefile Wed Apr 16 19:41:08 2014 +0100
@@ -111,6 +111,10 @@
ANT_OPTIONS += -Ddebug.classfiles=true
endif
+ifeq ($(JAVAC_WARNINGS_FATAL), false)
+ ANT_OPTIONS += -Djavac.warnings.fatal=
+endif
+
# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
# and the somewhat misnamed CLASS_VERSION (-target NN)
ifdef TARGET_CLASS_VERSION
diff -r e3d4896d52ab -r 200ea1a5797e make/build.properties
--- a/make/build.properties Thu Dec 19 09:36:21 2013 -0800
+++ b/make/build.properties Wed Apr 16 19:41:08 2014 +0100
@@ -68,7 +68,8 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
# in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all,-deprecation -Werror
+javac.warnings.fatal = -Werror
+javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal}
# options for the <javadoc> task for javac
#javadoc.jls3.url=http://java.sun.com/docs/books/jls/
diff -r e3d4896d52ab -r 200ea1a5797e make/build.xml
--- a/make/build.xml Thu Dec 19 09:36:21 2013 -0800
+++ b/make/build.xml Wed Apr 16 19:41:08 2014 +0100
@@ -877,7 +877,7 @@
</javac>
<taskdef name="genstubs"
classname="GenStubs$$Ant"
- 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 e3d4896d52ab -r 200ea1a5797e src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu Dec 19 09:36:21 2013 -0800
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Wed Apr 16 19:41:08 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -235,7 +235,7 @@
} else if (opt.equals("-doctitle")) {
doctitle = os[1];
} else if (opt.equals("-windowtitle")) {
- windowtitle = os[1];
+ windowtitle = os[1].replaceAll("\\<.*?>", "");
} else if (opt.equals("-top")) {
top = os[1];
} else if (opt.equals("-bottom")) {
diff -r e3d4896d52ab -r 200ea1a5797e test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java
--- a/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Thu Dec 19 09:36:21 2013 -0800
+++ b/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Wed Apr 16 19:41:08 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8016675
+ * @bug 8016675 8026736
* @summary Test for window title.
* @author Bhavesh Patel
* @library ../lib/
@@ -34,26 +34,153 @@
public class TestWindowTitle extends JavadocTester {
private static final String BUG_ID = "8016675";
- private static final String WIN_TITLE =
+ //Window title with JavaScript special characters.
+ private static final String TITLE_JS_CHARS =
"Testing \"Window 'Title'\" with a \\ backslash and a / " +
"forward slash and a \u00e8 unicode char also a tab and also a " +
"\t special character another \u0002 unicode)";
- private static final String[][] TEST = {
- {BUG_ID + FS + "overview-summary.html",
+ private static final String[] ARGS_JS_CHARS = new String[]{
+ "-d", BUG_ID + "-1", "-windowtitle", TITLE_JS_CHARS, "-sourcepath", SRC_DIR, "p1", "p2"
+ };
+ private static final String[][] TEST_JS_CHARS = {
+ {BUG_ID + "-1" + FS + "overview-summary.html",
"parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" " +
"with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char " +
"also a tab and also a \\t special character another \\u0002 unicode))\";"
},
};
- private static final String[][] NEG_TEST = {
- {BUG_ID + FS + "overview-summary.html",
+ private static final String[][] NEG_TEST_JS_CHARS = {
+ {BUG_ID + "-1" + FS + "overview-summary.html",
"parent.document.title=\"Overview (Testing \"Window \'Title\'\" " +
"with a \\ backslash and a / forward slash and a \u00E8 unicode char " +
"also a tab and also a \t special character another \u0002 unicode))\";"
+ }
+ };
+
+ //Window title with a script tag.
+ private static final String TITLE_SCRIPT_TAG =
+ "Testing script tag in title </title><script>alert(\"Should not pop up\")</script>.";
+ private static final String[] ARGS_SCRIPT_TAG = new String[]{
+ "-d", BUG_ID + "-2", "-windowtitle", TITLE_SCRIPT_TAG, "-sourcepath", SRC_DIR, "p1", "p2"
+ };
+ private static final String[][] TEST_SCRIPT_TAG = {
+ {BUG_ID + "-2" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing script tag in title alert" +
+ "(\\\"Should not pop up\\\").)\";"
},
+ {BUG_ID + "-2" + FS + "p2" + FS + "C2.html",
+ "parent.document.title=\"C2 (Testing script tag in title alert" +
+ "(\\\"Should not pop up\\\").)\";"
+ }
};
- private static final String[] ARGS = new String[]{
- "-d", BUG_ID, "-windowtitle", WIN_TITLE, "-sourcepath", SRC_DIR, "p1", "p2"
+ private static final String[][] NEG_TEST_SCRIPT_TAG = {
+ {BUG_ID + "-2" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing script tag in title </title><script>" +
+ "alert(\\\"Should not pop up\\\")</script>.)\";"
+ },
+ {BUG_ID + "-2" + FS + "p2" + FS + "C2.html",
+ "parent.document.title=\"C2 (Testing script tag in title </title><script>" +
+ "alert(\\\"Should not pop up\\\")</script>.)\";"
+ }
+ };
+
+ //Window title with other HTML tags.
+ private static final String TITLE_HTML_TAGS =
+ "Testing another <p>HTML</p> tag. Another <h1>tag</h1>. A " +
+ "<span id=\"testTag\">tag with attributes</span>. <script and </p are not tags.";
+ private static final String[] ARGS_HTML_TAGS = new String[]{
+ "-d", BUG_ID + "-3", "-windowtitle", TITLE_HTML_TAGS, "-sourcepath", SRC_DIR, "p1", "p2"
+ };
+ private static final String[][] TEST_HTML_TAGS = {
+ {BUG_ID + "-3" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing another HTML tag. Another tag. A " +
+ "tag with attributes. <script and </p are not tags.)\";"
+ }
+ };
+ private static final String[][] NEG_TEST_HTML_TAGS = {
+ {BUG_ID + "-3" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing another <p>HTML</p> tag. Another " +
+ "<h1>tag</h1>. A <span id=\"testTag\">tag with attributes</span>. <script and " +
+ "</p are not tags.)\";"
+ }
+ };
+
+ //Window title using entities.
+ private static final String TITLE_HTML_ENTITIES =
+ "Testing entities <script>alert(\"Should not pop up\")</script>.";
+ private static final String[] ARGS_HTML_ENTITIES = new String[]{
+ "-d", BUG_ID + "-4", "-windowtitle", TITLE_HTML_ENTITIES, "-sourcepath", SRC_DIR, "p1", "p2"
+ };
+ private static final String[][] TEST_HTML_ENTITIES = {
+ {BUG_ID + "-4" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing entities <script>alert(\\\"Should " +
+ "not pop up\\\")</script>.)\";"
+ }
+ };
+ private static final String[][] NEG_TEST_HTML_ENTITIES = {
+ {BUG_ID + "-4" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing entities alert(\\\"Should not pop up\\\").)\";"
+ }
+ };
+
+ //Window title with just empty HTML tags.
+ private static final String TITLE_EMPTY_TAGS =
+ "</title><script></script>";
+ private static final String[] ARGS_EMPTY_TAGS = new String[]{
+ "-d", BUG_ID + "-5", "-windowtitle", TITLE_EMPTY_TAGS, "-sourcepath", SRC_DIR, "p1", "p2"
+ };
+ private static final String[][] TEST_EMPTY_TAGS = {
+ {BUG_ID + "-5" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview\";"
+ }
+ };
+ private static final String[][] NEG_TEST_EMPTY_TAGS = {
+ {BUG_ID + "-5" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (</title><script></script>)\";"
+ }
+ };
+
+ //Window title with unicode characters.
+ private static final String TITLE_UNICODE_CHARS =
+ "Testing unicode \u003cscript\u003ealert(\"Should not pop up\")\u003c/script\u003e.";
+ private static final String[] ARGS_UNICODE_CHARS = new String[]{
+ "-d", BUG_ID + "-6", "-windowtitle", TITLE_UNICODE_CHARS, "-sourcepath", SRC_DIR, "p1", "p2"
+ };
+ private static final String[][] TEST_UNICODE_CHARS = {
+ {BUG_ID + "-6" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing unicode alert(\\\"Should " +
+ "not pop up\\\").)\";"
+ }
+ };
+ private static final String[][] NEG_TEST_UNICODE_CHARS = {
+ {BUG_ID + "-6" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing unicode <script>alert(\\\"Should not pop up\\\")" +
+ "</script>.)\";"
+ }
+ };
+
+ //An empty window title.
+ private static final String TITLE_EMPTY =
+ "";
+ private static final String[] ARGS_EMPTY_TITLE = new String[]{
+ "-d", BUG_ID + "-7", "-windowtitle", TITLE_EMPTY, "-sourcepath", SRC_DIR, "p1", "p2"
+ };
+ private static final String[][] TEST_EMPTY = {
+ {BUG_ID + "-7" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview\";"
+ }
+ };
+
+ //Test doctitle.
+ private static final String[] ARGS_DOCTITLE = new String[]{
+ "-d", BUG_ID + "-8", "-doctitle", TITLE_JS_CHARS, "-sourcepath", SRC_DIR, "p1", "p2"
+ };
+ private static final String[][] NEG_TEST_DOCTITLE = {
+ {BUG_ID + "-8" + FS + "overview-summary.html",
+ "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" " +
+ "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char " +
+ "also a tab and also a \\t special character another \\u0002 unicode)\";"
+ },
};
/**
@@ -62,7 +189,14 @@
*/
public static void main(String[] args) {
TestWindowTitle tester = new TestWindowTitle();
- run(tester, ARGS, TEST, NEG_TEST);
+ run(tester, ARGS_JS_CHARS, TEST_JS_CHARS, NEG_TEST_JS_CHARS);
+ run(tester, ARGS_SCRIPT_TAG, TEST_SCRIPT_TAG, NEG_TEST_SCRIPT_TAG);
+ run(tester, ARGS_HTML_TAGS, TEST_HTML_TAGS, NEG_TEST_HTML_TAGS);
+ run(tester, ARGS_HTML_ENTITIES, TEST_HTML_ENTITIES, NEG_TEST_HTML_ENTITIES);
+ run(tester, ARGS_EMPTY_TAGS, TEST_EMPTY_TAGS, NEG_TEST_EMPTY_TAGS);
+ run(tester, ARGS_UNICODE_CHARS, TEST_UNICODE_CHARS, NEG_TEST_UNICODE_CHARS);
+ run(tester, ARGS_EMPTY_TITLE, TEST_EMPTY, NO_TEST);
+ run(tester, ARGS_DOCTITLE, NO_TEST, NEG_TEST_DOCTITLE);
tester.printSummary();
}
diff -r e3d4896d52ab -r 200ea1a5797e test/tools/javac/T5090006/broken.jar
Binary file test/tools/javac/T5090006/broken.jar has changed
More information about the distro-pkg-dev
mailing list