/hg/release/icedtea7-forest-2.5/langtools: 54 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Apr 17 16:54:04 UTC 2014
changeset 3dc3e59e9580 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=3dc3e59e9580
author: katleman
date: Wed Mar 26 09:28:25 2014 -0700
Added tag jdk7u60-b12 for changeset b79b8b1dc88f
changeset a8b9c1929e50 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=a8b9c1929e50
author: katleman
date: Wed Apr 02 09:31:54 2014 -0700
Added tag jdk7u60-b13 for changeset 3dc3e59e9580
changeset 95c13223f3b9 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=95c13223f3b9
author: katleman
date: Wed Apr 09 08:44:55 2014 -0700
Added tag jdk7u60-b14 for changeset a8b9c1929e50
changeset 3e64e49131b8 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/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.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=e64301b473b4
author: katleman
date: Tue Feb 04 13:12:36 2014 -0800
Added tag jdk7u55-b07 for changeset 08f7914d6aa9
changeset 79e82c4b6547 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=79e82c4b6547
author: asaha
date: Thu Feb 06 13:33:12 2014 -0800
Merge
changeset a296112a3fd7 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=a296112a3fd7
author: katleman
date: Tue Feb 11 13:12:43 2014 -0800
Added tag jdk7u55-b08 for changeset e64301b473b4
changeset 0d95d35e3dea in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=0d95d35e3dea
author: asaha
date: Tue Feb 11 15:25:33 2014 -0800
Merge
changeset c2403682cf10 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=c2403682cf10
author: asaha
date: Wed Feb 12 16:12:47 2014 -0800
Merge
changeset faa9f8c51a6e in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=faa9f8c51a6e
author: katleman
date: Tue Feb 18 13:36:50 2014 -0800
Added tag jdk7u55-b09 for changeset a296112a3fd7
changeset 367192507b56 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=367192507b56
author: asaha
date: Wed Feb 19 12:24:13 2014 -0800
Merge
changeset 8048958f3e13 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=8048958f3e13
author: asaha
date: Wed Feb 19 14:39:47 2014 -0800
Merge
changeset 2bdd105e433d in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=2bdd105e433d
author: katleman
date: Tue Feb 25 12:21:21 2014 -0800
Added tag jdk7u55-b10 for changeset faa9f8c51a6e
changeset 59efdc3e2dc2 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=59efdc3e2dc2
author: asaha
date: Tue Feb 25 13:57:56 2014 -0800
Merge
changeset 48b50f5261e1 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=48b50f5261e1
author: asaha
date: Thu Feb 27 08:34:33 2014 -0800
Merge
changeset a3cdca5d3773 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=a3cdca5d3773
author: katleman
date: Tue Mar 04 12:02:32 2014 -0800
Added tag jdk7u55-b11 for changeset 2bdd105e433d
changeset 7a9e17c49f4a in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=7a9e17c49f4a
author: asaha
date: Tue Mar 04 15:40:38 2014 -0800
Merge
changeset a3a6a974a965 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=a3a6a974a965
author: asaha
date: Wed Mar 05 13:30:06 2014 -0800
Merge
changeset 70b8d2e146ea in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=70b8d2e146ea
author: asaha
date: Tue Mar 11 13:40:44 2014 -0700
Merge
changeset 81bf1ca3a3a7 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=81bf1ca3a3a7
author: katleman
date: Tue Mar 11 13:00:25 2014 -0700
Added tag jdk7u55-b12 for changeset a3cdca5d3773
changeset 02e9326a4655 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=02e9326a4655
author: asaha
date: Tue Mar 11 14:35:01 2014 -0700
Merge
changeset 55254a6d1caf in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=55254a6d1caf
author: asaha
date: Wed Mar 12 14:51:14 2014 -0700
Merge
changeset 96d55b4d88fe in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=96d55b4d88fe
author: katleman
date: Tue Mar 18 12:08:15 2014 -0700
Added tag jdk7u55-b13 for changeset 81bf1ca3a3a7
changeset 4adc6c094545 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=4adc6c094545
author: katleman
date: Fri Feb 14 09:00:06 2014 -0800
Added tag jdk7u51-b33 for changeset fb3ff30ecd8e
changeset 0260a3969b5a in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=0260a3969b5a
author: katleman
date: Fri Feb 28 17:23:53 2014 -0800
Added tag jdk7u51-b34 for changeset 4adc6c094545
changeset 4f6115ba266e in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=4f6115ba266e
author: asaha
date: Tue Mar 18 12:45:26 2014 -0700
Merge
changeset 9edfb8b2c760 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=9edfb8b2c760
author: asaha
date: Tue Mar 18 13:05:33 2014 -0700
Merge
changeset b5066734655f in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=b5066734655f
author: asaha
date: Wed Mar 19 10:21:32 2014 -0700
Merge
changeset 66c893cd8323 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=66c893cd8323
author: asaha
date: Wed Mar 26 21:26:57 2014 -0700
Merge
changeset 070326eb7936 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=070326eb7936
author: katleman
date: Thu Mar 27 11:37:20 2014 -0700
Added tag jdk7u55-b31 for changeset 4f6115ba266e
changeset c1964a222000 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=c1964a222000
author: katleman
date: Thu Mar 27 11:23:22 2014 -0700
Added tag jdk7u55-b30 for changeset 96d55b4d88fe
changeset ec8793f5aa4f in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=ec8793f5aa4f
author: asaha
date: Thu Mar 27 12:00:02 2014 -0700
Merge
changeset 79a577c2552c in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=79a577c2552c
author: asaha
date: Thu Mar 27 12:13:23 2014 -0700
Merge
changeset 145ad4d90ad6 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=145ad4d90ad6
author: asaha
date: Wed Apr 02 09:47:57 2014 -0700
Merge
changeset 5ba843be1d57 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=5ba843be1d57
author: asaha
date: Wed Apr 09 09:45:09 2014 -0700
Merge
changeset 56c12a84e86e in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=56c12a84e86e
author: katleman
date: Tue Apr 15 11:50:50 2014 -0700
Added tag jdk7u55-b14 for changeset c1964a222000
changeset 7568ebdada11 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=7568ebdada11
author: asaha
date: Tue Apr 15 12:46:08 2014 -0700
Merge
changeset 057caf9e0774 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=057caf9e0774
author: katleman
date: Wed Apr 16 12:26:32 2014 -0700
Added tag jdk7u60-b15 for changeset 7568ebdada11
changeset 2f5810fa2937 in /hg/release/icedtea7-forest-2.5/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=2f5810fa2937
author: andrew
date: Thu Apr 17 17:52:22 2014 +0100
Merge jdk7u60-b15
diffstat:
.hgtags | 40 ++
.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, 193 insertions(+), 16 deletions(-)
diffs (394 lines):
diff -r b79b8b1dc88f -r 2f5810fa2937 .hgtags
--- a/.hgtags Wed Mar 19 10:04:37 2014 -0700
+++ b/.hgtags Thu Apr 17 17:52:22 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
@@ -186,11 +192,15 @@
21d2313dfeac8c52a04b837d13958c86346a4b12 jdk7u6-b10
13d3c624291615593b4299a273085441b1dd2f03 jdk7u6-b11
f0be10a26af08c33d9afe8fe51df29572d431bac jdk7u6-b12
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b01
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b02
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b03
fcebf337f5c1d342973573d9c6f758443c8aefcf jdk7u6-b13
35b2699c6243e9fb33648c2c25e97ec91d0e3553 jdk7u6-b14
47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15
5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
+cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint
6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20
@@ -258,11 +268,13 @@
382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07
7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08
96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09
+85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint
e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10
db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11
f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12
5a52c6cc8db94b68eaacb42a9b4df30a40b09d82 jdk7u14-b13
5febc4e479fad801424cdcce90a0d463a2ef9223 jdk7u14-b14
+d52538e72925a1da7b1fcff051b591beeb2452b4 ppc-aix-port-b04
5fdb509d1f1a0533b14c61c92d77ff21e0ce2488 jdk7u14-b15
1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01
8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02
@@ -382,8 +394,10 @@
ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31
+849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
ef7bdbe7f1fa42fd58723e541d9cdedcacb2649a jdk7u45-b33
bcb3e939d046d75436c7c8511600b6edce42e6da jdk7u45-b34
+efbda7abd821f280ec3a3aa6819ad62d45595e55 jdk7u45-b35
18d1864abca976ca68cb71612e9b20c908455d3d jdk7u51-b00
14d1cf2630aea549cfba9d052200c7ebcabd875c jdk7u51-b01
f0168ccf171ed6080267fe0a7f7aed0b46bd5713 jdk7u51-b02
@@ -400,9 +414,30 @@
4d0807934c302f2e35e6a5acc6cdc720c82b5671 jdk7u51-b13
ada23e55d76a378cb2fc2cd7ffae8c147aaf0055 jdk7u51-b30
e3d4896d52ab4ad0fc0b7a45d60340dbdcb8826d jdk7u51-b31
+fb3ff30ecd8ea1637551461bfaf09fc8204b536c jdk7u51-b33
+4adc6c094545774b324d2e5511723ada2b32e6c4 jdk7u51-b34
+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
+c1964a222000b4884b992fdbaf8f62a45fb893c9 jdk7u55-b14
+4f6115ba266e5489b5e1968a28304f82be1f5641 jdk7u55-b31
849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01
954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02
+0d89cc5766d72e870eaf16696ec9b7b1ca4901fd icedtea-2.5pre01
+f75a642c2913e1ecbd22fc46812cffa2e7739169 icedtea-2.5pre02
4170784840d510b4e8ae7ae250b92279aaf5eb25 jdk7u60-b03
772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u60-b04
744287fccf3b2c4fba2abf105863f0a44c3bd4da jdk7u60-b05
@@ -412,3 +447,8 @@
3f8b585403e596b7eadc231484f5480361c52c4b jdk7u60-b09
3ee98cd07065dfa9a982e6692a3e875684a7e820 jdk7u60-b10
3cc64ba8cf85942929b15c5ef21360f96db3b99c jdk7u60-b11
+f38810d86876a74b6267c207f47840c895e4f393 icedtea-2.5pre03
+b79b8b1dc88faa73229b2bce04e979ff5ec854f5 jdk7u60-b12
+3dc3e59e9580dfdf95dac57c54fe1a4209401125 jdk7u60-b13
+a8b9c1929e50a9f3ae9ae1a23c06fa73a57afce3 jdk7u60-b14
+7568ebdada118da1d1a6addcf6316ffda21801fd jdk7u60-b15
diff -r b79b8b1dc88f -r 2f5810fa2937 .jcheck/conf
--- a/.jcheck/conf Wed Mar 19 10:04:37 2014 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r b79b8b1dc88f -r 2f5810fa2937 make/Makefile
--- a/make/Makefile Wed Mar 19 10:04:37 2014 -0700
+++ b/make/Makefile Thu Apr 17 17:52:22 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 b79b8b1dc88f -r 2f5810fa2937 make/build.properties
--- a/make/build.properties Wed Mar 19 10:04:37 2014 -0700
+++ b/make/build.properties Thu Apr 17 17:52:22 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 b79b8b1dc88f -r 2f5810fa2937 make/build.xml
--- a/make/build.xml Wed Mar 19 10:04:37 2014 -0700
+++ b/make/build.xml Thu Apr 17 17:52:22 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 b79b8b1dc88f -r 2f5810fa2937 src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Wed Mar 19 10:04:37 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu Apr 17 17:52:22 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 b79b8b1dc88f -r 2f5810fa2937 test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java
--- a/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Wed Mar 19 10:04:37 2014 -0700
+++ b/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Thu Apr 17 17:52:22 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 b79b8b1dc88f -r 2f5810fa2937 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